* [PATCH] ARM: zynq: add gem support
@ 2013-12-11 17:29 Soren Brinkmann
2013-12-12 8:48 ` Michal Simek
0 siblings, 1 reply; 5+ messages in thread
From: Soren Brinkmann @ 2013-12-11 17:29 UTC (permalink / raw)
To: linux-arm-kernel
From: Steffen Trumtrar <s.trumtrar@pengutronix.de>
The zynq includes a Cadence GEM IP core. This is compatible with the macb driver.
Add it to the zynq-7000 DT.
Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: Josh Cartwright <josh.cartwright@ni.com>
[soren: rebased to current Linus tree, added zc706 + zed support, moved phy-mode property to board level dtses]
Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
---
This has a soft dependency on the net-next tree which has some patches for the
macb driver which are required for full functionality. But adding this patch to
any tree without net-next shouldn't do any harm, network might be
non-operational at the worst - I think.
S?ren
arch/arm/boot/dts/zynq-7000.dtsi | 18 ++++++++++++++++++
arch/arm/boot/dts/zynq-zc702.dts | 5 +++++
arch/arm/boot/dts/zynq-zc706.dts | 5 +++++
arch/arm/boot/dts/zynq-zed.dts | 5 +++++
4 files changed, 33 insertions(+)
diff --git a/arch/arm/boot/dts/zynq-7000.dtsi b/arch/arm/boot/dts/zynq-7000.dtsi
index e7f73b2e4550..aebc48d8c397 100644
--- a/arch/arm/boot/dts/zynq-7000.dtsi
+++ b/arch/arm/boot/dts/zynq-7000.dtsi
@@ -65,6 +65,24 @@
interrupts = <0 50 4>;
};
+ gem0: ethernet at e000b000 {
+ compatible = "cdns,gem";
+ reg = <0xe000b000 0x4000>;
+ status = "disabled";
+ interrupts = <0 22 4>;
+ clocks = <&clkc 30>, <&clkc 30>, <&clkc 13>;
+ clock-names = "pclk", "hclk", "tx_clk";
+ };
+
+ gem1: ethernet at e000c000 {
+ compatible = "cdns,gem";
+ reg = <0xe000c000 0x4000>;
+ status = "disabled";
+ interrupts = <0 45 4>;
+ clocks = <&clkc 31>, <&clkc 31>, <&clkc 14>;
+ clock-names = "pclk", "hclk", "tx_clk";
+ };
+
slcr: slcr at f8000000 {
compatible = "xlnx,zynq-slcr";
reg = <0xF8000000 0x1000>;
diff --git a/arch/arm/boot/dts/zynq-zc702.dts b/arch/arm/boot/dts/zynq-zc702.dts
index 21aea99a067b..34d680a46b7e 100644
--- a/arch/arm/boot/dts/zynq-zc702.dts
+++ b/arch/arm/boot/dts/zynq-zc702.dts
@@ -29,6 +29,11 @@
};
+&gem0 {
+ status = "okay";
+ phy-mode = "rgmii";
+};
+
&uart1 {
status = "okay";
};
diff --git a/arch/arm/boot/dts/zynq-zc706.dts b/arch/arm/boot/dts/zynq-zc706.dts
index 79009e0b74b9..b2835d5fc09a 100644
--- a/arch/arm/boot/dts/zynq-zc706.dts
+++ b/arch/arm/boot/dts/zynq-zc706.dts
@@ -30,6 +30,11 @@
};
+&gem0 {
+ status = "okay";
+ phy-mode = "rgmii";
+};
+
&uart1 {
status = "okay";
};
diff --git a/arch/arm/boot/dts/zynq-zed.dts b/arch/arm/boot/dts/zynq-zed.dts
index d6acf2b1cdf4..2eda06889dfc 100644
--- a/arch/arm/boot/dts/zynq-zed.dts
+++ b/arch/arm/boot/dts/zynq-zed.dts
@@ -30,6 +30,11 @@
};
+&gem0 {
+ status = "okay";
+ phy-mode = "rgmii";
+};
+
&uart1 {
status = "okay";
};
--
1.8.5.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH] ARM: zynq: add gem support
2013-12-11 17:29 [PATCH] ARM: zynq: add gem support Soren Brinkmann
@ 2013-12-12 8:48 ` Michal Simek
0 siblings, 0 replies; 5+ messages in thread
From: Michal Simek @ 2013-12-12 8:48 UTC (permalink / raw)
To: linux-arm-kernel
On 12/11/2013 06:29 PM, Soren Brinkmann wrote:
> From: Steffen Trumtrar <s.trumtrar@pengutronix.de>
>
> The zynq includes a Cadence GEM IP core. This is compatible with the macb driver.
> Add it to the zynq-7000 DT.
>
> Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
> Cc: Michal Simek <michal.simek@xilinx.com>
> Cc: Josh Cartwright <josh.cartwright@ni.com>
> [soren: rebased to current Linus tree, added zc706 + zed support, moved phy-mode property to board level dtses]
> Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
> ---
> This has a soft dependency on the net-next tree which has some patches for the
> macb driver which are required for full functionality. But adding this patch to
> any tree without net-next shouldn't do any harm, network might be
> non-operational at the worst - I think.
>
> S?ren
>
> arch/arm/boot/dts/zynq-7000.dtsi | 18 ++++++++++++++++++
> arch/arm/boot/dts/zynq-zc702.dts | 5 +++++
> arch/arm/boot/dts/zynq-zc706.dts | 5 +++++
> arch/arm/boot/dts/zynq-zed.dts | 5 +++++
> 4 files changed, 33 insertions(+)
Applied to zynq/dt branch.
Thanks,
Michal
--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 263 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20131212/e6b01d6e/attachment.sig>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] ARM: zynq: add gem support
@ 2013-03-23 12:38 Steffen Trumtrar
2013-03-25 13:58 ` Michal Simek
0 siblings, 1 reply; 5+ messages in thread
From: Steffen Trumtrar @ 2013-03-23 12:38 UTC (permalink / raw)
To: linux-arm-kernel
The zynq includes a Cadence GEM IP core. This is compatible with the macb driver.
Add it to the zynq-7000 DT.
Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: Josh Cartwright <josh.cartwright@ni.com>
---
arch/arm/boot/dts/zynq-7000.dtsi | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
diff --git a/arch/arm/boot/dts/zynq-7000.dtsi b/arch/arm/boot/dts/zynq-7000.dtsi
index 0dd2dc7..88564fa 100644
--- a/arch/arm/boot/dts/zynq-7000.dtsi
+++ b/arch/arm/boot/dts/zynq-7000.dtsi
@@ -54,6 +54,26 @@
clocks = <&uart_clk 1>;
};
+ gem0: ethernet at e000b000 {
+ compatible = "cdns,gem";
+ reg = <0xe000b000 0x4000>;
+ status = "disabled";
+ interrupts = <0 22 4>;
+ clocks = <&gem0_clk 0>, <&gem0_clk 0>;
+ clock-names = "pclk", "hclk";
+ phy-mode = "rgmii";
+ };
+
+ gem1: ethernet at e000c000 {
+ compatible = "cdns,gem";
+ reg = <0xe000c000 0x4000>;
+ status = "disabled";
+ interrupts = <0 45 4>;
+ clocks = <&gem1_clk 0>, <&gem1_clk 0>;
+ clock-names = "pclk", "hclk";
+ phy-mode = "rgmii";
+ };
+
slcr: slcr at f8000000 {
compatible = "xlnx,zynq-slcr";
reg = <0xF8000000 0x1000>;
@@ -89,6 +109,22 @@
reg = <0x108 0x118>;
clock-output-names = "iopll";
};
+ gem0_clk: gem0_clk {
+ #clock-cells = <1>;
+ compatible = "xlnx,zynq-periph-clock";
+ clocks = <&iopll &armpll &ddrpll>;
+ reg = <0x140>;
+ clock-output-names = "gem0_ref_clk1",
+ "gem0_ref_clk2";
+ };
+ gem1_clk: gem1_clk {
+ #clock-cells = <1>;
+ compatible = "xlnx,zynq-periph-clock";
+ clocks = <&iopll &armpll &ddrpll>;
+ reg = <0x144>;
+ clock-output-names = "gem1_ref_clk1",
+ "gem1_ref_clk2";
+ };
uart_clk: uart_clk {
#clock-cells = <1>;
compatible = "xlnx,zynq-periph-clock";
--
1.8.2.rc2
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH] ARM: zynq: add gem support
2013-03-23 12:38 Steffen Trumtrar
@ 2013-03-25 13:58 ` Michal Simek
2013-03-25 15:21 ` Steffen Trumtrar
0 siblings, 1 reply; 5+ messages in thread
From: Michal Simek @ 2013-03-25 13:58 UTC (permalink / raw)
To: linux-arm-kernel
2013/3/23 Steffen Trumtrar <s.trumtrar@pengutronix.de>:
> The zynq includes a Cadence GEM IP core. This is compatible with the macb driver.
> Add it to the zynq-7000 DT.
>
> Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
> Cc: Michal Simek <michal.simek@xilinx.com>
> Cc: Josh Cartwright <josh.cartwright@ni.com>
> ---
> arch/arm/boot/dts/zynq-7000.dtsi | 36 ++++++++++++++++++++++++++++++++++++
> 1 file changed, 36 insertions(+)
>
> diff --git a/arch/arm/boot/dts/zynq-7000.dtsi b/arch/arm/boot/dts/zynq-7000.dtsi
> index 0dd2dc7..88564fa 100644
> --- a/arch/arm/boot/dts/zynq-7000.dtsi
> +++ b/arch/arm/boot/dts/zynq-7000.dtsi
> @@ -54,6 +54,26 @@
> clocks = <&uart_clk 1>;
> };
>
> + gem0: ethernet at e000b000 {
> + compatible = "cdns,gem";
> + reg = <0xe000b000 0x4000>;
> + status = "disabled";
> + interrupts = <0 22 4>;
> + clocks = <&gem0_clk 0>, <&gem0_clk 0>;
> + clock-names = "pclk", "hclk";
> + phy-mode = "rgmii";
> + };
> +
> + gem1: ethernet at e000c000 {
> + compatible = "cdns,gem";
> + reg = <0xe000c000 0x4000>;
> + status = "disabled";
> + interrupts = <0 45 4>;
> + clocks = <&gem1_clk 0>, <&gem1_clk 0>;
> + clock-names = "pclk", "hclk";
> + phy-mode = "rgmii";
> + };
> +
> slcr: slcr at f8000000 {
> compatible = "xlnx,zynq-slcr";
> reg = <0xF8000000 0x1000>;
> @@ -89,6 +109,22 @@
> reg = <0x108 0x118>;
> clock-output-names = "iopll";
> };
> + gem0_clk: gem0_clk {
> + #clock-cells = <1>;
> + compatible = "xlnx,zynq-periph-clock";
> + clocks = <&iopll &armpll &ddrpll>;
> + reg = <0x140>;
> + clock-output-names = "gem0_ref_clk1",
> + "gem0_ref_clk2";
> + };
> + gem1_clk: gem1_clk {
> + #clock-cells = <1>;
> + compatible = "xlnx,zynq-periph-clock";
> + clocks = <&iopll &armpll &ddrpll>;
> + reg = <0x144>;
> + clock-output-names = "gem1_ref_clk1",
> + "gem1_ref_clk2";
> + };
This is nice. Will look at it.
I have checked you have sent some macb related patches.
Do I need them to apply them to get this to work?
Thanks,
Michal
--
Michal Simek, Ing. (M.Eng)
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH] ARM: zynq: add gem support
2013-03-25 13:58 ` Michal Simek
@ 2013-03-25 15:21 ` Steffen Trumtrar
0 siblings, 0 replies; 5+ messages in thread
From: Steffen Trumtrar @ 2013-03-25 15:21 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Mar 25, 2013 at 02:58:15PM +0100, Michal Simek wrote:
> 2013/3/23 Steffen Trumtrar <s.trumtrar@pengutronix.de>:
> > The zynq includes a Cadence GEM IP core. This is compatible with the macb driver.
> > Add it to the zynq-7000 DT.
> >
> > Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
> > Cc: Michal Simek <michal.simek@xilinx.com>
> > Cc: Josh Cartwright <josh.cartwright@ni.com>
> > ---
> > arch/arm/boot/dts/zynq-7000.dtsi | 36 ++++++++++++++++++++++++++++++++++++
> > 1 file changed, 36 insertions(+)
> >
> > diff --git a/arch/arm/boot/dts/zynq-7000.dtsi b/arch/arm/boot/dts/zynq-7000.dtsi
> > index 0dd2dc7..88564fa 100644
> > --- a/arch/arm/boot/dts/zynq-7000.dtsi
> > +++ b/arch/arm/boot/dts/zynq-7000.dtsi
> > @@ -54,6 +54,26 @@
> > clocks = <&uart_clk 1>;
> > };
> >
> > + gem0: ethernet at e000b000 {
> > + compatible = "cdns,gem";
> > + reg = <0xe000b000 0x4000>;
> > + status = "disabled";
> > + interrupts = <0 22 4>;
> > + clocks = <&gem0_clk 0>, <&gem0_clk 0>;
> > + clock-names = "pclk", "hclk";
> > + phy-mode = "rgmii";
> > + };
> > +
> > + gem1: ethernet at e000c000 {
> > + compatible = "cdns,gem";
> > + reg = <0xe000c000 0x4000>;
> > + status = "disabled";
> > + interrupts = <0 45 4>;
> > + clocks = <&gem1_clk 0>, <&gem1_clk 0>;
> > + clock-names = "pclk", "hclk";
> > + phy-mode = "rgmii";
> > + };
> > +
> > slcr: slcr at f8000000 {
> > compatible = "xlnx,zynq-slcr";
> > reg = <0xF8000000 0x1000>;
> > @@ -89,6 +109,22 @@
> > reg = <0x108 0x118>;
> > clock-output-names = "iopll";
> > };
> > + gem0_clk: gem0_clk {
> > + #clock-cells = <1>;
> > + compatible = "xlnx,zynq-periph-clock";
> > + clocks = <&iopll &armpll &ddrpll>;
> > + reg = <0x140>;
> > + clock-output-names = "gem0_ref_clk1",
> > + "gem0_ref_clk2";
> > + };
> > + gem1_clk: gem1_clk {
> > + #clock-cells = <1>;
> > + compatible = "xlnx,zynq-periph-clock";
> > + clocks = <&iopll &armpll &ddrpll>;
> > + reg = <0x144>;
> > + clock-output-names = "gem1_ref_clk1",
> > + "gem1_ref_clk2";
> > + };
>
> This is nice. Will look at it.
> I have checked you have sent some macb related patches.
> Do I need them to apply them to get this to work?
>
Yes. Those patches are necessary for the driver to work.
One fixes the endianess, without that patch all your packages will be bogus.
And the ISR patch is needed, too.
Regards,
Steffen
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-12-12 8:48 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-11 17:29 [PATCH] ARM: zynq: add gem support Soren Brinkmann
2013-12-12 8:48 ` Michal Simek
-- strict thread matches above, loose matches on Subject: below --
2013-03-23 12:38 Steffen Trumtrar
2013-03-25 13:58 ` Michal Simek
2013-03-25 15:21 ` Steffen Trumtrar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).