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-rd88f6192.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-rd88f6192.dts')
-rw-r--r-- | dts/src/arm/kirkwood-rd88f6192.dts | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/dts/src/arm/kirkwood-rd88f6192.dts b/dts/src/arm/kirkwood-rd88f6192.dts index e9dd850492..35a29dee8d 100644 --- a/dts/src/arm/kirkwood-rd88f6192.dts +++ b/dts/src/arm/kirkwood-rd88f6192.dts @@ -26,6 +26,7 @@ chosen { bootargs = "console=ttyS0,115200n8"; + stdout-path = &uart0; }; mbus { @@ -39,7 +40,7 @@ }; ocp@f1000000 { - pinctrl: pinctrl@10000 { + pinctrl: pin-controller@10000 { pinctrl-0 = <&pmx_usb_power>; pinctrl-names = "default"; @@ -56,8 +57,6 @@ spi@10600 { status = "okay"; - pinctrl-0 = <&pmx_spi>; - pinctrl-names = "default"; m25p128@0 { #address-cells = <1>; |