DMA: rk3368: add dma clk enable/disable

Signed-off-by: dkl <dkl@rock-chips.com>

diff --git a/arch/arm64/boot/dts/rk3368.dtsi b/arch/arm64/boot/dts/rk3368.dtsi
index af2b7394195d4df0a718017e7bf5ec143246c1bd..adfdb51b94ce3657191a22462d9ad7e1a5dfa329 100755 (executable)
--- a/arch/arm64/boot/dts/rk3368.dtsi
+++ b/arch/arm64/boot/dts/rk3368.dtsi
@@ -298,14 +298,19 @@
                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>;

diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c
old mode 100644 (file)
new mode 100755 (executable)
index 9d3a903..0cde10e
--- a/drivers/amba/bus.c
+++ b/drivers/amba/bus.c
@@ -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;