Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1336878 > unrolled thread
| Started by | "Andrew F. Davis" <afd@ti.com> |
|---|---|
| First post | 2016-02-18 00:40 +0100 |
| Last post | 2016-02-18 00:50 +0100 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by
below is the oldest one visible, not the original post.
Re: [PATCH v2 2/5] net: phy: dp83848: Add PHY ID for TI version of DP83848C "Andrew F. Davis" <afd@ti.com> - 2016-02-18 00:40 +0100
Re: [PATCH v2 2/5] net: phy: dp83848: Add PHY ID for TI version of DP83848C Florian Fainelli <f.fainelli@gmail.com> - 2016-02-18 00:50 +0100
| From | "Andrew F. Davis" <afd@ti.com> |
|---|---|
| Date | 2016-02-18 00:40 +0100 |
| Subject | Re: [PATCH v2 2/5] net: phy: dp83848: Add PHY ID for TI version of DP83848C |
| Message-ID | <r3jRo-59z-15@gated-at.bofh.it> |
On 02/07/2016 11:47 AM, Andrew F. Davis wrote:
> After acquiring National Semiconductor, TI appears to have
> changed the Vendor Model Number for the DP83848C PHYs,
> add this new ID to supported IDs.
>
> Signed-off-by: Andrew F. Davis <afd@ti.com>
> ---
> drivers/net/phy/dp83848.c | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/phy/dp83848.c b/drivers/net/phy/dp83848.c
> index 4e78f54..d4686d5f 100644
> --- a/drivers/net/phy/dp83848.c
> +++ b/drivers/net/phy/dp83848.c
> @@ -16,7 +16,8 @@
> #include <linux/module.h>
> #include <linux/phy.h>
>
> -#define DP83848_PHY_ID 0x20005c90
> +#define TI_DP83848C_PHY_ID 0x20005ca0
> +#define NS_DP83848C_PHY_ID 0x20005c90
>
> /* Registers */
> #define DP83848_MICR 0x11
> @@ -65,7 +66,8 @@ static int dp83848_config_intr(struct phy_device *phydev)
> }
>
> static struct mdio_device_id __maybe_unused dp83848_tbl[] = {
> - { DP83848_PHY_ID, 0xfffffff0 },
> + { TI_DP83848C_PHY_ID, 0xfffffff0 },
> + { NS_DP83848C_PHY_ID, 0xfffffff0 },
> { }
> };
> MODULE_DEVICE_TABLE(mdio, dp83848_tbl);
> @@ -91,7 +93,8 @@ MODULE_DEVICE_TABLE(mdio, dp83848_tbl);
> }
>
> static struct phy_driver dp83848_driver[] = {
> - DP83848_PHY_DRIVER(DP83848_PHY_ID, "TI DP83848 10/100 Mbps PHY"),
> + DP83848_PHY_DRIVER(TI_DP83848C_PHY_ID, "TI DP83848C 10/100 Mbps PHY"),
> + DP83848_PHY_DRIVER(NS_DP83848C_PHY_ID, "TI DP83848C 10/100 Mbps PHY"),
This seems to be causing a warning about duplicate file names (driver name in
sysfs), so the bottom one can probably s/TI/NS, can this be changed in-tree
before the merge or should I submit a patch?
Andrew
> };
> module_phy_driver(dp83848_driver);
>
>
[toc] | [next] | [standalone]
| From | Florian Fainelli <f.fainelli@gmail.com> |
|---|---|
| Date | 2016-02-18 00:50 +0100 |
| Message-ID | <r3k14-5dZ-15@gated-at.bofh.it> |
| In reply to | #1336878 |
On 17/02/2016 15:37, Andrew F. Davis wrote:
> On 02/07/2016 11:47 AM, Andrew F. Davis wrote:
>> After acquiring National Semiconductor, TI appears to have
>> changed the Vendor Model Number for the DP83848C PHYs,
>> add this new ID to supported IDs.
>>
>> Signed-off-by: Andrew F. Davis <afd@ti.com>
>> ---
>> drivers/net/phy/dp83848.c | 9 ++++++---
>> 1 file changed, 6 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/net/phy/dp83848.c b/drivers/net/phy/dp83848.c
>> index 4e78f54..d4686d5f 100644
>> --- a/drivers/net/phy/dp83848.c
>> +++ b/drivers/net/phy/dp83848.c
>> @@ -16,7 +16,8 @@
>> #include <linux/module.h>
>> #include <linux/phy.h>
>>
>> -#define DP83848_PHY_ID 0x20005c90
>> +#define TI_DP83848C_PHY_ID 0x20005ca0
>> +#define NS_DP83848C_PHY_ID 0x20005c90
>>
>> /* Registers */
>> #define DP83848_MICR 0x11
>> @@ -65,7 +66,8 @@ static int dp83848_config_intr(struct phy_device
>> *phydev)
>> }
>>
>> static struct mdio_device_id __maybe_unused dp83848_tbl[] = {
>> - { DP83848_PHY_ID, 0xfffffff0 },
>> + { TI_DP83848C_PHY_ID, 0xfffffff0 },
>> + { NS_DP83848C_PHY_ID, 0xfffffff0 },
>> { }
>> };
>> MODULE_DEVICE_TABLE(mdio, dp83848_tbl);
>> @@ -91,7 +93,8 @@ MODULE_DEVICE_TABLE(mdio, dp83848_tbl);
>> }
>>
>> static struct phy_driver dp83848_driver[] = {
>> - DP83848_PHY_DRIVER(DP83848_PHY_ID, "TI DP83848 10/100 Mbps PHY"),
>> + DP83848_PHY_DRIVER(TI_DP83848C_PHY_ID, "TI DP83848C 10/100 Mbps
>> PHY"),
>> + DP83848_PHY_DRIVER(NS_DP83848C_PHY_ID, "TI DP83848C 10/100 Mbps
>> PHY"),
>
> This seems to be causing a warning about duplicate file names (driver
> name in
> sysfs), so the bottom one can probably s/TI/NS, can this be changed in-tree
> before the merge or should I submit a patch?
Once the patches are merged by David in his tree, you will need to
provide an incremental patch to fix the problem. I had not noticed the
duplicate name either here, but it sounds like you should indeed fix it.
Thanks!
--
Florian
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web