@@ -1246,6 +1246,13 @@ int phy_init_hw(struct phy_device *phydev)
if (ret < 0)
return ret;
+ if (phydev->drv->phy_package_config_init_once &&
+ phy_package_init_once(phydev)) {
+ ret = phydev->drv->phy_package_config_init_once(phydev);
+ if (ret < 0)
+ return ret;
+ }
+
if (phydev->drv->config_init) {
ret = phydev->drv->config_init(phydev);
if (ret < 0)
@@ -3370,6 +3377,13 @@ static int phy_probe(struct device *dev)
/* Deassert the reset signal */
phy_device_reset(phydev, 0);
+ if (phydev->drv->phy_package_probe_once &&
+ phy_package_probe_once(phydev)) {
+ err = phydev->drv->phy_package_probe_once(phydev);
+ if (err)
+ goto out;
+ }
+
if (phydev->drv->probe) {
err = phydev->drv->probe(phydev);
if (err)
@@ -923,12 +923,33 @@ struct phy_driver {
*/
int (*soft_reset)(struct phy_device *phydev);
+ /**
+ * @phy_package_config_init_once: Driver specific PHY package
+ * config init call
+ * @def: PHY device to use to probe PHY package
+ *
+ * Called to initialize the PHY package, including after
+ * a reset.
+ * Called BEFORE PHY config_init.
+ */
+ int (*phy_package_config_init_once)(struct phy_device *dev);
+
/**
* @config_init: Called to initialize the PHY,
* including after a reset
*/
int (*config_init)(struct phy_device *phydev);
+ /**
+ * @phy_package_probe_once: Driver specific PHY package probe
+ * @def: PHY device to use to probe PHY package
+ *
+ * Called during discovery once per PHY package. Used to set
+ * up device-specific PHY package structures, if any.
+ * Called BEFORE PHY probe.
+ */
+ int (*phy_package_probe_once)(struct phy_device *dev);
+
/**
* @probe: Called during discovery. Used to set
* up device-specific structures, if any
Add PHY driver specific function to probe and configure PHY package. These function are run only once before the PHY probe and config_init. They are used in conjunction with DT PHY package define for basic PHY package implementation to setup and probe PHY package with simple functions directly defined in the PHY driver struct. Signed-off-by: Christian Marangi <ansuelsmth@gmail.com> --- drivers/net/phy/phy_device.c | 14 ++++++++++++++ include/linux/phy.h | 21 +++++++++++++++++++++ 2 files changed, 35 insertions(+)