Skip to contentSkip to conversation

ARM: Kirkwood: DT versions of OpenRD boards

PATCH New Andrew Lunn 2 participants 4 messages May 6, 2014 – May 7, 2014

Subsystems (2)
Device tree bindings Arm and arm64 SoC sub-architectures (common parts)
lore
Share & tools
lore

Andrew Lunn

author
#0 lore raw

PATCH 1/1 ARM: Kirkwood: DT versions of OpenRD boards

Create DTS files to describe the Marvell OpenRD boards.

Signed-off-by Andrew Lunn <[email protected]>
Tested-by Francois Lorrain <[email protected]>
---
 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
arch/arm/boot/dts/Makefile +3 -0
index 35c146f31e46..4dfd5bd570e6 100644
@@ -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 \
arch/arm/boot/dts/kirkwood-openrd-base.dts new file +42 -0

42 lines not on this page · raw message

arch/arm/boot/dts/kirkwood-openrd-client.dts new file +75 -0

75 lines not on this page · raw message

arch/arm/boot/dts/kirkwood-openrd-ultimate.dts new file +60 -0

60 lines not on this page · raw message

arch/arm/boot/dts/kirkwood-openrd.dtsi new file +91 -0

91 lines not on this page · raw message

Signature · 1 line
2.0.0.rc0
#1 lore raw

PATCH 1/1 ARM: Kirkwood: DT versions of OpenRD boards

Quoted 5 lines · Andrew Lunn

Create DTS files to describe the Marvell OpenRD boards.

Signed-off-by Andrew Lunn <[email protected]>
Tested-by Francois Lorrain <[email protected]>

---

[...]

arch/arm/boot/dts/kirkwood-openrd-base.dts line 2

