github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 06:25:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

DMA: rk3368: add dma clk enable/disable

Browse Source 
Signed-off-by: dkl <dkl@rock-chips.com>
This commit is contained in:
dkl 2015-03-09 11:34:14 +08:00
parent 874f30142e
commit 75ce2b9330
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm64/boot/dts/rk3368.dtsi
View File

@ -298,14 +298,19 @@ amba {
pdma0: pdma@ff600000 {
compatible = "arm,pl330", "arm,primecell";
reg = <0x0 0xff600000 0x0 0x4000>;
clocks = <&clk_gates12 11>;
clock-names = "apb_pclk";
interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
#dma-cells = <1>;
};
pdma1: pdma@ff250000 {
compatible = "arm,pl330", "arm,primecell";
reg = <0x0 0xff250000 0x0 0x4000>;
clocks = <&clk_gates19 3>;
clock-names = "apb_pclk";
interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
#dma-cells = <1>;

12
drivers/amba/bus.c Normal file → Executable file
View File

@ -361,9 +361,9 @@ static int amba_probe(struct device *dev)
int ret;
do {
//ret = amba_get_enable_pclk(pcdev);
//if (ret)
// break;
ret = amba_get_enable_pclk(pcdev);
if (ret)
break;
pm_runtime_get_noresume(dev);
pm_runtime_set_active(dev);
@ -377,7 +377,7 @@ static int amba_probe(struct device *dev)
pm_runtime_set_suspended(dev);
pm_runtime_put_noidle(dev);
//amba_put_disable_pclk(pcdev);
amba_put_disable_pclk(pcdev);
} while (0);
return ret;
@ -490,7 +490,7 @@ int amba_device_add(struct amba_device *dev, struct resource *parent)
goto err_release;
}
// ret = amba_get_enable_pclk(dev);
ret = amba_get_enable_pclk(dev);
ret = 0;
if (ret == 0) {
u32 pid, cid;
@ -506,7 +506,7 @@ int amba_device_add(struct amba_device *dev, struct resource *parent)
cid |= (readl(tmp + size - 0x10 + 4 * i) & 255) <<
(i * 8);
// amba_put_disable_pclk(dev);
amba_put_disable_pclk(dev);
if (cid == AMBA_CID || cid == CORESIGHT_CID)
dev->periphid = pid;