[PATCH] net: phy: vitesse: add support for VSC8601

[PATCH] net: phy: vitesse: add support for VSC8601

[Mans Rullgard]

This adds support for the Vitesse VSC8601 PHY. Generic functions are
used for everything except interrupt handling.

Signed-off-by: Mans Rullgard <mans@mansr.com>
---
 drivers/net/phy/vitesse.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/drivers/net/phy/vitesse.c b/drivers/net/phy/vitesse.c
index 76cad71..dd295db 100644
--- a/drivers/net/phy/vitesse.c
+++ b/drivers/net/phy/vitesse.c
@@ -66,6 +66,7 @@
 #define PHY_ID_VSC8244			0x000fc6c0
 #define PHY_ID_VSC8514			0x00070670
 #define PHY_ID_VSC8574			0x000704a0
+#define PHY_ID_VSC8601			0x00070420
 #define PHY_ID_VSC8662			0x00070660
 #define PHY_ID_VSC8221			0x000fc550
 #define PHY_ID_VSC8211			0x000fc4b0
@@ -133,7 +134,8 @@ static int vsc82xx_config_intr(struct phy_device *phydev)
 			(phydev->drv->phy_id == PHY_ID_VSC8234 ||
 			 phydev->drv->phy_id == PHY_ID_VSC8244 ||
 			 phydev->drv->phy_id == PHY_ID_VSC8514 ||
-			 phydev->drv->phy_id == PHY_ID_VSC8574) ?
+			 phydev->drv->phy_id == PHY_ID_VSC8574 ||
+			 phydev->drv->phy_id == PHY_ID_VSC8601) ?
 				MII_VSC8244_IMASK_MASK :
 				MII_VSC8221_IMASK_MASK);
 	else {
@@ -272,6 +274,18 @@ static struct phy_driver vsc82xx_driver[] = {
 	.config_intr    = &vsc82xx_config_intr,
 	.driver         = { .owner = THIS_MODULE,},
 }, {
+	.phy_id         = PHY_ID_VSC8601,
+	.name           = "Vitesse VSC8601",
+	.phy_id_mask    = 0x000ffff0,
+	.features       = PHY_GBIT_FEATURES,
+	.flags          = PHY_HAS_INTERRUPT,
+	.config_init    = &genphy_config_init,
+	.config_aneg    = &genphy_config_aneg,
+	.read_status    = &genphy_read_status,
+	.ack_interrupt  = &vsc824x_ack_interrupt,
+	.config_intr    = &vsc82xx_config_intr,
+	.driver         = { .owner = THIS_MODULE,},
+}, {
 	.phy_id         = PHY_ID_VSC8662,
 	.name           = "Vitesse VSC8662",
 	.phy_id_mask    = 0x000ffff0,
-- 
2.6.3

Re: [PATCH] net: phy: vitesse: add support for VSC8601

[Florian Fainelli]

On 12/11/15 10:41, Mans Rullgard wrote:
> This adds support for the Vitesse VSC8601 PHY. Generic functions are
> used for everything except interrupt handling.
> 
> Signed-off-by: Mans Rullgard <mans@mansr.com>

Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
-- 
Florian

Re: [PATCH] net: phy: vitesse: add support for VSC8601

[Mason]

On 12/11/2015 19:41, Mans Rullgard wrote:

> +	.phy_id         = PHY_ID_VSC8601,
> +	.name           = "Vitesse VSC8601",
> +	.phy_id_mask    = 0x000ffff0,
> +	.features       = PHY_GBIT_FEATURES,
> +	.flags          = PHY_HAS_INTERRUPT,
> +	.config_init    = &genphy_config_init,
> +	.config_aneg    = &genphy_config_aneg,
> +	.read_status    = &genphy_read_status,
> +	.ack_interrupt  = &vsc824x_ack_interrupt,
> +	.config_intr    = &vsc82xx_config_intr,

I expected Documentation/CodingStyle to forbid taking the address
of functions.

Regards.

Re: [PATCH] net: phy: vitesse: add support for VSC8601

[Måns Rullgård]

Mason <slash.tmp@free.fr> writes:

> On 12/11/2015 19:41, Mans Rullgard wrote:
>
>> +	.phy_id         = PHY_ID_VSC8601,
>> +	.name           = "Vitesse VSC8601",
>> +	.phy_id_mask    = 0x000ffff0,
>> +	.features       = PHY_GBIT_FEATURES,
>> +	.flags          = PHY_HAS_INTERRUPT,
>> +	.config_init    = &genphy_config_init,
>> +	.config_aneg    = &genphy_config_aneg,
>> +	.read_status    = &genphy_read_status,
>> +	.ack_interrupt  = &vsc824x_ack_interrupt,
>> +	.config_intr    = &vsc82xx_config_intr,
>
> I expected Documentation/CodingStyle to forbid taking the address
> of functions.

I can't find anything to that effect.  That said, it's not something I
would normally do, but all the other phy_driver entries in that file
look like that.

-- 
Måns Rullgård
mans@mansr.com

Re: [PATCH] net: phy: vitesse: add support for VSC8601

[David Miller]

From: Mans Rullgard <mans@mansr.com>
Date: Thu, 12 Nov 2015 18:41:12 +0000

> This adds support for the Vitesse VSC8601 PHY. Generic functions are
> used for everything except interrupt handling.
> 
> Signed-off-by: Mans Rullgard <mans@mansr.com>

Applied.