Quoted 8 lines
arch/arm/boot/dts/kirkwood-openrd-base.dts new file +2 -0
new file mode 100644
index 000000000000..03cb87cd4bbe
@@ -0,0 +1,42 @@
+/*
+ * Marvell OpenRD Base Board descrition

s/descrition/description/

Quoted 11 lines
arch/arm/boot/dts/kirkwood-openrd-base.dts new file +11 -0
+ * Andrew Lunn <[email protected]>
+ *
+ * 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/;

arch/arm/boot/dts/kirkwood-openrd-base.dts line 24

Quoted 10 lines
arch/arm/boot/dts/kirkwood-openrd-base.dts new file +10 -0
+
+#include "kirkwood-openrd.dtsi"
+
+/ {
+	model = "OpenRD Base";
+	compatible = "marvell,openrd-base", "marvell,openrd", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+
+	ocp at f1000000 {
+		serial at 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. ;)

Quoted 24 lines
arch/arm/boot/dts/kirkwood-openrd-base.dts new file +18 -0
+		};
+	};
+};
+
+&mdio {
+	status = "okay";
+
+	ethphy0: ethernet-phy at 8 {
+		reg = <8>;
+	};
+};
+
+&eth0 {
+	status = "okay";
+	ethernet0-port at 0 {
+		phy-handle = <&ethphy0>;
+	};
+};
arch/arm/boot/dts/kirkwood-openrd-client.dts new file +0 -0
new file mode 100644
index 000000000000..6179542c860f

arch/arm/boot/dts/kirkwood-openrd-client.dts line 2

Quoted 2 lines
arch/arm/boot/dts/kirkwood-openrd-client.dts new file +2 -0
@@ -0,0 +1,75 @@
+/*
+ * Marvell OpenRD Client Board descrition

s/descrition/description/

Quoted 14 lines
arch/arm/boot/dts/kirkwood-openrd-client.dts new file +14 -0
+ * Andrew Lunn <[email protected]>
+ *
+ * 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"
+

arch/arm/boot/dts/kirkwood-openrd-client.dts line 27

Quoted 10 lines
arch/arm/boot/dts/kirkwood-openrd-client.dts new file +10 -0
+/ {
+	model = "OpenRD Client";
+	compatible = "marvell,openrd-client", "marvell,openrd", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+
+	ocp at f1000000 {
+		i2c at 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.

Quoted 53 lines
arch/arm/boot/dts/kirkwood-openrd-client.dts new file +47 -0
+			cs42l51: cs42l51 at 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 at 8 {
+		reg = <8>;
+	};
+	ethphy1: ethernet-phy at 24 {
+		reg = <24>;
+	};
+};
+
+&eth0 {
+	status = "okay";
+	ethernet0-port at 0 {
+		phy-handle = <&ethphy0>;
+	};
+};
+
+&eth1 {
+	status = "okay";
+	ethernet1-port at 0 {
+		phy-handle = <&ethphy1>;
+	};
+};
+
arch/arm/boot/dts/kirkwood-openrd-ultimate.dts new file +0 -0
new file mode 100644
index 000000000000..7a233d7f4701

arch/arm/boot/dts/kirkwood-openrd-ultimate.dts line 2

Quoted 2 lines
arch/arm/boot/dts/kirkwood-openrd-ultimate.dts new file +2 -0
@@ -0,0 +1,60 @@
+/*
+ * Marvell OpenRD Ultimate Board descrition

s/descrition/description/

Quoted 14 lines
arch/arm/boot/dts/kirkwood-openrd-ultimate.dts new file +14 -0
+ * Andrew Lunn <[email protected]>
+ *
+ * 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"
+

arch/arm/boot/dts/kirkwood-openrd-ultimate.dts line 27

Quoted 10 lines
arch/arm/boot/dts/kirkwood-openrd-ultimate.dts new file +10 -0
+/ {
+	model = "OpenRD Ultimate";
+	compatible = "marvell,openrd-ultimate", "marvell,openrd", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+
+	ocp at f1000000 {
+		i2c at 11000 {
+			status = "okay";
+			clock-frequency = <400000>;
+			pinctrl-0 = <&pmx_twsi0>;
+			pinctrl-names = "default";

ditto.

Quoted 38 lines
arch/arm/boot/dts/kirkwood-openrd-ultimate.dts new file +32 -0
+			cs42l51: cs42l51 at 4a {
+				compatible = "cirrus,cs42l51";
+				reg = <0x4a>;
+			};
+		};
+	};
+};
+
+&mdio {
+	status = "okay";
+
+	ethphy0: ethernet-phy at 0 {
+		reg = <0>;
+	};
+	ethphy1: ethernet-phy at 1 {
+		reg = <1>;
+	};
+};
+
+&eth0 {
+	status = "okay";
+	ethernet0-port at 0 {
+		phy-handle = <&ethphy0>;
+	};
+};
+
+&eth1 {
+	status = "okay";
+	ethernet1-port at 0 {
+		phy-handle = <&ethphy1>;
+	};
+};
arch/arm/boot/dts/kirkwood-openrd.dtsi new file +0 -0
new file mode 100644
index 000000000000..30e0f38a1a37

arch/arm/boot/dts/kirkwood-openrd.dtsi line 2

Quoted 2 lines
arch/arm/boot/dts/kirkwood-openrd.dtsi new file +2 -0
@@ -0,0 +1,91 @@
+/*
+ * Marvell OpenRD (Base|Client|Ultimate) Board descrition

s/descrition/description/

Quoted 55 lines
arch/arm/boot/dts/kirkwood-openrd.dtsi new file +55 -0
+ *
+ * Andrew Lunn <[email protected]>
+ *
+ * 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 at 1,0 {
+				status = "okay";
+			};
+		};
+	};
+
+	ocp at f1000000 {
+		pinctrl: pin-controller at 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 at 12000 {
+			status = "okay";

arch/arm/boot/dts/kirkwood-openrd.dtsi line 67

Quoted 10 lines
arch/arm/boot/dts/kirkwood-openrd.dtsi new file +10 -0
+
+		};
+		sata at 80000 {
+			status = "okay";
+			nr-ports = <2>;
+		};
+		mvsdio at 90000 {
+			status = "okay";
+			cd-gpios = <&gpio0 29 9>;
+			status = "disabled";

Any reason not to enable sdio?

Besides the nits above,

Acked-by Sebastian Hesselbarth <[email protected]>
Quoted 25 lines
arch/arm/boot/dts/kirkwood-openrd.dtsi new file +24 -0
+		};
+	};
+};
+
+&nand {
+	status = "okay";
+	pinctrl-0 = <&pmx_nand>;
+	pinctrl-names = "default";
+
+	partition at 0 {
+		label = "u-boot";
+		reg = <0x0000000 0x100000>;
+	};
+
+	partition at 100000 {
+		label = "uImage";
+		reg = <0x0100000 0x400000>;
+	};
+
+	partition at 600000 {
+		label = "root";
+		reg = <0x0600000 0x1FA00000>;
+	};
+};
author
#2 lore raw

PATCH 1/1 ARM: Kirkwood: DT versions of OpenRD boards

Quoted 42 lines · Sebastian Hesselbarth
Quoted 5 lines · Andrew Lunn

Create DTS files to describe the Marvell OpenRD boards.

Signed-off-by Andrew Lunn <[email protected]>
Tested-by Francois Lorrain <[email protected]>

---

[...]

arch/arm/boot/dts/kirkwood-openrd-base.dts line 2

Quoted 8 lines
arch/arm/boot/dts/kirkwood-openrd-base.dts new file +2 -0
new file mode 100644
index 000000000000..03cb87cd4bbe
@@ -0,0 +1,42 @@
+/*
+ * Marvell OpenRD Base Board descrition

s/descrition/description/

Quoted 11 lines
arch/arm/boot/dts/kirkwood-openrd-base.dts new file +11 -0
+ * Andrew Lunn <[email protected]>
+ *
+ * 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/;

arch/arm/boot/dts/kirkwood-openrd-base.dts line 24

Quoted 10 lines
arch/arm/boot/dts/kirkwood-openrd-base.dts new file +10 -0
+
+#include "kirkwood-openrd.dtsi"
+
+/ {
+	model = "OpenRD Base";
+	compatible = "marvell,openrd-base", "marvell,openrd", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+
+	ocp at f1000000 {
+		serial at 12100 {
+			status = "okay";

Andrew,

Quoted 3 lines

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.

Quoted 48 lines
Quoted 25 lines
arch/arm/boot/dts/kirkwood-openrd-base.dts new file +18 -0
+		};
+	};
+};
+
+&mdio {
+	status = "okay";
+
+	ethphy0: ethernet-phy at 8 {
+		reg = <8>;
+	};
+};
+
+&eth0 {
+	status = "okay";
+	ethernet0-port at 0 {
+		phy-handle = <&ethphy0>;
+	};
+};
arch/arm/boot/dts/kirkwood-openrd-client.dts new file +0 -0
new file mode 100644
index 000000000000..6179542c860f

arch/arm/boot/dts/kirkwood-openrd-client.dts line 2

Quoted 2 lines
arch/arm/boot/dts/kirkwood-openrd-client.dts new file +2 -0
@@ -0,0 +1,75 @@
+/*
+ * Marvell OpenRD Client Board descrition

s/descrition/description/

Quoted 18 lines
arch/arm/boot/dts/kirkwood-openrd-client.dts new file +18 -0
+ * Andrew Lunn <[email protected]>
+ *
+ * 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";
+
Quoted 8 lines

arch/arm/boot/dts/kirkwood-openrd-client.dts line 27

Quoted 6 lines
arch/arm/boot/dts/kirkwood-openrd-client.dts new file +6 -0
+	ocp at f1000000 {
+		i2c at 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.

Quoted 6 lines

arch/arm/boot/dts/kirkwood-openrd-client.dts line 30

Quoted 4 lines
arch/arm/boot/dts/kirkwood-openrd-client.dts new file +4 -0
+		mvsdio at 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.

Quoted 1 line
Acked-by Sebastian Hesselbarth <[email protected]>

Thanks
Andrew

#3 lore raw

PATCH 1/1 ARM: Kirkwood: DT versions of OpenRD boards

Quoted 24 lines · Andrew Lunn
Quoted 7 lines · Sebastian Hesselbarth
Quoted 5 lines · Andrew Lunn

Create DTS files to describe the Marvell OpenRD boards.

Signed-off-by Andrew Lunn <[email protected]>
Tested-by Francois Lorrain <[email protected]>

---

[...]

Quoted 15 lines

arch/arm/boot/dts/kirkwood-openrd-base.dts line 24

Quoted 11 lines
arch/arm/boot/dts/kirkwood-openrd-base.dts new file +11 -0
+/dts-v1/;
+
+#include "kirkwood-openrd.dtsi"
+
+/ {
+	model = "OpenRD Base";
+	compatible = "marvell,openrd-base", "marvell,openrd", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+
+	ocp at f1000000 {
+		serial at 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. ;)

Quoted 2 lines

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.

[...]

Quoted 17 lines
Quoted 8 lines
Quoted 8 lines
arch/arm/boot/dts/kirkwood-openrd-client.dts new file +8 -0
+/dts-v1/;
+
+#include "kirkwood-openrd.dtsi"
+
+/ {
+	model = "OpenRD Client";
+	compatible = "marvell,openrd-client", "marvell,openrd", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+
Quoted 8 lines

arch/arm/boot/dts/kirkwood-openrd-client.dts line 27

Quoted 6 lines
arch/arm/boot/dts/kirkwood-openrd-client.dts new file +6 -0
+	ocp at f1000000 {
+		i2c at 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.

Quoted 2 lines

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.

Quoted 10 lines
Quoted 6 lines

arch/arm/boot/dts/kirkwood-openrd.dtsi line 67

Quoted 4 lines
arch/arm/boot/dts/kirkwood-openrd.dtsi new file +4 -0
+		mvsdio at 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