FROMLIST: ARM: dts: rockchip: add eDP/panel display device nodes for rk3288-evb

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / kirkwood-openblocks_a6.dts

diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
index 0650beafc1de0ac4a7e60fbc759ed7726982c22a..fb9dc227255d91a2a4bdb58a7adfac3072a80521 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
+++ b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
@@ -14,19 +14,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 {
@@ -36,8 +33,6 @@
 
                i2c@11100 {
                        status = "okay";
-                       pinctrl-0 = <&pmx_twsi1>;
-                       pinctrl-names = "default";
 
                        s35390a: s35390a@30 {
                                compatible = "sii,s35390a";
@@ -45,7 +40,7 @@
                        };
                };
 
-               pinctrl: pinctrl@10000 {
+               pinctrl: pin-controller@10000 {
                        pinctrl-0 = <&pmx_dip_switches &pmx_gpio_header>;
                        pinctrl-names = "default";
 
@@ -133,8 +128,6 @@
 &nand {
        chip-delay = <25>;
        status = "okay";
-       pinctrl-0 = <&pmx_nand>;
-       pinctrl-names = "default";
 
        partition@0 {
                label = "uboot";