KARO: cleanup after merge of Freescale 3.10.17 stuff

[karo-tx-linux.git] / arch / arm / boot / dts / kirkwood-openblocks_a7.dts

diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
index 38520a2875146d565c8016f69cc4f324098ff1ee..d5e3bc518968b4acf5e4b811d2944a84d12b79b8 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
+++ b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
@@ -26,19 +26,16 @@
 
        chosen {
                bootargs = "console=ttyS0,115200n8 earlyprintk";
+               stdout-path = &uart0;
        };
 
        ocp@f1000000 {
                serial@12000 {
-                       status = "ok";
-                       pinctrl-0 = <&pmx_uart0>;
-                       pinctrl-names = "default";
+                       status = "okay";
                };
 
                serial@12100 {
-                       status = "ok";
-                       pinctrl-0 = <&pmx_uart1>;
-                       pinctrl-names = "default";
+                       status = "okay";
                };
 
                sata@80000 {
@@ -48,8 +45,6 @@
 
                i2c@11100 {
                        status = "okay";
-                       pinctrl-0 = <&pmx_twsi1>;
-                       pinctrl-names = "default";
 
                        s24c02: s24c02@50 {
                                compatible = "atmel,24c02";
@@ -57,7 +52,7 @@
                        };
                };
 
-               pinctrl: pinctrl@10000 {
+               pinctrl: pin-controller@10000 {
                        pinctrl-0 = <&pmx_dip_switches &pmx_gpio_header>;
                        pinctrl-names = "default";
 
@@ -109,13 +104,6 @@
                                marvell,pins = "mpp41", "mpp42", "mpp43";
                                marvell,function = "gpio";
                        };
-
-                       pmx_ge1: pmx-ge1 {
-                               marvell,pins = "mpp20", "mpp21", "mpp22", "mpp23",
-                                              "mpp24", "mpp25", "mpp26", "mpp27",
-                                              "mpp30", "mpp31", "mpp32", "mpp33";
-                               marvell,function = "ge1";
-                       };
                };
        };
 
@@ -158,8 +146,6 @@
 &nand {
        chip-delay = <25>;
        status = "okay";
-       pinctrl-0 = <&pmx_nand>;
-       pinctrl-names = "default";
 
        partition@0 {
                label = "uboot";
@@ -213,8 +199,6 @@
 
 &eth1 {
        status = "okay";
-       pinctrl-0 = <&pmx_ge1>;
-       pinctrl-names = "default";
        ethernet1-port@0 {
                phy-handle = <&ethphy1>;
        };