diff mbox

[1/2] ARM: Kirkwood: topkick: Fix SoC type and add missing pins

Message ID 1359219326-5927-1-git-send-email-andrew@lunn.ch (mailing list archive)
State New, archived
Headers show

Commit Message

Andrew Lunn Jan. 26, 2013, 4:55 p.m. UTC
Topkick contains a Marvell 6282, not an 6281 as included in the
kirkwood-topkick.dts file.

Also, add pinhogs for the serial port and nand devices.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
 arch/arm/boot/dts/kirkwood-topkick.dts |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Comments

Jason Cooper Jan. 26, 2013, 8:39 p.m. UTC | #1
On Sat, Jan 26, 2013 at 05:55:24PM +0100, Andrew Lunn wrote:
> Topkick contains a Marvell 6282, not an 6281 as included in the
> kirkwood-topkick.dts file.
> 
> Also, add pinhogs for the serial port and nand devices.
> 
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> ---
>  arch/arm/boot/dts/kirkwood-topkick.dts |    6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)

Squashed into pinctrl conversion, thanks and good catch.

thx,

Jason.
diff mbox

Patch

diff --git a/arch/arm/boot/dts/kirkwood-topkick.dts b/arch/arm/boot/dts/kirkwood-topkick.dts
index edefbb5..c8e8a64 100644
--- a/arch/arm/boot/dts/kirkwood-topkick.dts
+++ b/arch/arm/boot/dts/kirkwood-topkick.dts
@@ -1,7 +1,7 @@ 
 /dts-v1/;
 
 /include/ "kirkwood.dtsi"
-/include/ "kirkwood-6281.dtsi"
+/include/ "kirkwood-6282.dtsi"
 
 / {
 	model = "Univeral Scientific Industrial Co. Topkick-1281P2";
@@ -50,7 +50,9 @@ 
 				      &pmx_sw_right
 				      &pmx_sw_idle
 				      &pmx_sw_left2
-				      &pmx_led_wifi_yellow >;
+				      &pmx_led_wifi_yellow
+				      &pmx_uart0
+				      &pmx_nand >;
 			pinctrl-names = "default";
 
 			pmx_led_disk_yellow: pmx-led-disk-yellow {