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-sheevaplug-common.dtsi | |
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-sheevaplug-common.dtsi')
-rw-r--r-- | dts/src/arm/kirkwood-sheevaplug-common.dtsi | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/dts/src/arm/kirkwood-sheevaplug-common.dtsi b/dts/src/arm/kirkwood-sheevaplug-common.dtsi index 1ff848d570..7196c7f3e1 100644 --- a/dts/src/arm/kirkwood-sheevaplug-common.dtsi +++ b/dts/src/arm/kirkwood-sheevaplug-common.dtsi @@ -17,10 +17,11 @@ chosen { bootargs = "console=ttyS0,115200n8 earlyprintk"; + stdout-path = &uart0; }; ocp@f1000000 { - pinctrl: pinctrl@10000 { + pinctrl: pin-controller@10000 { pmx_usb_power_enable: pmx-usb-power-enable { marvell,pins = "mpp29"; @@ -44,8 +45,6 @@ }; }; serial@12000 { - pinctrl-0 = <&pmx_uart0>; - pinctrl-names = "default"; status = "okay"; }; }; @@ -72,8 +71,6 @@ }; &nand { - pinctrl-0 = <&pmx_nand>; - pinctrl-names = "default"; status = "okay"; partition@0 { |