diff mbox

[v2] arm: mvebu: add DTS file for Marvell RD-A370-A1 board

Message ID 3816648.2TVsTiMOWx@bender (mailing list archive)
State New, archived
Headers show

Commit Message

Florian Fainelli Jan. 9, 2013, 7:56 p.m. UTC
This patch adds the DTS file to support the Marvell RD-A370-A1
(Reference Design board) also known as RD-88F6710 board. It is almost
entirely similar to the DB-A370 board except that the first Ethernet PHY
is SGMII-wired and the second is a switch which is RGMII-wired.

Signed-off-by: Florian Fainelli <florian@openwrt.org>
---
Thomas, Clément, as support for other peripherals gets merged, I will update
this DTS file to reflect this. Thanks!

Changes since v1:
- added missing entry in arch/arm/boot/dts/Makefile to actually build the DTB

 arch/arm/boot/dts/Makefile          |    1 +
 arch/arm/boot/dts/armada-370-rd.dts |   61 +++++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+)
 create mode 100644 arch/arm/boot/dts/armada-370-rd.dts

Comments

Gregory CLEMENT Jan. 10, 2013, 9:38 a.m. UTC | #1
On 01/09/2013 08:56 PM, Florian Fainelli wrote:
> This patch adds the DTS file to support the Marvell RD-A370-A1
> (Reference Design board) also known as RD-88F6710 board. It is almost
> entirely similar to the DB-A370 board except that the first Ethernet PHY
> is SGMII-wired and the second is a switch which is RGMII-wired.
> 
> Signed-off-by: Florian Fainelli <florian@openwrt.org>

Looks OK for me

Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>


