Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livep...

[sfrench/cifs-2.6.git] / arch / arm64 / boot / dts / socionext / uniphier-ld11.dtsi

diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi
index da881f5b6ed46df6b5319e034ddf3e073090a0f1..151c043b4835a14cd5db873b640b04f8731b2c19 100644 (file)
--- a/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi
+++ b/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi
@@ -140,7 +140,7 @@
                             <1 10 4>;
        };
 
-       soc {
+       soc@0 {
                compatible = "simple-bus";
                #address-cells = <1>;
                #size-cells = <1>;
@@ -304,6 +304,8 @@
                        compatible = "socionext,uniphier-sd4hc", "cdns,sd4hc";
                        reg = <0x5a000000 0x400>;
                        interrupts = <0 78 4>;
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&pinctrl_emmc>;
                        clocks = <&sys_clk 4>;
                        bus-width = <8>;
                        mmc-ddr-1_8v;
@@ -318,7 +320,8 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_usb0>;
                        clocks = <&mio_clk 7>, <&mio_clk 8>, <&mio_clk 12>;
-                       resets = <&mio_rst 7>, <&mio_rst 8>, <&mio_rst 12>, <&sys_rst 8>;
+                       resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 8>,
+                                <&mio_rst 12>;
                };
 
                usb1: usb@5a810100 {
@@ -329,7 +332,8 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_usb1>;
                        clocks = <&mio_clk 7>, <&mio_clk 9>, <&mio_clk 13>;
-                       resets = <&mio_rst 7>, <&mio_rst 9>, <&mio_rst 13>, <&sys_rst 8>;
+                       resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 9>,
+                                <&mio_rst 13>;
                };
 
                usb2: usb@5a820100 {
@@ -340,7 +344,8 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_usb2>;
                        clocks = <&mio_clk 7>, <&mio_clk 10>, <&mio_clk 14>;
-                       resets = <&mio_rst 7>, <&mio_rst 10>, <&mio_rst 14>, <&sys_rst 8>;
+                       resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 10>,
+                                <&mio_rst 14>;
                };
 
                mioctrl@5b3e0000 {