* [PATCH v2 1/2] broadcom: move all PHY_ID's to header
@ 2010-06-17 9:02 Dmitry Eremin-Solenikov
2010-06-17 9:02 ` [PATCH v2 2/2] broadcom: Add 5241 support Dmitry Eremin-Solenikov
2010-06-25 4:30 ` [PATCH v2 1/2] broadcom: move all PHY_ID's to header David Miller
0 siblings, 2 replies; 5+ messages in thread
From: Dmitry Eremin-Solenikov @ 2010-06-17 9:02 UTC (permalink / raw)
To: netdev; +Cc: David S. Miller, Matt Carlson, Michael Chan
Move all PHY IDs to brcmphy.h header for completeness and unification of code.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
drivers/net/phy/broadcom.c | 24 ++++++++++++------------
include/linux/brcmphy.h | 6 ++++++
2 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c
index cecdbbd..b743d37 100644
--- a/drivers/net/phy/broadcom.c
+++ b/drivers/net/phy/broadcom.c
@@ -685,7 +685,7 @@ static int brcm_fet_config_intr(struct phy_device *phydev)
}
static struct phy_driver bcm5411_driver = {
- .phy_id = 0x00206070,
+ .phy_id = PHY_ID_BCM5411,
.phy_id_mask = 0xfffffff0,
.name = "Broadcom BCM5411",
.features = PHY_GBIT_FEATURES |
@@ -700,7 +700,7 @@ static struct phy_driver bcm5411_driver = {
};
static struct phy_driver bcm5421_driver = {
- .phy_id = 0x002060e0,
+ .phy_id = PHY_ID_BCM5421,
.phy_id_mask = 0xfffffff0,
.name = "Broadcom BCM5421",
.features = PHY_GBIT_FEATURES |
@@ -715,7 +715,7 @@ static struct phy_driver bcm5421_driver = {
};
static struct phy_driver bcm5461_driver = {
- .phy_id = 0x002060c0,
+ .phy_id = PHY_ID_BCM5461,
.phy_id_mask = 0xfffffff0,
.name = "Broadcom BCM5461",
.features = PHY_GBIT_FEATURES |
@@ -730,7 +730,7 @@ static struct phy_driver bcm5461_driver = {
};
static struct phy_driver bcm5464_driver = {
- .phy_id = 0x002060b0,
+ .phy_id = PHY_ID_BCM5464,
.phy_id_mask = 0xfffffff0,
.name = "Broadcom BCM5464",
.features = PHY_GBIT_FEATURES |
@@ -745,7 +745,7 @@ static struct phy_driver bcm5464_driver = {
};
static struct phy_driver bcm5481_driver = {
- .phy_id = 0x0143bca0,
+ .phy_id = PHY_ID_BCM5481,
.phy_id_mask = 0xfffffff0,
.name = "Broadcom BCM5481",
.features = PHY_GBIT_FEATURES |
@@ -760,7 +760,7 @@ static struct phy_driver bcm5481_driver = {
};
static struct phy_driver bcm5482_driver = {
- .phy_id = 0x0143bcb0,
+ .phy_id = PHY_ID_BCM5482,
.phy_id_mask = 0xfffffff0,
.name = "Broadcom BCM5482",
.features = PHY_GBIT_FEATURES |
@@ -910,12 +910,12 @@ module_init(broadcom_init);
module_exit(broadcom_exit);
static struct mdio_device_id broadcom_tbl[] = {
- { 0x00206070, 0xfffffff0 },
- { 0x002060e0, 0xfffffff0 },
- { 0x002060c0, 0xfffffff0 },
- { 0x002060b0, 0xfffffff0 },
- { 0x0143bca0, 0xfffffff0 },
- { 0x0143bcb0, 0xfffffff0 },
+ { PHY_ID_BCM5411, 0xfffffff0 },
+ { PHY_ID_BCM5421, 0xfffffff0 },
+ { PHY_ID_BCM5461, 0xfffffff0 },
+ { PHY_ID_BCM5464, 0xfffffff0 },
+ { PHY_ID_BCM5482, 0xfffffff0 },
+ { PHY_ID_BCM5482, 0xfffffff0 },
{ PHY_ID_BCM50610, 0xfffffff0 },
{ PHY_ID_BCM50610M, 0xfffffff0 },
{ PHY_ID_BCM57780, 0xfffffff0 },
diff --git a/include/linux/brcmphy.h b/include/linux/brcmphy.h
index 7f437ca..c14c3a1 100644
--- a/include/linux/brcmphy.h
+++ b/include/linux/brcmphy.h
@@ -1,6 +1,12 @@
#define PHY_ID_BCM50610 0x0143bd60
#define PHY_ID_BCM50610M 0x0143bd70
#define PHY_ID_BCMAC131 0x0143bc70
+#define PHY_ID_BCM5481 0x0143bca0
+#define PHY_ID_BCM5482 0x0143bcb0
+#define PHY_ID_BCM5411 0x00206070
+#define PHY_ID_BCM5421 0x002060e0
+#define PHY_ID_BCM5464 0x002060b0
+#define PHY_ID_BCM5461 0x002060c0
#define PHY_ID_BCM57780 0x03625d90
#define PHY_BCM_OUI_MASK 0xfffffc00
--
1.7.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH v2 2/2] broadcom: Add 5241 support
2010-06-17 9:02 [PATCH v2 1/2] broadcom: move all PHY_ID's to header Dmitry Eremin-Solenikov
@ 2010-06-17 9:02 ` Dmitry Eremin-Solenikov
2010-06-18 1:22 ` Matt Carlson
2010-06-25 4:30 ` David Miller
2010-06-25 4:30 ` [PATCH v2 1/2] broadcom: move all PHY_ID's to header David Miller
1 sibling, 2 replies; 5+ messages in thread
From: Dmitry Eremin-Solenikov @ 2010-06-17 9:02 UTC (permalink / raw)
To: netdev; +Cc: David S. Miller, Matt Carlson, Michael Chan
This patch adds the 5241 PHY ID to the broadcom module.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
drivers/net/phy/broadcom.c | 22 ++++++++++++++++++++++
include/linux/brcmphy.h | 1 +
2 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c
index b743d37..4accd83 100644
--- a/drivers/net/phy/broadcom.c
+++ b/drivers/net/phy/broadcom.c
@@ -834,6 +834,21 @@ static struct phy_driver bcmac131_driver = {
.driver = { .owner = THIS_MODULE },
};
+static struct phy_driver bcm5241_driver = {
+ .phy_id = PHY_ID_BCM5241,
+ .phy_id_mask = 0xfffffff0,
+ .name = "Broadcom BCM5241",
+ .features = PHY_BASIC_FEATURES |
+ SUPPORTED_Pause | SUPPORTED_Asym_Pause,
+ .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,
+ .config_init = brcm_fet_config_init,
+ .config_aneg = genphy_config_aneg,
+ .read_status = genphy_read_status,
+ .ack_interrupt = brcm_fet_ack_interrupt,
+ .config_intr = brcm_fet_config_intr,
+ .driver = { .owner = THIS_MODULE },
+};
+
static int __init broadcom_init(void)
{
int ret;
@@ -868,8 +883,13 @@ static int __init broadcom_init(void)
ret = phy_driver_register(&bcmac131_driver);
if (ret)
goto out_ac131;
+ ret = phy_driver_register(&bcm5241_driver);
+ if (ret)
+ goto out_5241;
return ret;
+out_5241:
+ phy_driver_unregister(&bcmac131_driver);
out_ac131:
phy_driver_unregister(&bcm57780_driver);
out_57780:
@@ -894,6 +914,7 @@ out_5411:
static void __exit broadcom_exit(void)
{
+ phy_driver_unregister(&bcm5241_driver);
phy_driver_unregister(&bcmac131_driver);
phy_driver_unregister(&bcm57780_driver);
phy_driver_unregister(&bcm50610m_driver);
@@ -920,6 +941,7 @@ static struct mdio_device_id broadcom_tbl[] = {
{ PHY_ID_BCM50610M, 0xfffffff0 },
{ PHY_ID_BCM57780, 0xfffffff0 },
{ PHY_ID_BCMAC131, 0xfffffff0 },
+ { PHY_ID_BCM5241, 0xfffffff0 },
{ }
};
diff --git a/include/linux/brcmphy.h b/include/linux/brcmphy.h
index c14c3a1..b840a49 100644
--- a/include/linux/brcmphy.h
+++ b/include/linux/brcmphy.h
@@ -1,5 +1,6 @@
#define PHY_ID_BCM50610 0x0143bd60
#define PHY_ID_BCM50610M 0x0143bd70
+#define PHY_ID_BCM5241 0x0143bc30
#define PHY_ID_BCMAC131 0x0143bc70
#define PHY_ID_BCM5481 0x0143bca0
#define PHY_ID_BCM5482 0x0143bcb0
--
1.7.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH v2 2/2] broadcom: Add 5241 support
2010-06-17 9:02 ` [PATCH v2 2/2] broadcom: Add 5241 support Dmitry Eremin-Solenikov
@ 2010-06-18 1:22 ` Matt Carlson
2010-06-25 4:30 ` David Miller
1 sibling, 0 replies; 5+ messages in thread
From: Matt Carlson @ 2010-06-18 1:22 UTC (permalink / raw)
To: Dmitry Eremin-Solenikov
Cc: netdev@vger.kernel.org, David S. Miller, Matthew Carlson,
Michael Chan
On Thu, Jun 17, 2010 at 02:02:24AM -0700, Dmitry Eremin-Solenikov wrote:
> This patch adds the 5241 PHY ID to the broadcom module.
This looks O.K. to me. I'm curious, do the LEDs behave as
you expect them to?
> Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
> ---
> drivers/net/phy/broadcom.c | 22 ++++++++++++++++++++++
> include/linux/brcmphy.h | 1 +
> 2 files changed, 23 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c
> index b743d37..4accd83 100644
> --- a/drivers/net/phy/broadcom.c
> +++ b/drivers/net/phy/broadcom.c
> @@ -834,6 +834,21 @@ static struct phy_driver bcmac131_driver = {
> .driver = { .owner = THIS_MODULE },
> };
>
> +static struct phy_driver bcm5241_driver = {
> + .phy_id = PHY_ID_BCM5241,
> + .phy_id_mask = 0xfffffff0,
> + .name = "Broadcom BCM5241",
> + .features = PHY_BASIC_FEATURES |
> + SUPPORTED_Pause | SUPPORTED_Asym_Pause,
> + .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,
> + .config_init = brcm_fet_config_init,
> + .config_aneg = genphy_config_aneg,
> + .read_status = genphy_read_status,
> + .ack_interrupt = brcm_fet_ack_interrupt,
> + .config_intr = brcm_fet_config_intr,
> + .driver = { .owner = THIS_MODULE },
> +};
> +
> static int __init broadcom_init(void)
> {
> int ret;
> @@ -868,8 +883,13 @@ static int __init broadcom_init(void)
> ret = phy_driver_register(&bcmac131_driver);
> if (ret)
> goto out_ac131;
> + ret = phy_driver_register(&bcm5241_driver);
> + if (ret)
> + goto out_5241;
> return ret;
>
> +out_5241:
> + phy_driver_unregister(&bcmac131_driver);
> out_ac131:
> phy_driver_unregister(&bcm57780_driver);
> out_57780:
> @@ -894,6 +914,7 @@ out_5411:
>
> static void __exit broadcom_exit(void)
> {
> + phy_driver_unregister(&bcm5241_driver);
> phy_driver_unregister(&bcmac131_driver);
> phy_driver_unregister(&bcm57780_driver);
> phy_driver_unregister(&bcm50610m_driver);
> @@ -920,6 +941,7 @@ static struct mdio_device_id broadcom_tbl[] = {
> { PHY_ID_BCM50610M, 0xfffffff0 },
> { PHY_ID_BCM57780, 0xfffffff0 },
> { PHY_ID_BCMAC131, 0xfffffff0 },
> + { PHY_ID_BCM5241, 0xfffffff0 },
> { }
> };
>
> diff --git a/include/linux/brcmphy.h b/include/linux/brcmphy.h
> index c14c3a1..b840a49 100644
> --- a/include/linux/brcmphy.h
> +++ b/include/linux/brcmphy.h
> @@ -1,5 +1,6 @@
> #define PHY_ID_BCM50610 0x0143bd60
> #define PHY_ID_BCM50610M 0x0143bd70
> +#define PHY_ID_BCM5241 0x0143bc30
> #define PHY_ID_BCMAC131 0x0143bc70
> #define PHY_ID_BCM5481 0x0143bca0
> #define PHY_ID_BCM5482 0x0143bcb0
> --
> 1.7.1
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH v2 2/2] broadcom: Add 5241 support
2010-06-17 9:02 ` [PATCH v2 2/2] broadcom: Add 5241 support Dmitry Eremin-Solenikov
2010-06-18 1:22 ` Matt Carlson
@ 2010-06-25 4:30 ` David Miller
1 sibling, 0 replies; 5+ messages in thread
From: David Miller @ 2010-06-25 4:30 UTC (permalink / raw)
To: dbaryshkov; +Cc: netdev, mcarlson, mchan
From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Date: Thu, 17 Jun 2010 13:02:24 +0400
> This patch adds the 5241 PHY ID to the broadcom module.
>
> Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Applied to net-next-2.6
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2 1/2] broadcom: move all PHY_ID's to header
2010-06-17 9:02 [PATCH v2 1/2] broadcom: move all PHY_ID's to header Dmitry Eremin-Solenikov
2010-06-17 9:02 ` [PATCH v2 2/2] broadcom: Add 5241 support Dmitry Eremin-Solenikov
@ 2010-06-25 4:30 ` David Miller
1 sibling, 0 replies; 5+ messages in thread
From: David Miller @ 2010-06-25 4:30 UTC (permalink / raw)
To: dbaryshkov; +Cc: netdev, mcarlson, mchan
From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Date: Thu, 17 Jun 2010 13:02:23 +0400
> Move all PHY IDs to brcmphy.h header for completeness and unification of code.
>
> Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Applied to net-next-2.6.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-06-25 4:30 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-06-17 9:02 [PATCH v2 1/2] broadcom: move all PHY_ID's to header Dmitry Eremin-Solenikov
2010-06-17 9:02 ` [PATCH v2 2/2] broadcom: Add 5241 support Dmitry Eremin-Solenikov
2010-06-18 1:22 ` Matt Carlson
2010-06-25 4:30 ` David Miller
2010-06-25 4:30 ` [PATCH v2 1/2] broadcom: move all PHY_ID's to header David Miller
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).