Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

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

diff --git a/arch/arm/boot/dts/uniphier-sld8.dtsi b/arch/arm/boot/dts/uniphier-sld8.dtsi
index f7fcf6b..cbebb6e 100644 (file)
--- a/arch/arm/boot/dts/uniphier-sld8.dtsi
+++ b/arch/arm/boot/dts/uniphier-sld8.dtsi
@@ -239,6 +239,16 @@
                        };
                };
 
+               dmac: dma-controller@5a000000 {
+                       compatible = "socionext,uniphier-mio-dmac";
+                       reg = <0x5a000000 0x1000>;
+                       interrupts = <0 68 4>, <0 68 4>, <0 69 4>, <0 70 4>,
+                                    <0 71 4>, <0 72 4>, <0 73 4>;
+                       clocks = <&mio_clk 7>;
+                       resets = <&mio_rst 7>;
+                       #dma-cells = <1>;
+               };
+
                sd: sdhc@5a400000 {
                        compatible = "socionext,uniphier-sd-v2.91";
                        status = "disabled";
@@ -250,6 +260,8 @@
                        clocks = <&mio_clk 0>;
                        reset-names = "host", "bridge";
                        resets = <&mio_rst 0>, <&mio_rst 3>;
+                       dma-names = "rx-tx";
+                       dmas = <&dmac 4>;
                        bus-width = <4>;
                        cap-sd-highspeed;
                        sd-uhs-sdr12;
@@ -267,6 +279,8 @@
                        clocks = <&mio_clk 1>;
                        reset-names = "host", "bridge", "hw";
                        resets = <&mio_rst 1>, <&mio_rst 4>, <&mio_rst 6>;
+                       dma-names = "rx-tx";
+                       dmas = <&dmac 6>;
                        bus-width = <8>;
                        cap-mmc-highspeed;
                        cap-mmc-hw-reset;
@@ -393,9 +407,11 @@
                        status = "disabled";
                        reg-names = "nand_data", "denali_reg";
                        reg = <0x68000000 0x20>, <0x68100000 0x1000>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
                        interrupts = <0 65 4>;
                        pinctrl-names = "default";
-                       pinctrl-0 = <&pinctrl_nand2cs>;
+                       pinctrl-0 = <&pinctrl_nand>;
                        clock-names = "nand", "nand_x", "ecc";
                        clocks = <&sys_clk 2>, <&sys_clk 3>, <&sys_clk 3>;
                        resets = <&sys_rst 2>;