Merge branch 'stable-4.10' of git://git.infradead.org/users/pcmoore/audit

[linux-2.6-microblaze.git] / arch / arm / boot / dts / rk3066a.dtsi

diff --git a/arch/arm/boot/dts/rk3066a.dtsi b/arch/arm/boot/dts/rk3066a.dtsi
index fc8dcc7..e498c36 100644 (file)
--- a/arch/arm/boot/dts/rk3066a.dtsi
+++ b/arch/arm/boot/dts/rk3066a.dtsi
@@ -205,7 +205,7 @@
                clock-names = "saradc", "apb_pclk";
                interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
                #io-channel-cells = <1>;
-               resets = <&cru SRST_SARADC>;
+               resets = <&cru SRST_TSADC>;
                reset-names = "saradc-apb";
                status = "disabled";
        };
@@ -637,16 +637,25 @@
 
 &mmc0 {
        clock-frequency = <50000000>;
+       dmas = <&dmac2 1>;
+       dma-names = "rx-tx";
        max-frequency = <50000000>;
        pinctrl-names = "default";
        pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_cd &sd0_bus4>;
 };
 
 &mmc1 {
+       dmas = <&dmac2 3>;
+       dma-names = "rx-tx";
        pinctrl-names = "default";
        pinctrl-0 = <&sd1_clk &sd1_cmd &sd1_cd &sd1_bus4>;
 };
 
+&emmc {
+       dmas = <&dmac2 4>;
+       dma-names = "rx-tx";
+};
+
 &pwm0 {
        pinctrl-names = "default";
        pinctrl-0 = <&pwm0_out>;
@@ -678,21 +687,29 @@
 };
 
 &uart0 {
+       dmas = <&dmac1_s 0>, <&dmac1_s 1>;
+       dma-names = "tx", "rx";
        pinctrl-names = "default";
        pinctrl-0 = <&uart0_xfer>;
 };
 
 &uart1 {
+       dmas = <&dmac1_s 2>, <&dmac1_s 3>;
+       dma-names = "tx", "rx";
        pinctrl-names = "default";
        pinctrl-0 = <&uart1_xfer>;
 };
 
 &uart2 {
+       dmas = <&dmac2 6>, <&dmac2 7>;
+       dma-names = "tx", "rx";
        pinctrl-names = "default";
        pinctrl-0 = <&uart2_xfer>;
 };
 
 &uart3 {
+       dmas = <&dmac2 8>, <&dmac2 9>;
+       dma-names = "tx", "rx";
        pinctrl-names = "default";
        pinctrl-0 = <&uart3_xfer>;
 };