diff mbox

ARM: Kirkwood: DT versions of OpenRD boards

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

Commit Message

Andrew Lunn May 6, 2014, 10:48 p.m. UTC 
Create DTS files to describe the Marvell OpenRD boards.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Tested-by: Francois Lorrain <francois.lorrain@gmail.com>
---
 arch/arm/boot/dts/Makefile                     |  3 +
 arch/arm/boot/dts/kirkwood-openrd-base.dts     | 42 ++++++++++++
 arch/arm/boot/dts/kirkwood-openrd-client.dts   | 75 +++++++++++++++++++++
 arch/arm/boot/dts/kirkwood-openrd-ultimate.dts | 60 +++++++++++++++++
 arch/arm/boot/dts/kirkwood-openrd.dtsi         | 91 ++++++++++++++++++++++++++
 5 files changed, 271 insertions(+)
 create mode 100644 arch/arm/boot/dts/kirkwood-openrd-base.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-openrd-client.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-openrd-ultimate.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-openrd.dtsi

Comments

Sebastian Hesselbarth May 7, 2014, 7:40 a.m. UTC | #1 
On 05/07/2014 12:48 AM, Andrew Lunn wrote:
> Create DTS files to describe the Marvell OpenRD boards.
> 
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> Tested-by: Francois Lorrain <francois.lorrain@gmail.com>
> ---
[...]
> diff --git a/arch/arm/boot/dts/kirkwood-openrd-base.dts b/arch/arm/boot/dts/kirkwood-openrd-base.dts
> new file mode 100644
> index 000000000000..03cb87cd4bbe
> --- /dev/null
> +++ b/arch/arm/boot/dts/kirkwood-openrd-base.dts
> @@ -0,0 +1,42 @@
> +/*
> + * Marvell OpenRD Base Board descrition

s/descrition/description/

> + * Andrew Lunn <andrew@lunn.ch>
> + *
> + * This file is licensed under the terms of the GNU General Public
> + * License version 2.  This program is licensed "as is" without any
> + * warranty of any kind, whether express or implied.
> + *
> + * This file contains the definitions that are specific to OpenRD
> + * base variant of the Marvell Kirkwood Development Board.
> + */
> +
> +/dts-v1/;
> +
> +#include "kirkwood-openrd.dtsi"
> +
> +/ {
> +	model = "OpenRD Base";
> +	compatible = "marvell,openrd-base", "marvell,openrd", "marvell,kirkwood-88f6281", "marvell,kirkwood";
> +
> +	ocp@f1000000 {
> +		serial@12100 {
> +			status = "okay";

Andrew,

I see you used the "good template" this time ;) I again have some nits,
that either you can take care of or me in the cleanup patches. I guess
it depends on whatever goes in first. ;)

> +		};
> +	};
> +};
> +
> +&mdio {
> +	status = "okay";
> +
> +	ethphy0: ethernet-phy@8 {
> +		reg = <8>;
> +	};
> +};
> +
> +&eth0 {
> +	status = "okay";
> +	ethernet0-port@0 {
> +		phy-handle = <&ethphy0>;
> +	};
> +};
> diff --git a/arch/arm/boot/dts/kirkwood-openrd-client.dts b/arch/arm/boot/dts/kirkwood-openrd-client.dts
> new file mode 100644
> index 000000000000..6179542c860f
> --- /dev/null
> +++ b/arch/arm/boot/dts/kirkwood-openrd-client.dts
> @@ -0,0 +1,75 @@
> +/*
> + * Marvell OpenRD Client Board descrition

s/descrition/description/

> + * Andrew Lunn <andrew@lunn.ch>
> + *
> + * This file is licensed under the terms of the GNU General Public
> + * License version 2.  This program is licensed "as is" without any
> + * warranty of any kind, whether express or implied.
> + *
> + * This file contains the definitions that are specific to OpenRD
> + * client variant of the Marvell Kirkwood Development Board.
> + */
> +
> +/dts-v1/;
> +
> +#include "kirkwood-openrd.dtsi"
> +
> +/ {
> +	model = "OpenRD Client";
> +	compatible = "marvell,openrd-client", "marvell,openrd", "marvell,kirkwood-88f6281", "marvell,kirkwood";
> +
> +	ocp@f1000000 {
> +		i2c@11000 {
> +			status = "okay";
> +			clock-frequency = <400000>;
> +			pinctrl-0 = <&pmx_twsi0>;
> +			pinctrl-names = "default";

The default pinctrl should have been set by the SoC dtsi already.

> +			cs42l51: cs42l51@4a {
> +				compatible = "cirrus,cs42l51";
> +				reg = <0x4a>;
> +			};
> +		};
> +	};
> +
> +	sound {
> +		compatible = "simple-audio-card";
> +		simple-audio-card,format = "i2s";
> +		simple-audio-card,mclk-fs = <256>;
> +
> +		simple-audio-card,cpu {
> +			sound-dai = <&audio0>;
> +		};
> +
> +		simple-audio-card,codec {
> +			sound-dai = <&cs42l51>;
> +		};
> +	};
> +};
> +
> +&mdio {
> +	status = "okay";
> +
> +	ethphy0: ethernet-phy@8 {
> +		reg = <8>;
> +	};
> +	ethphy1: ethernet-phy@24 {
> +		reg = <24>;
> +	};
> +};
> +
> +&eth0 {
> +	status = "okay";
> +	ethernet0-port@0 {
> +		phy-handle = <&ethphy0>;
> +	};
> +};
> +
> +&eth1 {
> +	status = "okay";
> +	ethernet1-port@0 {
> +		phy-handle = <&ethphy1>;
> +	};
> +};
> +
> diff --git a/arch/arm/boot/dts/kirkwood-openrd-ultimate.dts b/arch/arm/boot/dts/kirkwood-openrd-ultimate.dts
> new file mode 100644
> index 000000000000..7a233d7f4701
> --- /dev/null
> +++ b/arch/arm/boot/dts/kirkwood-openrd-ultimate.dts
> @@ -0,0 +1,60 @@
> +/*
> + * Marvell OpenRD Ultimate Board descrition

s/descrition/description/

> + * Andrew Lunn <andrew@lunn.ch>
> + *
> + * This file is licensed under the terms of the GNU General Public
> + * License version 2.  This program is licensed "as is" without any
> + * warranty of any kind, whether express or implied.
> + *
> + * This file contains the definitions that are specific to OpenRD
> + * ultimate variant of the Marvell Kirkwood Development Board.
> + */
> +
> +/dts-v1/;
> +
> +#include "kirkwood-openrd.dtsi"
> +
> +/ {
> +	model = "OpenRD Ultimate";
> +	compatible = "marvell,openrd-ultimate", "marvell,openrd", "marvell,kirkwood-88f6281", "marvell,kirkwood";
> +
> +	ocp@f1000000 {
> +		i2c@11000 {
> +			status = "okay";
> +			clock-frequency = <400000>;
> +			pinctrl-0 = <&pmx_twsi0>;
> +			pinctrl-names = "default";

ditto.

> +			cs42l51: cs42l51@4a {
> +				compatible = "cirrus,cs42l51";
> +				reg = <0x4a>;
> +			};
> +		};
> +	};
> +};
> +
> +&mdio {
> +	status = "okay";
> +
> +	ethphy0: ethernet-phy@0 {
> +		reg = <0>;
> +	};
> +	ethphy1: ethernet-phy@1 {
> +		reg = <1>;
> +	};
> +};
> +
> +&eth0 {
> +	status = "okay";
> +	ethernet0-port@0 {
> +		phy-handle = <&ethphy0>;
> +	};
> +};
> +
> +&eth1 {
> +	status = "okay";
> +	ethernet1-port@0 {
> +		phy-handle = <&ethphy1>;
> +	};
> +};
> diff --git a/arch/arm/boot/dts/kirkwood-openrd.dtsi b/arch/arm/boot/dts/kirkwood-openrd.dtsi
> new file mode 100644
> index 000000000000..30e0f38a1a37
> --- /dev/null
> +++ b/arch/arm/boot/dts/kirkwood-openrd.dtsi
> @@ -0,0 +1,91 @@
> +/*
> + * Marvell OpenRD (Base|Client|Ultimate) Board descrition

s/descrition/description/

> + *
> + * Andrew Lunn <andrew@lunn.ch>
> + *
> + * This file is licensed under the terms of the GNU General Public
> + * License version 2.  This program is licensed "as is" without any
> + * warranty of any kind, whether express or implied.
> + *
> + * This file contains the definitions that are common between the three
> + * variants of the Marvell Kirkwood Development Board.
> + */
> +
> +#include "kirkwood.dtsi"
> +#include "kirkwood-6281.dtsi"
> +
> +/ {
> +	memory {
> +		device_type = "memory";
> +		reg = <0x00000000 0x20000000>;
> +	};
> +
> +	chosen {
> +		bootargs = "console=ttyS0,115200n8";
> +		stdout-path = &uart0;
> +	};
> +
> +	mbus {
> +		pcie-controller {
> +			status = "okay";
> +
> +			pcie@1,0 {
> +				status = "okay";
> +			};
> +		};
> +	};
> +
> +	ocp@f1000000 {
> +		pinctrl: pin-controller@10000 {
> +			pinctrl-0 = <&pmx_select28 &pmx_sdio_cd &pmx_select34>;
> +			pinctrl-names = "default";
> +
> +			pmx_select28: pmx-select-uart-sd {
> +				marvell,pins = "mpp28";
> +				marvell,function = "gpio";
> +			};
> +			pmx_sdio_cd: pmx-sdio-cd {
> +				marvell,pins = "mpp29";
> +				marvell,function = "gpio";
> +			};
> +			pmx_select34: pmx-select-rs232-rs484 {
> +				marvell,pins = "mpp34";
> +				marvell,function = "gpio";
> +			};
> +		};
> +		serial@12000 {
> +			status = "okay";
> +
> +		};
> +		sata@80000 {
> +			status = "okay";
> +			nr-ports = <2>;
> +		};
> +		mvsdio@90000 {
> +			status = "okay";
> +			cd-gpios = <&gpio0 29 9>;
> +			status = "disabled";

Any reason not to enable sdio?

Besides the nits above,

Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>

> +		};
> +	};
> +};
> +
> +&nand {
> +	status = "okay";
> +	pinctrl-0 = <&pmx_nand>;
> +	pinctrl-names = "default";
> +
> +	partition@0 {
> +		label = "u-boot";
> +		reg = <0x0000000 0x100000>;
> +	};
> +
> +	partition@100000 {
> +		label = "uImage";
> +		reg = <0x0100000 0x400000>;
> +	};
> +
> +	partition@600000 {
> +		label = "root";
> +		reg = <0x0600000 0x1FA00000>;
> +	};
> +};
>
Andrew Lunn May 7, 2014, 1:29 p.m. UTC | #2 
On Wed, May 07, 2014 at 09:40:12AM +0200, Sebastian Hesselbarth wrote:
> On 05/07/2014 12:48 AM, Andrew Lunn wrote:
> > Create DTS files to describe the Marvell OpenRD boards.
> > 
> > Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> > Tested-by: Francois Lorrain <francois.lorrain@gmail.com>
> > ---
> [...]
> > diff --git a/arch/arm/boot/dts/kirkwood-openrd-base.dts b/arch/arm/boot/dts/kirkwood-openrd-base.dts
> > new file mode 100644
> > index 000000000000..03cb87cd4bbe
> > --- /dev/null
> > +++ b/arch/arm/boot/dts/kirkwood-openrd-base.dts
> > @@ -0,0 +1,42 @@
> > +/*
> > + * Marvell OpenRD Base Board descrition
> 
> s/descrition/description/
> 
> > + * Andrew Lunn <andrew@lunn.ch>
> > + *
> > + * This file is licensed under the terms of the GNU General Public
> > + * License version 2.  This program is licensed "as is" without any
> > + * warranty of any kind, whether express or implied.
> > + *
> > + * This file contains the definitions that are specific to OpenRD
> > + * base variant of the Marvell Kirkwood Development Board.
> > + */
> > +
> > +/dts-v1/;
> > +
> > +#include "kirkwood-openrd.dtsi"
> > +
> > +/ {
> > +	model = "OpenRD Base";
> > +	compatible = "marvell,openrd-base", "marvell,openrd", "marvell,kirkwood-88f6281", "marvell,kirkwood";
> > +
> > +	ocp@f1000000 {
> > +		serial@12100 {
> > +			status = "okay";
> 
> Andrew,
> 
> I see you used the "good template" this time ;) I again have some nits,
> that either you can take care of or me in the cleanup patches. I guess
> it depends on whatever goes in first. ;)

The patch already depends on your patches, so i may as well do the
cleanup. I need to fix "description" anyway.


> 
> > +		};
> > +	};
> > +};
> > +
> > +&mdio {
> > +	status = "okay";
> > +
> > +	ethphy0: ethernet-phy@8 {
> > +		reg = <8>;
> > +	};
> > +};
> > +
> > +&eth0 {
> > +	status = "okay";
> > +	ethernet0-port@0 {
> > +		phy-handle = <&ethphy0>;
> > +	};
> > +};
> > diff --git a/arch/arm/boot/dts/kirkwood-openrd-client.dts b/arch/arm/boot/dts/kirkwood-openrd-client.dts
> > new file mode 100644
> > index 000000000000..6179542c860f
> > --- /dev/null
> > +++ b/arch/arm/boot/dts/kirkwood-openrd-client.dts
> > @@ -0,0 +1,75 @@
> > +/*
> > + * Marvell OpenRD Client Board descrition
> 
> s/descrition/description/
> 
> > + * Andrew Lunn <andrew@lunn.ch>
> > + *
> > + * This file is licensed under the terms of the GNU General Public
> > + * License version 2.  This program is licensed "as is" without any
> > + * warranty of any kind, whether express or implied.
> > + *
> > + * This file contains the definitions that are specific to OpenRD
> > + * client variant of the Marvell Kirkwood Development Board.
> > + */
> > +
> > +/dts-v1/;
> > +
> > +#include "kirkwood-openrd.dtsi"
> > +
> > +/ {
> > +	model = "OpenRD Client";
> > +	compatible = "marvell,openrd-client", "marvell,openrd", "marvell,kirkwood-88f6281", "marvell,kirkwood";
> > +
> > +	ocp@f1000000 {
> > +		i2c@11000 {
> > +			status = "okay";
> > +			clock-frequency = <400000>;
> > +			pinctrl-0 = <&pmx_twsi0>;
> > +			pinctrl-names = "default";
> 
> The default pinctrl should have been set by the SoC dtsi already.

You only pointed this out for i2c. What else is it true for? I should
go look at your patches.

> > +		mvsdio@90000 {
> > +			status = "okay";
> > +			cd-gpios = <&gpio0 29 9>;
> > +			status = "disabled";
> 
> Any reason not to enable sdio?

Only client and ultimate have an SD slot. Base does not. If i have it
right, client.dts and ultimate.dts should be enabling it. I will
double check.

> Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>

Thanks
	Andrew
Sebastian Hesselbarth May 7, 2014, 2:01 p.m. UTC | #3 
On 05/07/2014 03:29 PM, Andrew Lunn wrote:
> On Wed, May 07, 2014 at 09:40:12AM +0200, Sebastian Hesselbarth wrote:
>> On 05/07/2014 12:48 AM, Andrew Lunn wrote:
>>> Create DTS files to describe the Marvell OpenRD boards.
>>>
>>> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
>>> Tested-by: Francois Lorrain <francois.lorrain@gmail.com>
>>> ---
>> [...]
>>> +/dts-v1/;
>>> +
>>> +#include "kirkwood-openrd.dtsi"
>>> +
>>> +/ {
>>> +	model = "OpenRD Base";
>>> +	compatible = "marvell,openrd-base", "marvell,openrd", "marvell,kirkwood-88f6281", "marvell,kirkwood";
>>> +
>>> +	ocp@f1000000 {
>>> +		serial@12100 {
>>> +			status = "okay";
>>
>> I see you used the "good template" this time ;) I again have some nits,
>> that either you can take care of or me in the cleanup patches. I guess
>> it depends on whatever goes in first. ;)
>
> The patch already depends on your patches, so i may as well do the
> cleanup. I need to fix "description" anyway.

Right, I noticed that after I sent the mail. As you already have some
fixes, you should take care of it.

[...]
>>> +/dts-v1/;
>>> +
>>> +#include "kirkwood-openrd.dtsi"
>>> +
>>> +/ {
>>> +	model = "OpenRD Client";
>>> +	compatible = "marvell,openrd-client", "marvell,openrd", "marvell,kirkwood-88f6281", "marvell,kirkwood";
>>> +
>>> +	ocp@f1000000 {
>>> +		i2c@11000 {
>>> +			status = "okay";
>>> +			clock-frequency = <400000>;
>>> +			pinctrl-0 = <&pmx_twsi0>;
>>> +			pinctrl-names = "default";
>>
>> The default pinctrl should have been set by the SoC dtsi already.
>
> You only pointed this out for i2c. What else is it true for? I should
> go look at your patches.

KW DT cleanup sets default pinctrl for GBE1, UART0, UART1, SPI0, NAND,
I2C0 and I2C1 on 6282.

>>> +		mvsdio@90000 {
>>> +			status = "okay";
>>> +			cd-gpios = <&gpio0 29 9>;
>>> +			status = "disabled";
>>
>> Any reason not to enable sdio?
>
> Only client and ultimate have an SD slot. Base does not. If i have it
> right, client.dts and ultimate.dts should be enabling it. I will
> double check.

Ah, ok. So it is an "odd man out"-situation again, i.e. there is one
out of the tree different again? I am fine with it.

Sebastian
diff mbox

Patch

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 35c146f31e46..4dfd5bd570e6 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -128,6 +128,9 @@  kirkwood := \
 	kirkwood-nsa310a.dtb \
 	kirkwood-openblocks_a6.dtb \
 	kirkwood-openblocks_a7.dtb \
+	kirkwood-openrd-base.dtb \
+	kirkwood-openrd-client.dtb \
+	kirkwood-openrd-ultimate.dtb \
 	kirkwood-rd88f6192.dtb \
 	kirkwood-rd88f6281-a0.dtb \
 	kirkwood-rd88f6281-a1.dtb \
diff --git a/arch/arm/boot/dts/kirkwood-openrd-base.dts b/arch/arm/boot/dts/kirkwood-openrd-base.dts
new file mode 100644
index 000000000000..03cb87cd4bbe
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-openrd-base.dts
@@ -0,0 +1,42 @@ 
+/*
+ * Marvell OpenRD Base Board descrition
+ *
+ * Andrew Lunn <andrew@lunn.ch>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ *
+ * This file contains the definitions that are specific to OpenRD
+ * base variant of the Marvell Kirkwood Development Board.
+ */
+
+/dts-v1/;
+
+#include "kirkwood-openrd.dtsi"
+
+/ {
+	model = "OpenRD Base";
+	compatible = "marvell,openrd-base", "marvell,openrd", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+
+	ocp@f1000000 {
+		serial@12100 {
+			status = "okay";
+		};
+	};
+};
+
+&mdio {
+	status = "okay";
+
+	ethphy0: ethernet-phy@8 {
+		reg = <8>;
+	};
+};
+
+&eth0 {
+	status = "okay";
+	ethernet0-port@0 {
+		phy-handle = <&ethphy0>;
+	};
+};
diff --git a/arch/arm/boot/dts/kirkwood-openrd-client.dts b/arch/arm/boot/dts/kirkwood-openrd-client.dts
new file mode 100644
index 000000000000..6179542c860f
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-openrd-client.dts
@@ -0,0 +1,75 @@ 
+/*
+ * Marvell OpenRD Client Board descrition
+ *
+ * Andrew Lunn <andrew@lunn.ch>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ *
+ * This file contains the definitions that are specific to OpenRD
+ * client variant of the Marvell Kirkwood Development Board.
+ */
+
+/dts-v1/;
+
+#include "kirkwood-openrd.dtsi"
+
+/ {
+	model = "OpenRD Client";
+	compatible = "marvell,openrd-client", "marvell,openrd", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+
+	ocp@f1000000 {
+		i2c@11000 {
+			status = "okay";
+			clock-frequency = <400000>;
+			pinctrl-0 = <&pmx_twsi0>;
+			pinctrl-names = "default";
+
+			cs42l51: cs42l51@4a {
+				compatible = "cirrus,cs42l51";
+				reg = <0x4a>;
+			};
+		};
+	};
+
+	sound {
+		compatible = "simple-audio-card";
+		simple-audio-card,format = "i2s";
+		simple-audio-card,mclk-fs = <256>;
+
+		simple-audio-card,cpu {
+			sound-dai = <&audio0>;
+		};
+
+		simple-audio-card,codec {
+			sound-dai = <&cs42l51>;
+		};
+	};
+};
+
+&mdio {
+	status = "okay";
+
+	ethphy0: ethernet-phy@8 {
+		reg = <8>;
+	};
+	ethphy1: ethernet-phy@24 {
+		reg = <24>;
+	};
+};
+
+&eth0 {
+	status = "okay";
+	ethernet0-port@0 {
+		phy-handle = <&ethphy0>;
+	};
+};
+
+&eth1 {
+	status = "okay";
+	ethernet1-port@0 {
+		phy-handle = <&ethphy1>;
+	};
+};
+
diff --git a/arch/arm/boot/dts/kirkwood-openrd-ultimate.dts b/arch/arm/boot/dts/kirkwood-openrd-ultimate.dts
new file mode 100644
index 000000000000..7a233d7f4701
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-openrd-ultimate.dts
@@ -0,0 +1,60 @@ 
+/*
+ * Marvell OpenRD Ultimate Board descrition
+ *
+ * Andrew Lunn <andrew@lunn.ch>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ *
+ * This file contains the definitions that are specific to OpenRD
+ * ultimate variant of the Marvell Kirkwood Development Board.
+ */
+
+/dts-v1/;
+
+#include "kirkwood-openrd.dtsi"
+
+/ {
+	model = "OpenRD Ultimate";
+	compatible = "marvell,openrd-ultimate", "marvell,openrd", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+
+	ocp@f1000000 {
+		i2c@11000 {
+			status = "okay";
+			clock-frequency = <400000>;
+			pinctrl-0 = <&pmx_twsi0>;
+			pinctrl-names = "default";
+
+			cs42l51: cs42l51@4a {
+				compatible = "cirrus,cs42l51";
+				reg = <0x4a>;
+			};
+		};
+	};
+};
+
+&mdio {
+	status = "okay";
+
+	ethphy0: ethernet-phy@0 {
+		reg = <0>;
+	};
+	ethphy1: ethernet-phy@1 {
+		reg = <1>;
+	};
+};
+
+&eth0 {
+	status = "okay";
+	ethernet0-port@0 {
+		phy-handle = <&ethphy0>;
+	};
+};
+
+&eth1 {
+	status = "okay";
+	ethernet1-port@0 {
+		phy-handle = <&ethphy1>;
+	};
+};
diff --git a/arch/arm/boot/dts/kirkwood-openrd.dtsi b/arch/arm/boot/dts/kirkwood-openrd.dtsi
new file mode 100644
index 000000000000..30e0f38a1a37
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-openrd.dtsi
@@ -0,0 +1,91 @@ 
+/*
+ * Marvell OpenRD (Base|Client|Ultimate) Board descrition
+ *
+ * Andrew Lunn <andrew@lunn.ch>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ *
+ * This file contains the definitions that are common between the three
+ * variants of the Marvell Kirkwood Development Board.
+ */
+
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"
+
+/ {
+	memory {
+		device_type = "memory";
+		reg = <0x00000000 0x20000000>;
+	};
+
+	chosen {
+		bootargs = "console=ttyS0,115200n8";
+		stdout-path = &uart0;
+	};
+
+	mbus {
+		pcie-controller {
+			status = "okay";
+
+			pcie@1,0 {
+				status = "okay";
+			};
+		};
+	};
+
+	ocp@f1000000 {
+		pinctrl: pin-controller@10000 {
+			pinctrl-0 = <&pmx_select28 &pmx_sdio_cd &pmx_select34>;
+			pinctrl-names = "default";
+
+			pmx_select28: pmx-select-uart-sd {
+				marvell,pins = "mpp28";
+				marvell,function = "gpio";
+			};
+			pmx_sdio_cd: pmx-sdio-cd {
+				marvell,pins = "mpp29";
+				marvell,function = "gpio";
+			};
+			pmx_select34: pmx-select-rs232-rs484 {
+				marvell,pins = "mpp34";
+				marvell,function = "gpio";
+			};
+		};
+		serial@12000 {
+			status = "okay";
+
+		};
+		sata@80000 {
+			status = "okay";
+			nr-ports = <2>;
+		};
+		mvsdio@90000 {
+			status = "okay";
+			cd-gpios = <&gpio0 29 9>;
+			status = "disabled";
+		};
+	};
+};
+
+&nand {
+	status = "okay";
+	pinctrl-0 = <&pmx_nand>;
+	pinctrl-names = "default";
+
+	partition@0 {
+		label = "u-boot";
+		reg = <0x0000000 0x100000>;
+	};
+
+	partition@100000 {
+		label = "uImage";
+		reg = <0x0100000 0x400000>;
+	};
+
+	partition@600000 {
+		label = "root";
+		reg = <0x0600000 0x1FA00000>;
+	};
+};