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-dnskw.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-dnskw.dtsi')
-rw-r--r-- | dts/src/arm/kirkwood-dnskw.dtsi | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/dts/src/arm/kirkwood-dnskw.dtsi b/dts/src/arm/kirkwood-dnskw.dtsi index d5aa9564a2..113dcf056d 100644 --- a/dts/src/arm/kirkwood-dnskw.dtsi +++ b/dts/src/arm/kirkwood-dnskw.dtsi @@ -50,7 +50,7 @@ }; ocp@f1000000 { - pinctrl: pinctrl@10000 { + pinctrl: pin-controller@10000 { pinctrl-0 = <&pmx_power_back_on &pmx_present_sata0 &pmx_present_sata1 &pmx_fan_tacho @@ -183,8 +183,6 @@ }; &nand { - pinctrl-0 = <&pmx_nand>; - pinctrl-names = "default"; status = "okay"; chip-delay = <35>; |