net: phy: aquantia: correctly describe LED polarity override

Use newly defined 'active-high' property to set the
VEND1_GLOBAL_LED_DRIVE_VDD bit and let 'active-low' clear that bit. This
reflects the technical reality which was inverted in the previous
description in which the 'active-low' property was used to actually set
the VEND1_GLOBAL_LED_DRIVE_VDD bit, which means that VDD (ie. supply
voltage) of the LED is driven rather than GND.

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

diff --git a/drivers/net/phy/aquantia/aquantia.h b/drivers/net/phy/aquantia/aquantia.h
index 2465345081f8af069febc1f7f3120633303ab86d..0c78bfabace51fea231ac4126e1da7b746e5bb6e 100644 (file)
--- a/drivers/net/phy/aquantia/aquantia.h
+++ b/drivers/net/phy/aquantia/aquantia.h
@@ -177,6 +177,7 @@ static const struct aqr107_hw_stat aqr107_hw_stats[] = {
 struct aqr107_priv {
        u64 sgmii_stats[AQR107_SGMII_STAT_SZ];
        unsigned long leds_active_low;
+       unsigned long leds_active_high;
 };
 
 #if IS_REACHABLE(CONFIG_HWMON)

diff --git a/drivers/net/phy/aquantia/aquantia_leds.c b/drivers/net/phy/aquantia/aquantia_leds.c
index 201c8df93fad9426764764f851f1bd82ebb43f92..00ad2313fed36eed549ffa55eb06e527f7c3de92 100644 (file)
--- a/drivers/net/phy/aquantia/aquantia_leds.c
+++ b/drivers/net/phy/aquantia/aquantia_leds.c
@@ -121,13 +121,13 @@ int aqr_phy_led_active_low_set(struct phy_device *phydev, int index, bool enable
 {
        return phy_modify_mmd(phydev, MDIO_MMD_VEND1, AQR_LED_DRIVE(index),
                              VEND1_GLOBAL_LED_DRIVE_VDD,
-                             enable ? VEND1_GLOBAL_LED_DRIVE_VDD : 0);
+                             enable ? 0 : VEND1_GLOBAL_LED_DRIVE_VDD);
 }
 
 int aqr_phy_led_polarity_set(struct phy_device *phydev, int index, unsigned long modes)
 {
+       bool force_active_low = false, force_active_high = false;
        struct aqr107_priv *priv = phydev->priv;
-       bool active_low = false;
        u32 mode;
 
        if (index >= AQR_MAX_LEDS)
@@ -136,7 +136,10 @@ int aqr_phy_led_polarity_set(struct phy_device *phydev, int index, unsigned long
        for_each_set_bit(mode, &modes, __PHY_LED_MODES_NUM) {
                switch (mode) {
                case PHY_LED_ACTIVE_LOW:
-                       active_low = true;
+                       force_active_low = true;
+                       break;
+               case PHY_LED_ACTIVE_HIGH:
+                       force_active_high = true;
                        break;
                default:
                        return -EINVAL;
@@ -144,8 +147,14 @@ int aqr_phy_led_polarity_set(struct phy_device *phydev, int index, unsigned long
        }
 
        /* Save LED driver vdd state to restore on SW reset */
-       if (active_low)
+       if (force_active_low)
                priv->leds_active_low |= BIT(index);
 
-       return aqr_phy_led_active_low_set(phydev, index, active_low);
+       if (force_active_high)
+               priv->leds_active_high |= BIT(index);
+
+       if (force_active_high || force_active_low)
+               return aqr_phy_led_active_low_set(phydev, index, force_active_low);
+
+       unreachable();
 }

diff --git a/drivers/net/phy/aquantia/aquantia_main.c b/drivers/net/phy/aquantia/aquantia_main.c
index 4fe757cd7dc7ebafa573808537c549fa94eb283f..4feb3b98c9da5a1bc421fe263a9f6f939e9dd82c 100644 (file)
--- a/drivers/net/phy/aquantia/aquantia_main.c
+++ b/drivers/net/phy/aquantia/aquantia_main.c
@@ -530,7 +530,7 @@ static int aqr107_config_mdi(struct phy_device *phydev)
 static int aqr107_config_init(struct phy_device *phydev)
 {
        struct aqr107_priv *priv = phydev->priv;
-       u32 led_active_low;
+       u32 led_idx;
        int ret;
 
        /* Check that the PHY interface type is compatible */
@@ -561,8 +561,14 @@ static int aqr107_config_init(struct phy_device *phydev)
                return ret;
 
        /* Restore LED polarity state after reset */
-       for_each_set_bit(led_active_low, &priv->leds_active_low, AQR_MAX_LEDS) {
-               ret = aqr_phy_led_active_low_set(phydev, led_active_low, true);
+       for_each_set_bit(led_idx, &priv->leds_active_low, AQR_MAX_LEDS) {
+               ret = aqr_phy_led_active_low_set(phydev, led_idx, true);
+               if (ret)
+                       return ret;
+       }
+
+       for_each_set_bit(led_idx, &priv->leds_active_high, AQR_MAX_LEDS) {
+               ret = aqr_phy_led_active_low_set(phydev, led_idx, false);
                if (ret)
                        return ret;
        }