diff options
| author | Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> | 2017-12-04 07:35:05 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-12-05 12:51:19 -0500 |
| commit | bafbdd527d569c8200521f2f7579f65a044271be (patch) | |
| tree | 51db9962c079c2ca76a5e9f6d3cb2dc222999c37 /include/linux | |
| parent | 62b32379fd124fea521484ba7e220d8a449f0b59 (diff) | |
phylib: Add device reset GPIO support
The PHY devices sometimes do have their reset signal (maybe even power
supply?) tied to some GPIO and sometimes it also does happen that a boot
loader does not leave it deasserted. So far this issue has been attacked
from (as I believe) a wrong angle: by teaching the MAC driver to manipulate
the GPIO in question; that solution, when applied to the device trees, led
to adding the PHY reset GPIO properties to the MAC device node, with one
exception: Cadence MACB driver which could handle the "reset-gpios" prop
in a PHY device subnode. I believe that the correct approach is to teach
the 'phylib' to get the MDIO device reset GPIO from the device tree node
corresponding to this device -- which this patch is doing...
Note that I had to modify the AT803x PHY driver as it would stop working
otherwise -- it made use of the reset GPIO for its own purposes...
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Acked-by: Rob Herring <robh@kernel.org>
[geert: Propagate actual errors from fwnode_get_named_gpiod()]
[geert: Avoid destroying initial setup]
[geert: Consolidate GPIO descriptor acquiring code]
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Tested-by: Richard Leitner <richard.leitner@skidata.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mdio.h | 3 | ||||
| -rw-r--r-- | include/linux/phy.h | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/mdio.h b/include/linux/mdio.h index ca08ab16ecdc..92d4e55ffe67 100644 --- a/include/linux/mdio.h +++ b/include/linux/mdio.h | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include <uapi/linux/mdio.h> | 12 | #include <uapi/linux/mdio.h> |
| 13 | #include <linux/mod_devicetable.h> | 13 | #include <linux/mod_devicetable.h> |
| 14 | 14 | ||
| 15 | struct gpio_desc; | ||
| 15 | struct mii_bus; | 16 | struct mii_bus; |
| 16 | 17 | ||
| 17 | /* Multiple levels of nesting are possible. However typically this is | 18 | /* Multiple levels of nesting are possible. However typically this is |
| @@ -39,6 +40,7 @@ struct mdio_device { | |||
| 39 | /* Bus address of the MDIO device (0-31) */ | 40 | /* Bus address of the MDIO device (0-31) */ |
| 40 | int addr; | 41 | int addr; |
| 41 | int flags; | 42 | int flags; |
| 43 | struct gpio_desc *reset; | ||
| 42 | }; | 44 | }; |
| 43 | #define to_mdio_device(d) container_of(d, struct mdio_device, dev) | 45 | #define to_mdio_device(d) container_of(d, struct mdio_device, dev) |
| 44 | 46 | ||
| @@ -71,6 +73,7 @@ void mdio_device_free(struct mdio_device *mdiodev); | |||
| 71 | struct mdio_device *mdio_device_create(struct mii_bus *bus, int addr); | 73 | struct mdio_device *mdio_device_create(struct mii_bus *bus, int addr); |
| 72 | int mdio_device_register(struct mdio_device *mdiodev); | 74 | int mdio_device_register(struct mdio_device *mdiodev); |
| 73 | void mdio_device_remove(struct mdio_device *mdiodev); | 75 | void mdio_device_remove(struct mdio_device *mdiodev); |
| 76 | void mdio_device_reset(struct mdio_device *mdiodev, int value); | ||
| 74 | int mdio_driver_register(struct mdio_driver *drv); | 77 | int mdio_driver_register(struct mdio_driver *drv); |
| 75 | void mdio_driver_unregister(struct mdio_driver *drv); | 78 | void mdio_driver_unregister(struct mdio_driver *drv); |
| 76 | int mdio_device_bus_match(struct device *dev, struct device_driver *drv); | 79 | int mdio_device_bus_match(struct device *dev, struct device_driver *drv); |
diff --git a/include/linux/phy.h b/include/linux/phy.h index 7570cb838410..d3037e2ffbc4 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h | |||
| @@ -854,6 +854,11 @@ int phy_aneg_done(struct phy_device *phydev); | |||
| 854 | int phy_stop_interrupts(struct phy_device *phydev); | 854 | int phy_stop_interrupts(struct phy_device *phydev); |
| 855 | int phy_restart_aneg(struct phy_device *phydev); | 855 | int phy_restart_aneg(struct phy_device *phydev); |
| 856 | 856 | ||
| 857 | static inline void phy_device_reset(struct phy_device *phydev, int value) | ||
| 858 | { | ||
| 859 | mdio_device_reset(&phydev->mdio, value); | ||
| 860 | } | ||
| 861 | |||
| 857 | #define phydev_err(_phydev, format, args...) \ | 862 | #define phydev_err(_phydev, format, args...) \ |
| 858 | dev_err(&_phydev->mdio.dev, format, ##args) | 863 | dev_err(&_phydev->mdio.dev, format, ##args) |
| 859 | 864 | ||
