From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthias Kaehlcke Subject: [PATCH v5 2/4] net: phy: Add support for generic LED configuration through the DT Date: Wed, 7 Aug 2019 10:04:47 -0700 Message-ID: <20190807170449.205378-3-mka@chromium.org> References: <20190807170449.205378-1-mka@chromium.org> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Return-path: In-Reply-To: <20190807170449.205378-1-mka@chromium.org> Sender: linux-kernel-owner@vger.kernel.org To: "David S . Miller" , Rob Herring , Mark Rutland , Andrew Lunn , Florian Fainelli , Heiner Kallweit Cc: netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Douglas Anderson , Matthias Kaehlcke List-Id: devicetree@vger.kernel.org For PHYs with a device tree node look for LED trigger configuration using the generic binding, if it exists try to apply it via the new driver hook .config_led. Signed-off-by: Matthias Kaehlcke --- Changes in v5: - add callback to configure a LED to the PHY driver, instead of having the driver retrieve the DT data - use new trigger names - added support for trigger 'none' - release DT nodes after use - renamed 'PHY_LED_LINK_*' to 'PHY_LED_TRIGGER_LINK_*' - added anonymous struct to struct phy_led_config to track 'activity' in a separate flag. this could be changed to 'flags' if needed/desired. - updated commit message (previous subject was 'net: phy: Add function to retrieve LED configuration from the DT') Changes in v4: - patch added to the series --- drivers/net/phy/phy_device.c | 72 ++++++++++++++++++++++++++++++++++++ include/linux/phy.h | 22 +++++++++++ 2 files changed, 94 insertions(+) diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 6b5cb87f3866..6f85fdf72af0 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -29,6 +29,7 @@ #include #include #include +#include #include MODULE_DESCRIPTION("PHY library"); @@ -1064,6 +1065,75 @@ static int phy_poll_reset(struct phy_device *phydev) return 0; } +static void of_phy_config_leds(struct phy_device *phydev) +{ + struct device_node *np, *child; + struct phy_led_config cfg; + const char *trigger; + int ret; + + if (!IS_ENABLED(CONFIG_OF_MDIO) || !phydev->drv->config_led) + return; + + np = of_find_node_by_name(phydev->mdio.dev.of_node, "leds"); + if (!np) + return; + + for_each_child_of_node(np, child) { + u32 led; + + if (of_property_read_u32(child, "reg", &led)) + goto skip_config; + + ret = of_property_read_string(child, "linux,default-trigger", + &trigger); + if (ret) + trigger = "none"; + + memset(&cfg, 0, sizeof(cfg)); + + if (!strcmp(trigger, "none")) { + cfg.trigger.t = PHY_LED_TRIGGER_NONE; + } else if (!strcmp(trigger, "phy-link")) { + cfg.trigger.t = PHY_LED_TRIGGER_LINK; + } else if (!strcmp(trigger, "phy-link-10m")) { + cfg.trigger.t = PHY_LED_TRIGGER_LINK_10M; + } else if (!strcmp(trigger, "phy-link-100m")) { + cfg.trigger.t = PHY_LED_TRIGGER_LINK_100M; + } else if (!strcmp(trigger, "phy-link-1g")) { + cfg.trigger.t = PHY_LED_TRIGGER_LINK_1G; + } else if (!strcmp(trigger, "phy-link-10g")) { + cfg.trigger.t = PHY_LED_TRIGGER_LINK_10G; + } else if (!strcmp(trigger, "phy-link-activity")) { + cfg.trigger.t = PHY_LED_TRIGGER_LINK; + cfg.trigger.activity = true; + } else if (!strcmp(trigger, "phy-link-10m-activity")) { + cfg.trigger.t = PHY_LED_TRIGGER_LINK_10M; + cfg.trigger.activity = true; + } else if (!strcmp(trigger, "phy-link-100m-activity")) { + cfg.trigger.t = PHY_LED_TRIGGER_LINK_100M; + cfg.trigger.activity = true; + } else if (!strcmp(trigger, "phy-link-1g-activity")) { + cfg.trigger.t = PHY_LED_TRIGGER_LINK_1G; + cfg.trigger.activity = true; + } else if (!strcmp(trigger, "phy-link-10g-activity")) { + cfg.trigger.t = PHY_LED_TRIGGER_LINK_10G; + cfg.trigger.activity = true; + } else { + phydev_warn(phydev, "trigger '%s' for LED%d is invalid\n", + trigger, led); + goto skip_config; + } + + phydev->drv->config_led(phydev, led, &cfg); + + skip_config: + of_node_put(child); + } + + of_node_put(np); +} + int phy_init_hw(struct phy_device *phydev) { int ret = 0; @@ -1087,6 +1157,8 @@ int phy_init_hw(struct phy_device *phydev) if (phydev->drv->config_init) ret = phydev->drv->config_init(phydev); + of_phy_config_leds(phydev); + return ret; } EXPORT_SYMBOL(phy_init_hw); diff --git a/include/linux/phy.h b/include/linux/phy.h index 462b90b73f93..3a07390fc5e9 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -325,6 +325,24 @@ struct phy_c45_device_ids { u32 device_ids[8]; }; +/* Triggers for PHY LEDs */ +enum phy_led_trigger { + PHY_LED_TRIGGER_NONE, + PHY_LED_TRIGGER_LINK, + PHY_LED_TRIGGER_LINK_10M, + PHY_LED_TRIGGER_LINK_100M, + PHY_LED_TRIGGER_LINK_1G, + PHY_LED_TRIGGER_LINK_10G, +}; + +/* Configuration of a single PHY LED */ +struct phy_led_config { + struct { + enum phy_led_trigger t; + bool activity; + } trigger; +}; + /* phy_device: An instance of a PHY * * drv: Pointer to the driver for this PHY instance @@ -626,6 +644,10 @@ struct phy_driver { struct ethtool_tunable *tuna, const void *data); int (*set_loopback)(struct phy_device *dev, bool enable); + + /* Configure a PHY LED */ + int (*config_led)(struct phy_device *dev, int led, + struct phy_led_config *cfg); }; #define to_phy_driver(d) container_of(to_mdio_common_driver(d), \ struct phy_driver, mdiodrv) -- 2.22.0.770.g0f2c4a37fd-goog