Support for Marvell 88E1510 and 88E1116R

Support for Marvell 88E1510 and 88E1116R

[Michal Simek]

Hi guys,

just a question regarding to Marvell 88e1510 and 88E1116R phys.
We have these phys on the arm zynq board and would like to add
support to the kernel. Is there any repository with these phys?
If yes, when are you going to add them to the mainline?

If there is not, I can send patches for them.
(I am not the author of that patches just trying to clean our
repository and add patches to the mainline)

Thanks,
Michal

-- 
Michal Simek, Ing. (M.Eng)
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/
Microblaze U-BOOT custodian

Re: Support for Marvell 88E1510 and 88E1116R

[Lars-Peter Clausen]

On 01/02/2013 10:58 AM, Michal Simek wrote:
> Hi guys,
> 
> just a question regarding to Marvell 88e1510 and 88E1116R phys.
> We have these phys on the arm zynq board and would like to add
> support to the kernel. Is there any repository with these phys?
> If yes, when are you going to add them to the mainline?
> 
> If there is not, I can send patches for them.
> (I am not the author of that patches just trying to clean our
> repository and add patches to the mainline)

I think the 88E1510 support was added by the Digilent guys (added to Cc) and
the 88E1116R support came from within Xilinx.

I agree that these are pretty straight forward changes and could go upstream in
their current form.

- Lars

RE: Support for Marvell 88E1510 and 88E1116R

[Steven Wang]

Hi, Michal,

We do have the Ethernet support for 88E1510 (used on ZedBoard) in our repository. The commit is
https://github.com/Digilent/linux-digilent/commit/ae635e5fff35e9fe5928b4aca7264a1e5313a6b8
Or, I can send the patch to you if you need.

Best Regards,
Steve

-----Original Message-----
From: Lars-Peter Clausen [mailto:lars@metafoo.de] 
Sent: Wednesday, January 2, 2013 8:08 AM
To: monstr@monstr.eu
Cc: netdev@vger.kernel.org; Christian Hohnstaedt; Srinivas Kandagatla; David Miller; LKML; John Linn; Michal Simek; Sam Bobrowicz; Rick Hoover; Steven Wang
Subject: Re: Support for Marvell 88E1510 and 88E1116R

On 01/02/2013 10:58 AM, Michal Simek wrote:
> Hi guys,
> 
> just a question regarding to Marvell 88e1510 and 88E1116R phys.
> We have these phys on the arm zynq board and would like to add
> support to the kernel. Is there any repository with these phys?
> If yes, when are you going to add them to the mainline?
> 
> If there is not, I can send patches for them.
> (I am not the author of that patches just trying to clean our
> repository and add patches to the mainline)

I think the 88E1510 support was added by the Digilent guys (added to Cc) and
the 88E1116R support came from within Xilinx.

I agree that these are pretty straight forward changes and could go upstream in
their current form.

- Lars

Re: Support for Marvell 88E1510 and 88E1116R

[Michal Simek]

Hi Steve,

2013/1/2 Steven Wang <steven.wang@digilentinc.com>:
> Hi, Michal,
>
> We do have the Ethernet support for 88E1510 (used on ZedBoard) in our repository. The commit is
> https://github.com/Digilent/linux-digilent/commit/ae635e5fff35e9fe5928b4aca7264a1e5313a6b8
> Or, I can send the patch to you if you need.

I know. Can you please clean this patch and send it to mainline for review?
(Remove comment and that emacps connection).

I will add this patch to our tree to support this patch.

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

RE: Support for Marvell 88E1510 and 88E1116R

[Steven Wang]

