net: fixed-phy: Add fixed_phy_register_with_gpiod() API
Subsystems (3)
PATCH v2 1/1 net: fixed-phy: Add fixed_phy_register_with_gpiod() API
Add fixed_phy_register_with_gpiod() API. It lets users create a fixed_phy instance that uses a GPIO descriptor which was obtained externally e.g. through platform data.
This enables platform devices (non-DT based) to use GPIOs for link status.
---
Changes from v1:
- Added Florian's Reviewed-by: tag
Changes from RFC:
- Implemented Andrew's/Florians suggestion to add new API instead of changing old API
--- drivers/net/phy/fixed_phy.c | 32 +++++++++++++++++++++++++------- include/linux/phy_fixed.h | 15 +++++++++++++++ 2 files changed, 40 insertions(+), 7 deletions(-)
drivers/net/phy/fixed_phy.c +25 -7
@@ -229,12 +229,12 @@ static struct gpio_desc *fixed_phy_get_gpiod(struct device_node *np) }#endif -struct phy_device *fixed_phy_register (unsigned int irq, -struct fixed_phy_status *status, -struct device_node *np) +static struct phy_device *__fixed_phy_register (unsigned int irq, +struct fixed_phy_status *status, +struct device_node *np, +struct gpio_desc *gpiod) {struct fixed_mdio_bus *fmb = &platform_fmb; -struct gpio_desc *gpiod =NULL ;struct phy_device *phy;int phy_addr;int ret;
@@ -243,9 +243,11 @@ struct phy_device *fixed_phy_register(unsigned int irq,return ERR_PTR (-EPROBE_DEFER );/* Check if we have a GPIO associated with this fixed phy */ - gpiod =fixed_phy_get_gpiod (np); -if (IS_ERR (gpiod)) -return ERR_CAST (gpiod); +if (!gpiod) { + gpiod =fixed_phy_get_gpiod (np); +if (IS_ERR (gpiod)) +return ERR_CAST (gpiod); + }/* Get the next available PHY address, up to PHY_MAX_ADDR */ phy_addr =ida_simple_get (&phy_fixed_ida,0 ,PHY_MAX_ADDR ,GFP_KERNEL );
@@ -308,8 +310,24 @@ struct phy_device *fixed_phy_register(unsigned int irq,return phy; } + +struct phy_device *fixed_phy_register (unsigned int irq, +struct fixed_phy_status *status, +struct device_node *np) +{ +return __fixed_phy_register (irq, status, np,NULL ); +}EXPORT_SYMBOL_GPL (fixed_phy_register); +struct phy_device * +fixed_phy_register_with_gpiod (unsigned int irq, +struct fixed_phy_status *status, +struct gpio_desc *gpiod) +{ +return __fixed_phy_register (irq, status,NULL , gpiod); +} +EXPORT_SYMBOL_GPL (fixed_phy_register_with_gpiod); +void fixed_phy_unregister (struct phy_device *phy) {phy_device_remove (phy);
include/linux/phy_fixed.h +15 -0
@@ -19,6 +19,12 @@ extern int fixed_phy_add(unsigned int irq, int phy_id,extern struct phy_device *fixed_phy_register (unsigned int irq,struct fixed_phy_status *status,struct device_node *np); + +extern struct phy_device * +fixed_phy_register_with_gpiod (unsigned int irq, +struct fixed_phy_status *status, +struct gpio_desc *gpiod); +extern void fixed_phy_unregister (struct phy_device *phydev); extern int fixed_phy_set_link_update(struct phy_device *phydev, int (*link_update)(struct net_device *,
@@ -35,6 +41,15 @@ static inline struct phy_device *fixed_phy_register(unsigned int irq, {return ERR_PTR (-ENODEV ); } + +static inline struct phy_device * +fixed_phy_register_with_gpiod (unsigned int irq, +struct fixed_phy_status *status, +struct gpio_desc *gpiod) +{ +return ERR_PTR (-ENODEV ); +} +static inline void fixed_phy_unregister (struct phy_device *phydev) { }
Signature · 1 line
2.20.1
David Miller
maintainerFrom: Moritz Fischer <[email protected]>
Date: Thu, 7 Feb 2019 12:14:55 -0800
Quoted 8 lines
Add
fixed_phy_register_with_gpiod()API. It lets users create afixed_phyinstance that uses a GPIO descriptor which was obtained externally e.g. through platform data.
This enables platform devices (non-DT based) to use GPIOs for link status.Reviewed-by Florian Fainelli <[email protected]>Signed-off-by Moritz Fischer <[email protected]>
This doesn't apply cleanly to net-next, please respin.
Hi David,
Quoted 10 lines · David Miller
From: Moritz Fischer <[email protected]>
Date: Thu, 7 Feb 2019 12:14:55 -0800Quoted 6 lines
Add
fixed_phy_register_with_gpiod()API. It lets users create afixed_phyinstance that uses a GPIO descriptor which was obtained externally e.g. through platform data.
This enables platform devices (non-DT based) to use GPIOs for link status.
Quoted 4 lines
Quoted 2 lines
Reviewed-by Florian Fainelli <[email protected]>Signed-off-by Moritz Fischer <[email protected]>This doesn't apply cleanly to net-next, please respin.
I think 5468e82f7034f ("net: phy: fixed-phy: Drop GPIO from fixed_phy_add()") might've been
missing when you tried. I just tried with net-next and next, and it applied fine.
It also seems to be in net next as 71bd106d25676 ("net: fixed-phy: Add fixed_phy_register_with_gpiod() API"),
do you still want me to resend?
Sorry for the confusion,
Moritz