Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / imx6q-arm2.dts

diff --git a/arch/arm/boot/dts/imx6q-arm2.dts b/arch/arm/boot/dts/imx6q-arm2.dts
index ce1c8238c8975c6b84f72304f7ff8ae68dda8c88..db4c6096c562eaea2415570934b4cd7fad4a981a 100644 (file)
--- a/arch/arm/boot/dts/imx6q-arm2.dts
+++ b/arch/arm/boot/dts/imx6q-arm2.dts
@@ -17,19 +17,14 @@
        model = "Freescale i.MX6 Quad Armadillo2 Board";
        compatible = "fsl,imx6q-arm2", "fsl,imx6q";
 
-       chosen {
-               bootargs = "console=ttymxc0,115200 root=/dev/mmcblk3p3 rootwait";
-       };
-
        memory {
                reg = <0x10000000 0x80000000>;
        };
 
        soc {
                aips-bus@02100000 { /* AIPS2 */
-                       enet@02188000 {
+                       ethernet@02188000 {
                                phy-mode = "rgmii";
-                               local-mac-address = [00 04 9F 01 1B 61];
                                status = "okay";
                        };
 
@@ -37,16 +32,20 @@
                                cd-gpios = <&gpio6 11 0>;
                                wp-gpios = <&gpio6 14 0>;
                                vmmc-supply = <&reg_3p3v>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&pinctrl_usdhc3_1>;
                                status = "okay";
                        };
 
                        usdhc@0219c000 { /* uSDHC4 */
-                               fsl,card-wired;
+                               non-removable;
                                vmmc-supply = <&reg_3p3v>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&pinctrl_usdhc4_1>;
                                status = "okay";
                        };
 
-                       uart4: uart@021f0000 {
+                       uart4: serial@021f0000 {
                                status = "okay";
                        };
                };