> ---
> Thomas, Clément, as support for other peripherals gets merged, I will update
> this DTS file to reflect this. Thanks!
> 
> Changes since v1:
> - added missing entry in arch/arm/boot/dts/Makefile to actually build the DTB
> 
>  arch/arm/boot/dts/Makefile          |    1 +
>  arch/arm/boot/dts/armada-370-rd.dts |   61 +++++++++++++++++++++++++++++++++++
>  2 files changed, 62 insertions(+)
>  create mode 100644 arch/arm/boot/dts/armada-370-rd.dts
> 
> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> index b7246d6..7a75171 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -78,6 +78,7 @@ dtb-$(CONFIG_ARCH_MSM) += msm8660-surf.dtb \
>  	msm8960-cdp.dtb
>  dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
>  	armada-370-mirabox.dtb \
> +	armada-370-rd.dtb \
>  	armada-xp-db.dtb \
>  	armada-xp-openblocks-ax3-4.dtb
>  dtb-$(CONFIG_ARCH_MXC) += imx51-babbage.dtb \
> diff --git a/arch/arm/boot/dts/armada-370-rd.dts b/arch/arm/boot/dts/armada-370-rd.dts
> new file mode 100644
> index 0000000..d62dfac
> --- /dev/null
> +++ b/arch/arm/boot/dts/armada-370-rd.dts
> @@ -0,0 +1,61 @@
> +/*
> + * Device Tree file for Marvell Armada 370 Reference Design board
> + * (RD-88F6710-A1)
> + *
> + *  Copied from arch/arm/boot/dts/armada-370-db.dts
> + *
> + *  Copyright (C) 2013 Florian Fainelli <florian@openwrt.org>
> + *
> + * 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.
> + */
> +
> +/dts-v1/;
> +/include/ "armada-370.dtsi"
> +
> +/ {
> +	model = "Marvell Armada 370 Reference Design";
> +	compatible = "marvell,a370-rd", "marvell,armada370", "marvell,armada-370-xp";
> +
> +	chosen {
> +		bootargs = "console=ttyS0,115200 earlyprintk";
> +	};
> +
> +	memory {
> +		device_type = "memory";
> +		reg = <0x00000000 0x20000000>; /* 512 MB */
> +	};
> +
> +	soc {
> +		serial@d0012000 {
> +			clock-frequency = <200000000>;
> +			status = "okay";
> +		};
> +		sata@d00a0000 {
> +			nr-ports = <2>;
> +			status = "okay";
> +		};
> +
> +		mdio {
> +			phy0: ethernet-phy@0 {
> +				reg = <0>;
> +			};
> +
> +			phy1: ethernet-phy@1 {
> +				reg = <1>;
> +			};
> +		};
> +
> +		ethernet@d0070000 {
> +			status = "okay";
> +			phy = <&phy0>;
> +			phy-mode = "sgmii";
> +		};
> +		ethernet@d0074000 {
> +			status = "okay";
> +			phy = <&phy1>;
> +			phy-mode = "rgmii-id";
> +		};
> +	};
> +};
>
Gregory CLEMENT Jan. 10, 2013, 12:51 p.m. UTC | #2
On 01/09/2013 08:56 PM, Florian Fainelli wrote:
> This patch adds the DTS file to support the Marvell RD-A370-A1
> (Reference Design board) also known as RD-88F6710 board. It is almost
> entirely similar to the DB-A370 board except that the first Ethernet PHY
> is SGMII-wired and the second is a switch which is RGMII-wired.
> 
> Signed-off-by: Florian Fainelli <florian@openwrt.org>
> ---
> Thomas, Clément, as support for other peripherals gets merged, I will update
> this DTS file to reflect this. Thanks!
> 
> Changes since v1:
> - added missing entry in arch/arm/boot/dts/Makefile to actually build the DTB
> 
>  arch/arm/boot/dts/Makefile          |    1 +
>  arch/arm/boot/dts/armada-370-rd.dts |   61 +++++++++++++++++++++++++++++++++++
>  2 files changed, 62 insertions(+)
>  create mode 100644 arch/arm/boot/dts/armada-370-rd.dts
> 
> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> index b7246d6..7a75171 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -78,6 +78,7 @@ dtb-$(CONFIG_ARCH_MSM) += msm8660-surf.dtb \
>  	msm8960-cdp.dtb
>  dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
>  	armada-370-mirabox.dtb \
> +	armada-370-rd.dtb \
>  	armada-xp-db.dtb \
>  	armada-xp-openblocks-ax3-4.dtb
>  dtb-$(CONFIG_ARCH_MXC) += imx51-babbage.dtb \
> diff --git a/arch/arm/boot/dts/armada-370-rd.dts b/arch/arm/boot/dts/armada-370-rd.dts
> new file mode 100644
> index 0000000..d62dfac
> --- /dev/null
> +++ b/arch/arm/boot/dts/armada-370-rd.dts
> @@ -0,0 +1,61 @@
> +/*
> + * Device Tree file for Marvell Armada 370 Reference Design board
> + * (RD-88F6710-A1)
> + *
> + *  Copied from arch/arm/boot/dts/armada-370-db.dts
> + *
> + *  Copyright (C) 2013 Florian Fainelli <florian@openwrt.org>
> + *
> + * 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.
> + */
> +
> +/dts-v1/;
> +/include/ "armada-370.dtsi"
> +
> +/ {
> +	model = "Marvell Armada 370 Reference Design";
> +	compatible = "marvell,a370-rd", "marvell,armada370", "marvell,armada-370-xp";
> +
> +	chosen {
> +		bootargs = "console=ttyS0,115200 earlyprintk";
> +	};
> +
> +	memory {
> +		device_type = "memory";
> +		reg = <0x00000000 0x20000000>; /* 512 MB */
Hi Florian,

As you based your file on our (erroneous) dts, could you confirm that
the RD-A370-A1 board have "only" 512MB?

Thanks,

> +	};
> +
> +	soc {
> +		serial@d0012000 {
> +			clock-frequency = <200000000>;
> +			status = "okay";
> +		};
> +		sata@d00a0000 {
> +			nr-ports = <2>;
> +			status = "okay";
> +		};
> +
> +		mdio {
> +			phy0: ethernet-phy@0 {
> +				reg = <0>;
> +			};
> +
> +			phy1: ethernet-phy@1 {
> +				reg = <1>;
> +			};
> +		};
> +
> +		ethernet@d0070000 {
> +			status = "okay";
> +			phy = <&phy0>;
> +			phy-mode = "sgmii";
> +		};
> +		ethernet@d0074000 {
> +			status = "okay";
> +			phy = <&phy1>;
> +			phy-mode = "rgmii-id";
> +		};
> +	};
> +};
>
Florian Fainelli Jan. 10, 2013, 12:57 p.m. UTC | #3
Hello Gregory,