[-- Attachment #1: Type: text/plain, Size: 1400 bytes --]

Hi, Michal,

I have generated the patch and cleaned up the codes.
The codes was originally written by Rick Hoover.

I have sent it via git send-email command to you and git@xilinx.com.
I also attached the patch here just in case the email failed to go through.

Best Regards,
Steve

-----Original Message-----
From: Michal Simek [mailto:monstr@monstr.eu] 
Sent: Friday, January 4, 2013 1:41 AM
To: Steven Wang
Cc: Lars-Peter Clausen; netdev@vger.kernel.org; Christian Hohnstaedt; Srinivas Kandagatla; David Miller; LKML; John Linn; Sam Bobrowicz; Rick Hoover
Subject: Re: Support for Marvell 88E1510 and 88E1116R

Hi Steve,

2013/1/2 Steven Wang <steven.wang@digilentinc.com>:
> Hi, Michal,
>
> We do have the Ethernet support for 88E1510 (used on ZedBoard) in our 
> repository. The commit is
> https://github.com/Digilent/linux-digilent/commit/ae635e5fff35e9fe5928
> b4aca7264a1e5313a6b8 Or, I can send the patch to you if you need.

I know. Can you please clean this patch and send it to mainline for review?
(Remove comment and that emacps connection).

I will add this patch to our tree to support this patch.

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


[-- Attachment #2: 0001-Digilent-Marvell-PHY-Added-a-new-entry-for-88E1510-P.patch --]
[-- Type: application/octet-stream, Size: 2401 bytes --]

From 54ef0b3262c0657c2efaeb4d0f0cbb4d3b9efdd0 Mon Sep 17 00:00:00 2001
From: Rick Hoover <RHoover@digilentinc.com>
Date: Fri, 4 Jan 2013 13:56:54 -0800
Subject: [PATCH] Digilent: Marvell PHY: Added a new entry for 88E1510 PHYs

Added a new entry for 88E1510.
Added PHY initialization routine for 88E1510.

Signed-off-by: Tinghui WANG (Steven) <steven.wang@digilentinc.com>
---
 drivers/net/phy/marvell.c   |   26 ++++++++++++++++++++++++++
 include/linux/marvell_phy.h |    1 +
 2 files changed, 27 insertions(+), 0 deletions(-)

diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index e91397e..7acc633 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -350,6 +350,17 @@ static int m88e1318_config_aneg(struct phy_device *phydev)
 	return m88e1121_config_aneg(phydev);
 }
 
+static int m88e1510_config_aneg(struct phy_device *phydev)
+{
+	int err;
+
+	err = m88e1318_config_aneg(phydev);
+	if (err < 0)
+		return err;
+
+	return marvell_of_reg_init(phydev);
+}
+
 static int m88e1116r_config_init(struct phy_device *phydev)
 {
 	int temp;
@@ -887,6 +898,20 @@ static struct phy_driver marvell_drivers[] = {
 		.config_intr = &marvell_config_intr,
 		.driver = { .owner = THIS_MODULE },
 	},
+	{
+		.phy_id = MARVELL_PHY_ID_88E1510,
+		.phy_id_mask = MARVELL_PHY_ID_MASK,
+		.name = "Marvell 88E1510",
+		.features = PHY_GBIT_FEATURES,
+		.flags = PHY_HAS_INTERRUPT,
+		.config_aneg = &m88e1510_config_aneg,
+		.read_status = &marvell_read_status,
+		.ack_interrupt = &marvell_ack_interrupt,
+		.config_intr = &marvell_config_intr,
+		.did_interrupt = &m88e1121_did_interrupt,
+		.driver = { .owner = THIS_MODULE },
+	},
+
 };
 
 static int __init marvell_init(void)
@@ -915,6 +940,7 @@ static struct mdio_device_id __maybe_unused marvell_tbl[] = {
 	{ 0x01410e30, 0xfffffff0 },
 	{ 0x01410e90, 0xfffffff0 },
 	{ 0x01410e40, 0xfffffff0 },
+	{ 0x01410dd0, 0xfffffff0 },
 	{ }
 };
 
diff --git a/include/linux/marvell_phy.h b/include/linux/marvell_phy.h
index ec41025..8e9a029 100644
--- a/include/linux/marvell_phy.h
+++ b/include/linux/marvell_phy.h
@@ -15,6 +15,7 @@
 #define MARVELL_PHY_ID_88E1240		0x01410e30
 #define MARVELL_PHY_ID_88E1318S		0x01410e90
 #define MARVELL_PHY_ID_88E1116R		0x01410e40
+#define MARVELL_PHY_ID_88E1510		0x01410dd0
 
 /* struct phy_device dev_flags definitions */
 #define MARVELL_PHY_M1145_FLAGS_RESISTANCE	0x00000001
-- 
1.7.1

Re: Support for Marvell 88E1510 and 88E1116R

[Michal Simek]

Hi,

2013/1/4 Steven Wang <steven.wang@digilentinc.com>:
> Hi, Michal,
>
> I have generated the patch and cleaned up the codes.
> The codes was originally written by Rick Hoover.
>
> I have sent it via git send-email command to you and git@xilinx.com.
> I also attached the patch here just in case the email failed to go through.

FYI: please use git send-email for sending this patch to netdev
mailing list too.

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