net: phy: support 'active-high' property for PHY LEDs

In addition to 'active-low' and 'inactive-high-impedance' also
support 'active-high' property for PHY LED pin configuration.
As only either 'active-high' or 'active-low' can be set at the
same time, WARN and return an error in case both are set.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Link: https://patch.msgid.link/91598487773d768f254d5faf06cf65b13e972f0e.1728558223.git.daniel@makrotopia.org
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 94da999b6fde3e1729762a6b95b10c9cd51a0ad4..563497a3274c188ea1a19412e0eb8be86da3e9ec 100644 (file)
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -3358,11 +3358,17 @@ static int of_phy_led(struct phy_device *phydev,
        if (index > U8_MAX)
                return -EINVAL;
 
+       if (of_property_read_bool(led, "active-high"))
+               set_bit(PHY_LED_ACTIVE_HIGH, &modes);
        if (of_property_read_bool(led, "active-low"))
                set_bit(PHY_LED_ACTIVE_LOW, &modes);
        if (of_property_read_bool(led, "inactive-high-impedance"))
                set_bit(PHY_LED_INACTIVE_HIGH_IMPEDANCE, &modes);
 
+       if (WARN_ON(modes & BIT(PHY_LED_ACTIVE_LOW) &&
+                   modes & BIT(PHY_LED_ACTIVE_HIGH)))
+               return -EINVAL;
+
        if (modes) {
                /* Return error if asked to set polarity modes but not supported */
                if (!phydev->drv->led_polarity_set)

diff --git a/include/linux/phy.h b/include/linux/phy.h
index ff762a3d8270a569795b0642cb4349b88f87289f..bf0eb4e5d35ca02272501c43163c6d755e743631 100644 (file)
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -877,8 +877,9 @@ struct phy_plca_status {
 
 /* Modes for PHY LED configuration */
 enum phy_led_modes {
-       PHY_LED_ACTIVE_LOW = 0,
-       PHY_LED_INACTIVE_HIGH_IMPEDANCE = 1,
+       PHY_LED_ACTIVE_HIGH = 0,
+       PHY_LED_ACTIVE_LOW = 1,
+       PHY_LED_INACTIVE_HIGH_IMPEDANCE = 2,
 
        /* keep it last */
        __PHY_LED_MODES_NUM,