Le 01/10/13 13:51, Gregory CLEMENT a écrit :
> +
> +	memory {
> +		device_type = "memory";
> +		reg = <0x00000000 0x20000000>; /* 512 MB */
> Hi Florian,
>
> As you based your file on our (erroneous) dts, could you confirm that
> the RD-A370-A1 board have "only" 512MB?

Yes it only has 512MB of RAM, this is not a mistake.
--
Florian
Florian Fainelli Jan. 11, 2013, 2:45 p.m. UTC | #4
Thomas, Gregory,

Le 01/09/13 20:56, Florian Fainelli a écrit :
> This patch adds the DTS file to support the Marvell RD-A370-A1
> (Reference Design board) also known as RD-88F6710 board. It is almost
> entirely similar to the DB-A370 board except that the first Ethernet PHY
> is SGMII-wired and the second is a switch which is RGMII-wired.

Who is going to take this patch? Since this is a new DTS file there are 
little chances it breaks anything, could it be taken for an upcoming 3.8-rc?

Thanks.
--
Florian
Gregory CLEMENT Jan. 11, 2013, 2:53 p.m. UTC | #5
Florian,

On 01/11/2013 03:45 PM, Florian Fainelli wrote:
> Thomas, Gregory,
> 
> Le 01/09/13 20:56, Florian Fainelli a écrit :
>> This patch adds the DTS file to support the Marvell RD-A370-A1
>> (Reference Design board) also known as RD-88F6710 board. It is almost
>> entirely similar to the DB-A370 board except that the first Ethernet PHY
>> is SGMII-wired and the second is a switch which is RGMII-wired.
> 
> Who is going to take this patch? Since this is a new DTS file there are 
> little chances it breaks anything, could it be taken for an upcoming 3.8-rc?

It is Jason who takes care of gathering all the patches for mvebu.

As it is not a fix for a bug but more a new "feature" (at least a support
for a new board), I doubt that it could be part of 3.8-rc.
But as far as I am concerned I am not against having this patch in 3.8-rc.

Regards

> 
> Thanks.
> --
> Florian
>
Jason Cooper Jan. 11, 2013, 2:56 p.m. UTC | #6
Florian,

On Fri, Jan 11, 2013 at 03:45:04PM +0100, Florian Fainelli wrote:
> Le 01/09/13 20:56, Florian Fainelli a écrit :
> >This patch adds the DTS file to support the Marvell RD-A370-A1
> >(Reference Design board) also known as RD-88F6710 board. It is almost
> >entirely similar to the DB-A370 board except that the first Ethernet PHY
> >is SGMII-wired and the second is a switch which is RGMII-wired.
> 
> Who is going to take this patch? Since this is a new DTS file there
> are little chances it breaks anything, could it be taken for an
> upcoming 3.8-rc?

No, only fixes go in for the current -rc.  It'll be included for v3.9, I
have it in my queue.

thx,

Jason.
Florian Fainelli Jan. 13, 2013, 7:40 p.m. UTC | #7
Le 11/01/2013 15:56, Jason Cooper a écrit :
> Florian,
>
> On Fri, Jan 11, 2013 at 03:45:04PM +0100, Florian Fainelli wrote:
>> Le 01/09/13 20:56, Florian Fainelli a écrit :
>>> This patch adds the DTS file to support the Marvell RD-A370-A1
>>> (Reference Design board) also known as RD-88F6710 board. It is almost
>>> entirely similar to the DB-A370 board except that the first Ethernet PHY
>>> is SGMII-wired and the second is a switch which is RGMII-wired.
>>
>> Who is going to take this patch? Since this is a new DTS file there
>> are little chances it breaks anything, could it be taken for an
>> upcoming 3.8-rc?
>
> No, only fixes go in for the current -rc.  It'll be included for v3.9, I
> have it in my queue.

Jason, I don't see this patch in the pull request you just sent for 3.9, 
should it be? Thanks!
--
Florian
Jason Cooper Jan. 13, 2013, 8:12 p.m. UTC | #8
On Sun, Jan 13, 2013 at 08:40:29PM +0100, Florian Fainelli wrote:
> Le 11/01/2013 15:56, Jason Cooper a écrit :
> >Florian,
> >
> >On Fri, Jan 11, 2013 at 03:45:04PM +0100, Florian Fainelli wrote:
> >>Le 01/09/13 20:56, Florian Fainelli a écrit :
> >>>This patch adds the DTS file to support the Marvell RD-A370-A1
> >>>(Reference Design board) also known as RD-88F6710 board. It is almost
> >>>entirely similar to the DB-A370 board except that the first Ethernet PHY
> >>>is SGMII-wired and the second is a switch which is RGMII-wired.
> >>
> >>Who is going to take this patch? Since this is a new DTS file there
> >>are little chances it breaks anything, could it be taken for an
> >>upcoming 3.8-rc?
> >
> >No, only fixes go in for the current -rc.  It'll be included for v3.9, I
> >have it in my queue.
> 
> Jason, I don't see this patch in the pull request you just sent for
> 3.9, should it be? Thanks!

Not yet, I'm working my though the holiday backlog chronologically.

thx,

Jason.
Florian Fainelli Jan. 14, 2013, 9:36 a.m. UTC | #9
Le 01/13/13 21:12, Jason Cooper a écrit :
> On Sun, Jan 13, 2013 at 08:40:29PM +0100, Florian Fainelli wrote:
>> Le 11/01/2013 15:56, Jason Cooper a écrit :
>>> Florian,
>>>
>>> On Fri, Jan 11, 2013 at 03:45:04PM +0100, Florian Fainelli wrote:
>>>> Le 01/09/13 20:56, Florian Fainelli a écrit :
>>>>> This patch adds the DTS file to support the Marvell RD-A370-A1
>>>>> (Reference Design board) also known as RD-88F6710 board. It is almost
>>>>> entirely similar to the DB-A370 board except that the first Ethernet PHY
>>>>> is SGMII-wired and the second is a switch which is RGMII-wired.
>>>> Who is going to take this patch? Since this is a new DTS file there
>>>> are little chances it breaks anything, could it be taken for an
>>>> upcoming 3.8-rc?
>>> No, only fixes go in for the current -rc.  It'll be included for v3.9, I
>>> have it in my queue.
>> Jason, I don't see this patch in the pull request you just sent for
>> 3.9, should it be? Thanks!
> Not yet, I'm working my though the holiday backlog chronologically.

Ok, then you might want to hold this one a little, so I add mvsdio 
bindings to this DTS file as well. Thanks!
--
Florian
diff mbox

Patch

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index b7246d6..7a75171 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -78,6 +78,7 @@  dtb-$(CONFIG_ARCH_MSM) += msm8660-surf.dtb \
 	msm8960-cdp.dtb
 dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
 	armada-370-mirabox.dtb \
+	armada-370-rd.dtb \
 	armada-xp-db.dtb \
 	armada-xp-openblocks-ax3-4.dtb
 dtb-$(CONFIG_ARCH_MXC) += imx51-babbage.dtb \
diff --git a/arch/arm/boot/dts/armada-370-rd.dts b/arch/arm/boot/dts/armada-370-rd.dts
new file mode 100644
index 0000000..d62dfac
--- /dev/null
+++ b/arch/arm/boot/dts/armada-370-rd.dts
@@ -0,0 +1,61 @@ 
+/*
+ * Device Tree file for Marvell Armada 370 Reference Design board
+ * (RD-88F6710-A1)
+ *
+ *  Copied from arch/arm/boot/dts/armada-370-db.dts
+ *
+ *  Copyright (C) 2013 Florian Fainelli <florian@openwrt.org>
+ *
+ * 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.
+ */
+
+/dts-v1/;
+/include/ "armada-370.dtsi"
+
+/ {
+	model = "Marvell Armada 370 Reference Design";
+	compatible = "marvell,a370-rd", "marvell,armada370", "marvell,armada-370-xp";
+
+	chosen {
+		bootargs = "console=ttyS0,115200 earlyprintk";
+	};
+
+	memory {
+		device_type = "memory";
+		reg = <0x00000000 0x20000000>; /* 512 MB */
+	};
+
+	soc {
+		serial@d0012000 {
+			clock-frequency = <200000000>;
+			status = "okay";
+		};
+		sata@d00a0000 {
+			nr-ports = <2>;
+			status = "okay";
+		};
+
+		mdio {
+			phy0: ethernet-phy@0 {
+				reg = <0>;
+			};
+
+			phy1: ethernet-phy@1 {
+				reg = <1>;
+			};
+		};
+
+		ethernet@d0070000 {
+			status = "okay";
+			phy = <&phy0>;
+			phy-mode = "sgmii";
+		};
+		ethernet@d0074000 {
+			status = "okay";
+			phy = <&phy1>;
+			phy-mode = "rgmii-id";
+		};
+	};
+};