diff options
Diffstat (limited to 'arch/arm/boot/dts/kirkwood-ib62x0.dts')
-rw-r--r-- | arch/arm/boot/dts/kirkwood-ib62x0.dts | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/kirkwood-ib62x0.dts b/arch/arm/boot/dts/kirkwood-ib62x0.dts index a1add3f215e3..bfa5edde179c 100644 --- a/arch/arm/boot/dts/kirkwood-ib62x0.dts +++ b/arch/arm/boot/dts/kirkwood-ib62x0.dts | |||
@@ -14,10 +14,11 @@ | |||
14 | 14 | ||
15 | chosen { | 15 | chosen { |
16 | bootargs = "console=ttyS0,115200n8 earlyprintk"; | 16 | bootargs = "console=ttyS0,115200n8 earlyprintk"; |
17 | stdout-path = &uart0; | ||
17 | }; | 18 | }; |
18 | 19 | ||
19 | ocp@f1000000 { | 20 | ocp@f1000000 { |
20 | pinctrl: pinctrl@10000 { | 21 | pinctrl: pin-controller@10000 { |
21 | pmx_led_os_red: pmx-led-os-red { | 22 | pmx_led_os_red: pmx-led-os-red { |
22 | marvell,pins = "mpp22"; | 23 | marvell,pins = "mpp22"; |
23 | marvell,function = "gpio"; | 24 | marvell,function = "gpio"; |
@@ -104,8 +105,6 @@ | |||
104 | 105 | ||
105 | &nand { | 106 | &nand { |
106 | status = "okay"; | 107 | status = "okay"; |
107 | pinctrl-0 = <&pmx_nand>; | ||
108 | pinctrl-names = "default"; | ||
109 | 108 | ||
110 | partition@0 { | 109 | partition@0 { |
111 | label = "u-boot"; | 110 | label = "u-boot"; |