diff options
| author | Simon Guinot <simon.guinot@sequanux.org> | 2013-01-08 15:36:18 +0100 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2013-01-10 01:25:56 +0000 |
| commit | 4ea931e07d7708bdf42cff31e27dcc5d307ab6f7 (patch) | |
| tree | bd1dfed5e732ea31bd2703cbdb595df0b9339de0 /arch/arm/boot | |
| parent | 5f79c651e81e7731e9f252ac420bd81e144199d6 (diff) | |
| download | blackbird-op-linux-4ea931e07d7708bdf42cff31e27dcc5d307ab6f7.tar.gz blackbird-op-linux-4ea931e07d7708bdf42cff31e27dcc5d307ab6f7.zip | |
ARM: Kirkwood: fix ns2 gpios by converting to pinctrl
Note that the pinctrl conversion also fixes GPIO support for ns2 boards.
Since commit f9e75922: "ARM: Kirkwood: Make use of mvebu pincltl and
gpio", the mvbu_gpio driver is used for DT boards. As mvbu_gpio relies
on the pinctrl driver, then a pinctrl definition must be given to allow
the GPIO configuration.
Signed-off-by: Simon Guinot <simon.guinot@sequanux.org>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/kirkwood-ns2-common.dtsi | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi index 9bc6785ad228..77d21abfcdf7 100644 --- a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi +++ b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi @@ -1,4 +1,5 @@ /include/ "kirkwood.dtsi" +/include/ "kirkwood-6281.dtsi" / { chosen { @@ -6,6 +7,21 @@ }; ocp@f1000000 { + pinctrl: pinctrl@10000 { + pinctrl-0 = < &pmx_spi &pmx_twsi0 &pmx_uart0 + &pmx_ns2_sata0 &pmx_ns2_sata1>; + pinctrl-names = "default"; + + pmx_ns2_sata0: pmx-ns2-sata0 { + marvell,pins = "mpp21"; + marvell,function = "sata0"; + }; + pmx_ns2_sata1: pmx-ns2-sata1 { + marvell,pins = "mpp20"; + marvell,function = "sata1"; + }; + }; + serial@12000 { clock-frequency = <166666667>; status = "okay"; |
