]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
net: phy: mxl-gpy: correctly describe LED polarity
authorDaniel Golle <daniel@makrotopia.org>
Thu, 10 Oct 2024 12:55:17 +0000 (13:55 +0100)
committerPaolo Abeni <pabeni@redhat.com>
Tue, 15 Oct 2024 09:24:21 +0000 (11:24 +0200)
According the datasheet covering the LED (0x1b) register:
0B Active High LEDx pin driven high when activated
1B Active Low LEDx pin driven low when activated

Make use of the now available 'active-high' property and correctly
reflect the polarity setting which was previously inverted.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Link: https://patch.msgid.link/180ccafa837f09908b852a8a874a3808c5ecd2d0.1728558223.git.daniel@makrotopia.org
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
drivers/net/phy/mxl-gpy.c

index bc4abb957e1577c13f7f7aa7d3af835e8ad60736..db3c1f72b40734d7189feb0c3d93ef28f7974d12 100644 (file)
@@ -989,7 +989,7 @@ static int gpy_led_hw_control_set(struct phy_device *phydev, u8 index,
 static int gpy_led_polarity_set(struct phy_device *phydev, int index,
                                unsigned long modes)
 {
-       bool active_low = false;
+       bool force_active_low = false, force_active_high = false;
        u32 mode;
 
        if (index >= GPY_MAX_LEDS)
@@ -998,15 +998,23 @@ static int gpy_led_polarity_set(struct phy_device *phydev, int index,
        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;
                }
        }
 
-       return phy_modify(phydev, PHY_LED, PHY_LED_POLARITY(index),
-                         active_low ? 0 : PHY_LED_POLARITY(index));
+       if (force_active_low)
+               return phy_set_bits(phydev, PHY_LED, PHY_LED_POLARITY(index));
+
+       if (force_active_high)
+               return phy_clear_bits(phydev, PHY_LED, PHY_LED_POLARITY(index));
+
+       unreachable();
 }
 
 static struct phy_driver gpy_drivers[] = {