From 4990a729b2d5b2cf86267ab655bfb9acacb84654 Mon Sep 17 00:00:00 2001
From: Andrew Lunn <andrew@lunn.ch>
Date: Sat, 17 Nov 2012 17:00:45 +0100
Subject: [PATCH] --- yaml --- r: 342346 b: refs/heads/master c:
 82bb2da1787a1ec797626dcbb49ae9f171109c9b h: refs/heads/master v: v3

---
 [refs]                                     |  2 +-
 trunk/arch/arm/boot/dts/kirkwood-6281.dtsi | 39 ++++++++++++++++++++++
 trunk/arch/arm/boot/dts/kirkwood-6282.dtsi | 35 +++++++++++++++++++
 3 files changed, 75 insertions(+), 1 deletion(-)
 create mode 100644 trunk/arch/arm/boot/dts/kirkwood-6281.dtsi
 create mode 100644 trunk/arch/arm/boot/dts/kirkwood-6282.dtsi

diff --git a/[refs] b/[refs]
index b6f50abb4e39..40e5d802b465 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f9e7592230b72acb703e6c29691d587341b6c710
+refs/heads/master: 82bb2da1787a1ec797626dcbb49ae9f171109c9b
diff --git a/trunk/arch/arm/boot/dts/kirkwood-6281.dtsi b/trunk/arch/arm/boot/dts/kirkwood-6281.dtsi
new file mode 100644
index 000000000000..b0fe6828b4fd
--- /dev/null
+++ b/trunk/arch/arm/boot/dts/kirkwood-6281.dtsi
@@ -0,0 +1,39 @@
+/ {
+	ocp@f1000000 {
+		pinctrl: pinctrl@10000 {
+			compatible = "marvell,88f6281-pinctrl";
+			reg = <0x10000 0x20>;
+
+			pmx_nand: pmx-nand {
+				marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3",
+					       "mpp4", "mpp5", "mpp18",
+					       "mpp19";
+				marvell,function = "nand";
+			};
+			pmx_sata0: pmx-sata0 {
+				marvell,pins = "mpp5", "mpp21", "mpp23";
+				marvell,function = "sata0";
+			};
+			pmx_sata1: pmx-sata1 {
+				marvell,pins = "mpp4", "mpp20", "mpp22";
+				marvell,function = "sata1";
+			};
+			pmx_spi: pmx-spi {
+				marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3";
+				marvell,function = "spi";
+			};
+			pmx_twsi0: pmx-twsi0 {
+				marvell,pins = "mpp8", "mpp9";
+				marvell,function = "twsi0";
+			};
+			pmx_uart0: pmx-uart0 {
+				marvell,pins = "mpp10", "mpp11";
+				marvell,function = "uart0";
+			};
+			pmx_uart1: pmx-uart1 {
+				marvell,pins = "mpp13", "mpp14";
+				marvell,function = "uart1";
+			};
+		};
+	};
+};
\ No newline at end of file
diff --git a/trunk/arch/arm/boot/dts/kirkwood-6282.dtsi b/trunk/arch/arm/boot/dts/kirkwood-6282.dtsi
new file mode 100644
index 000000000000..d6a4145c8e30
--- /dev/null
+++ b/trunk/arch/arm/boot/dts/kirkwood-6282.dtsi
@@ -0,0 +1,35 @@
+/ {
+	ocp@f1000000 {
+
+		pinctrl: pinctrl@10000 {
+			compatible = "marvell,88f6282-pinctrl";
+			reg = <0x10000 0x20>;
+
+			pmx_sata0: pmx-sata0 {
+				marvell,pins = "mpp5", "mpp21", "mpp23";
+				marvell,function = "sata0";
+			};
+			pmx_sata1: pmx-sata1 {
+				marvell,pins = "mpp4", "mpp20", "mpp22";
+				marvell,function = "sata1";
+			};
+			pmx_spi: pmx-spi {
+				marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3";
+				marvell,function = "spi";
+			};
+			pmx_twsi0: pmx-twsi0 {
+				marvell,pins = "mpp8", "mpp9";
+				marvell,function = "twsi0";
+			};
+			pmx_uart0: pmx-uart0 {
+				marvell,pins = "mpp10", "mpp11";
+				marvell,function = "uart0";
+			};
+
+			pmx_uart1: pmx-uart1 {
+				marvell,pins = "mpp13", "mpp14";
+				marvell,function = "uart1";
+			};
+		};
+	};
+};
\ No newline at end of file