1 files changed, 6 insertions, 7 deletions

diff --git a/arch/arm/boot/dts/imx6q-arm2.dts b/arch/arm/boot/dts/imx6q-arm2.dts
index d2eaf521c9fd..db4c6096c562 100644
--- 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 */
                                 non-removable;
                                 vmmc-supply = <&reg_3p3v>;
+                                pinctrl-names = "default";
+                                pinctrl-0 = <&pinctrl_usdhc4_1>;
                                 status = "okay";
                         };
 
-                        uart4: uart@021f0000 {
+                        uart4: serial@021f0000 {
                                 status = "okay";
                         };
                 };