diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-06-17 22:16:07 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-06-19 09:41:51 +0200 |
| commit | 9313920df6d3d55fbd03ce8ec1c0da9a10c29824 (patch) | |
| tree | ef80d80abbaf46293b777ead52caddd9d5d97644 /dts/src/arm/kirkwood-ib62x0.dts | |
| parent | 83e875e1f45beffe399cff0ff6128e0fca9da168 (diff) | |
| download | barebox-9313920df6d3d55fbd03ce8ec1c0da9a10c29824.tar.gz barebox-9313920df6d3d55fbd03ce8ec1c0da9a10c29824.tar.xz | |
dts: update to v3.16-rc1
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'dts/src/arm/kirkwood-ib62x0.dts')
| -rw-r--r-- | dts/src/arm/kirkwood-ib62x0.dts | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/dts/src/arm/kirkwood-ib62x0.dts b/dts/src/arm/kirkwood-ib62x0.dts index a1add3f215..bfa5edde17 100644 --- a/dts/src/arm/kirkwood-ib62x0.dts +++ b/dts/src/arm/kirkwood-ib62x0.dts @@ -14,10 +14,11 @@ chosen { bootargs = "console=ttyS0,115200n8 earlyprintk"; + stdout-path = &uart0; }; ocp@f1000000 { - pinctrl: pinctrl@10000 { + pinctrl: pin-controller@10000 { pmx_led_os_red: pmx-led-os-red { marvell,pins = "mpp22"; marvell,function = "gpio"; @@ -104,8 +105,6 @@ &nand { status = "okay"; - pinctrl-0 = <&pmx_nand>; - pinctrl-names = "default"; partition@0 { label = "u-boot"; |