Re: [PATCH] pinctrl: airoha: fix wrong PHY LED mapping and PHY2 LED defines

29 Mar 2025

...
The current PHY2 LED define are wrong and actually set BITs outside the
related mask. Fix it and set the correct value. While at it, also use
FIELD_PREP_CONST macro to make it simple to understand what values are
actually applied for the mask.
Also fix wrong PHY LED mapping. The SoC Switch supports up to 4 port but
the register define mapping for 5 PHY port, starting from 0. The mapping
was wrongly defined starting from PHY1. Reorder the function group to
start from PHY0. PHY4 is actually never supported as we don't have a
GPIO pin to assign.
Hi Christian,
This patch is fine, just a nit inline
Regards,
Lorenzo
...
Cc: stable@vger.kernel.org
Fixes: 1c8ace2d0725 ("pinctrl: airoha: Add support for EN7581 SoC")
Signed-off-by: Christian Marangi ansuelsmth@gmail.com

drivers/pinctrl/mediatek/pinctrl-airoha.c | 179 +++++++++++-----------
 1 file changed, 90 insertions(+), 89 deletions(-)

diff --git a/drivers/pinctrl/mediatek/pinctrl-airoha.c b/drivers/pinctrl/mediatek/pinctrl-airoha.c
index 547a798b71c8..9099ad34aa29 100644
--- a/drivers/pinctrl/mediatek/pinctrl-airoha.c
+++ b/drivers/pinctrl/mediatek/pinctrl-airoha.c
@@ -6,6 +6,7 @@
  */
 
 #include <dt-bindings/pinctrl/mt65xx.h>
+#include <linux/bitfield.h>
 #include <linux/bits.h>
 #include <linux/cleanup.h>
 #include <linux/gpio/driver.h>
@@ -112,39 +113,39 @@
 #define REG_LAN_LED1_MAPPING			0x0280
 
 #define LAN4_LED_MAPPING_MASK			GENMASK(18, 16)
-#define LAN4_PHY4_LED_MAP			BIT(18)
-#define LAN4_PHY2_LED_MAP			BIT(17)
-#define LAN4_PHY1_LED_MAP			BIT(16)
-#define LAN4_PHY0_LED_MAP			0
-#define LAN4_PHY3_LED_MAP			GENMASK(17, 16)
+#define LAN4_PHY4_LED_MAP			FIELD_PREP_CONST(LAN4_LED_MAPPING_MASK, 0x4)
+#define LAN4_PHY3_LED_MAP			FIELD_PREP_CONST(LAN4_LED_MAPPING_MASK, 0x3)
+#define LAN4_PHY2_LED_MAP			FIELD_PREP_CONST(LAN4_LED_MAPPING_MASK, 0x2)
+#define LAN4_PHY1_LED_MAP			FIELD_PREP_CONST(LAN4_LED_MAPPING_MASK, 0x1)
+#define LAN4_PHY0_LED_MAP			FIELD_PREP_CONST(LAN4_LED_MAPPING_MASK, 0x0)
What about doing something like:
#define LAN4_PHY_LED_MAP(_n)			FIELD_PREP_CONST(LAN4_LED_MAPPING_MASK, (_n))
...
#define LAN3_LED_MAPPING_MASK			GENMASK(14, 12)
-#define LAN3_PHY4_LED_MAP			BIT(14)
-#define LAN3_PHY2_LED_MAP			BIT(13)
-#define LAN3_PHY1_LED_MAP			BIT(12)
-#define LAN3_PHY0_LED_MAP			0
-#define LAN3_PHY3_LED_MAP			GENMASK(13, 12)
+#define LAN3_PHY4_LED_MAP			FIELD_PREP_CONST(LAN3_LED_MAPPING_MASK, 0x4)
+#define LAN3_PHY3_LED_MAP			FIELD_PREP_CONST(LAN3_LED_MAPPING_MASK, 0x3)
+#define LAN3_PHY2_LED_MAP			FIELD_PREP_CONST(LAN3_LED_MAPPING_MASK, 0x2)
+#define LAN3_PHY1_LED_MAP			FIELD_PREP_CONST(LAN3_LED_MAPPING_MASK, 0x1)
+#define LAN3_PHY0_LED_MAP			FIELD_PREP_CONST(LAN3_LED_MAPPING_MASK, 0x0)
 
 #define LAN2_LED_MAPPING_MASK			GENMASK(10, 8)
-#define LAN2_PHY4_LED_MAP			BIT(12)
-#define LAN2_PHY2_LED_MAP			BIT(11)
-#define LAN2_PHY1_LED_MAP			BIT(10)
-#define LAN2_PHY0_LED_MAP			0
-#define LAN2_PHY3_LED_MAP			GENMASK(11, 10)
+#define LAN2_PHY4_LED_MAP			FIELD_PREP_CONST(LAN2_LED_MAPPING_MASK, 0x4)
+#define LAN2_PHY3_LED_MAP			FIELD_PREP_CONST(LAN2_LED_MAPPING_MASK, 0x3)
+#define LAN2_PHY2_LED_MAP			FIELD_PREP_CONST(LAN2_LED_MAPPING_MASK, 0x2)
+#define LAN2_PHY1_LED_MAP			FIELD_PREP_CONST(LAN2_LED_MAPPING_MASK, 0x1)
+#define LAN2_PHY0_LED_MAP			FIELD_PREP_CONST(LAN2_LED_MAPPING_MASK, 0x0)
 
 #define LAN1_LED_MAPPING_MASK			GENMASK(6, 4)
-#define LAN1_PHY4_LED_MAP			BIT(6)
-#define LAN1_PHY2_LED_MAP			BIT(5)
-#define LAN1_PHY1_LED_MAP			BIT(4)
-#define LAN1_PHY0_LED_MAP			0
-#define LAN1_PHY3_LED_MAP			GENMASK(5, 4)
+#define LAN1_PHY4_LED_MAP			FIELD_PREP_CONST(LAN1_LED_MAPPING_MASK, 0x4)
+#define LAN1_PHY3_LED_MAP			FIELD_PREP_CONST(LAN1_LED_MAPPING_MASK, 0x3)
+#define LAN1_PHY2_LED_MAP			FIELD_PREP_CONST(LAN1_LED_MAPPING_MASK, 0x2)
+#define LAN1_PHY1_LED_MAP			FIELD_PREP_CONST(LAN1_LED_MAPPING_MASK, 0x1)
+#define LAN1_PHY0_LED_MAP			FIELD_PREP_CONST(LAN1_LED_MAPPING_MASK, 0x0)
 
 #define LAN0_LED_MAPPING_MASK			GENMASK(2, 0)
-#define LAN0_PHY4_LED_MAP			BIT(3)
-#define LAN0_PHY2_LED_MAP			BIT(2)
-#define LAN0_PHY1_LED_MAP			BIT(1)
-#define LAN0_PHY0_LED_MAP			0
-#define LAN0_PHY3_LED_MAP			GENMASK(2, 1)
+#define LAN0_PHY4_LED_MAP			FIELD_PREP_CONST(LAN0_LED_MAPPING_MASK, 0x4)
+#define LAN0_PHY3_LED_MAP			FIELD_PREP_CONST(LAN0_LED_MAPPING_MASK, 0x3)
+#define LAN0_PHY2_LED_MAP			FIELD_PREP_CONST(LAN0_LED_MAPPING_MASK, 0x2)
+#define LAN0_PHY1_LED_MAP			FIELD_PREP_CONST(LAN0_LED_MAPPING_MASK, 0x1)
+#define LAN0_PHY0_LED_MAP			FIELD_PREP_CONST(LAN0_LED_MAPPING_MASK, 0x0)
 
 /* CONF */
 #define REG_I2C_SDA_E2				0x001c
@@ -1476,8 +1477,8 @@ static const struct airoha_pinctrl_func_group phy1_led0_func_group[] = {
   	.regmap[1] = {
   		AIROHA_FUNC_MUX,
   		REG_LAN_LED0_MAPPING,

	LAN1_LED_MAPPING_MASK,


	LAN1_PHY1_LED_MAP




	LAN0_LED_MAPPING_MASK,


	LAN0_PHY0_LED_MAP

},
.regmap_size = 2,
}, {

@@ -1491,8 +1492,8 @@ static const struct airoha_pinctrl_func_group phy1_led0_func_group[] = {
   	.regmap[1] = {
   		AIROHA_FUNC_MUX,
   		REG_LAN_LED0_MAPPING,

	LAN2_LED_MAPPING_MASK,


	LAN2_PHY1_LED_MAP




	LAN1_LED_MAPPING_MASK,


	LAN1_PHY0_LED_MAP

},
.regmap_size = 2,
}, {

@@ -1506,8 +1507,8 @@ static const struct airoha_pinctrl_func_group phy1_led0_func_group[] = {
   	.regmap[1] = {
   		AIROHA_FUNC_MUX,
   		REG_LAN_LED0_MAPPING,

	LAN3_LED_MAPPING_MASK,


	LAN3_PHY1_LED_MAP




	LAN2_LED_MAPPING_MASK,


	LAN2_PHY0_LED_MAP

},
.regmap_size = 2,
}, {

@@ -1521,8 +1522,8 @@ static const struct airoha_pinctrl_func_group phy1_led0_func_group[] = {
   	.regmap[1] = {
   		AIROHA_FUNC_MUX,
   		REG_LAN_LED0_MAPPING,

	LAN4_LED_MAPPING_MASK,


	LAN4_PHY1_LED_MAP




	LAN3_LED_MAPPING_MASK,


	LAN3_PHY0_LED_MAP

},
.regmap_size = 2,
},

@@ -1540,8 +1541,8 @@ static const struct airoha_pinctrl_func_group phy2_led0_func_group[] = {
   	.regmap[1] = {
   		AIROHA_FUNC_MUX,
   		REG_LAN_LED0_MAPPING,

	LAN1_LED_MAPPING_MASK,


	LAN1_PHY2_LED_MAP




	LAN0_LED_MAPPING_MASK,


	LAN0_PHY1_LED_MAP

},
.regmap_size = 2,
}, {

@@ -1555,8 +1556,8 @@ static const struct airoha_pinctrl_func_group phy2_led0_func_group[] = {
   	.regmap[1] = {
   		AIROHA_FUNC_MUX,
   		REG_LAN_LED0_MAPPING,

	LAN2_LED_MAPPING_MASK,


	LAN2_PHY2_LED_MAP




	LAN1_LED_MAPPING_MASK,


	LAN1_PHY1_LED_MAP

},
.regmap_size = 2,
}, {

@@ -1570,8 +1571,8 @@ static const struct airoha_pinctrl_func_group phy2_led0_func_group[] = {
   	.regmap[1] = {
   		AIROHA_FUNC_MUX,
   		REG_LAN_LED0_MAPPING,

	LAN3_LED_MAPPING_MASK,


	LAN3_PHY2_LED_MAP




	LAN2_LED_MAPPING_MASK,


	LAN2_PHY1_LED_MAP

},
.regmap_size = 2,
}, {

@@ -1585,8 +1586,8 @@ static const struct airoha_pinctrl_func_group phy2_led0_func_group[] = {
   	.regmap[1] = {
   		AIROHA_FUNC_MUX,
   		REG_LAN_LED0_MAPPING,

	LAN4_LED_MAPPING_MASK,


	LAN4_PHY2_LED_MAP




	LAN3_LED_MAPPING_MASK,


	LAN3_PHY1_LED_MAP

},
.regmap_size = 2,
},

@@ -1604,8 +1605,8 @@ static const struct airoha_pinctrl_func_group phy3_led0_func_group[] = {
   	.regmap[1] = {
   		AIROHA_FUNC_MUX,
   		REG_LAN_LED0_MAPPING,

	LAN1_LED_MAPPING_MASK,


	LAN1_PHY3_LED_MAP




	LAN0_LED_MAPPING_MASK,


	LAN0_PHY2_LED_MAP

},
.regmap_size = 2,
}, {

@@ -1619,8 +1620,8 @@ static const struct airoha_pinctrl_func_group phy3_led0_func_group[] = {
   	.regmap[1] = {
   		AIROHA_FUNC_MUX,
   		REG_LAN_LED0_MAPPING,

	LAN2_LED_MAPPING_MASK,


	LAN2_PHY3_LED_MAP




	LAN1_LED_MAPPING_MASK,


	LAN1_PHY2_LED_MAP

},
.regmap_size = 2,
}, {

@@ -1634,8 +1635,8 @@ static const struct airoha_pinctrl_func_group phy3_led0_func_group[] = {
   	.regmap[1] = {
   		AIROHA_FUNC_MUX,
   		REG_LAN_LED0_MAPPING,

	LAN3_LED_MAPPING_MASK,


	LAN3_PHY3_LED_MAP




	LAN2_LED_MAPPING_MASK,


	LAN2_PHY2_LED_MAP

},
.regmap_size = 2,
}, {

@@ -1649,8 +1650,8 @@ static const struct airoha_pinctrl_func_group phy3_led0_func_group[] = {
   	.regmap[1] = {
   		AIROHA_FUNC_MUX,
   		REG_LAN_LED0_MAPPING,

	LAN4_LED_MAPPING_MASK,


	LAN4_PHY3_LED_MAP




	LAN3_LED_MAPPING_MASK,


	LAN3_PHY2_LED_MAP

},
.regmap_size = 2,
},

@@ -1668,8 +1669,8 @@ static const struct airoha_pinctrl_func_group phy4_led0_func_group[] = {
   	.regmap[1] = {
   		AIROHA_FUNC_MUX,
   		REG_LAN_LED0_MAPPING,

	LAN1_LED_MAPPING_MASK,


	LAN1_PHY4_LED_MAP




	LAN0_LED_MAPPING_MASK,


	LAN0_PHY3_LED_MAP

},
.regmap_size = 2,
}, {

@@ -1683,8 +1684,8 @@ static const struct airoha_pinctrl_func_group phy4_led0_func_group[] = {
   	.regmap[1] = {
   		AIROHA_FUNC_MUX,
   		REG_LAN_LED0_MAPPING,

	LAN2_LED_MAPPING_MASK,


	LAN2_PHY4_LED_MAP




	LAN1_LED_MAPPING_MASK,


	LAN1_PHY3_LED_MAP

},
.regmap_size = 2,
}, {

@@ -1698,8 +1699,8 @@ static const struct airoha_pinctrl_func_group phy4_led0_func_group[] = {
   	.regmap[1] = {
   		AIROHA_FUNC_MUX,
   		REG_LAN_LED0_MAPPING,

	LAN3_LED_MAPPING_MASK,


	LAN3_PHY4_LED_MAP




	LAN2_LED_MAPPING_MASK,


	LAN2_PHY3_LED_MAP

},
.regmap_size = 2,
}, {

@@ -1713,8 +1714,8 @@ static const struct airoha_pinctrl_func_group phy4_led0_func_group[] = {
   	.regmap[1] = {
   		AIROHA_FUNC_MUX,
   		REG_LAN_LED0_MAPPING,

	LAN4_LED_MAPPING_MASK,


	LAN4_PHY4_LED_MAP




	LAN3_LED_MAPPING_MASK,


	LAN3_PHY3_LED_MAP

},
.regmap_size = 2,
},

@@ -1732,8 +1733,8 @@ static const struct airoha_pinctrl_func_group phy1_led1_func_group[] = {
   	.regmap[1] = {
   		AIROHA_FUNC_MUX,
   		REG_LAN_LED1_MAPPING,

	LAN1_LED_MAPPING_MASK,


	LAN1_PHY1_LED_MAP




	LAN0_LED_MAPPING_MASK,


	LAN0_PHY0_LED_MAP

},
.regmap_size = 2,
}, {

@@ -1747,8 +1748,8 @@ static const struct airoha_pinctrl_func_group phy1_led1_func_group[] = {
   	.regmap[1] = {
   		AIROHA_FUNC_MUX,
   		REG_LAN_LED1_MAPPING,

	LAN2_LED_MAPPING_MASK,


	LAN2_PHY1_LED_MAP




	LAN1_LED_MAPPING_MASK,


	LAN1_PHY0_LED_MAP

},
.regmap_size = 2,
}, {

@@ -1762,8 +1763,8 @@ static const struct airoha_pinctrl_func_group phy1_led1_func_group[] = {
   	.regmap[1] = {
   		AIROHA_FUNC_MUX,
   		REG_LAN_LED1_MAPPING,

	LAN3_LED_MAPPING_MASK,


	LAN3_PHY1_LED_MAP




	LAN2_LED_MAPPING_MASK,


	LAN2_PHY0_LED_MAP

},
.regmap_size = 2,
}, {

@@ -1777,8 +1778,8 @@ static const struct airoha_pinctrl_func_group phy1_led1_func_group[] = {
   	.regmap[1] = {
   		AIROHA_FUNC_MUX,
   		REG_LAN_LED1_MAPPING,

	LAN4_LED_MAPPING_MASK,


	LAN4_PHY1_LED_MAP




	LAN3_LED_MAPPING_MASK,


	LAN3_PHY0_LED_MAP

},
.regmap_size = 2,
},

@@ -1796,8 +1797,8 @@ static const struct airoha_pinctrl_func_group phy2_led1_func_group[] = {
   	.regmap[1] = {
   		AIROHA_FUNC_MUX,
   		REG_LAN_LED1_MAPPING,

	LAN1_LED_MAPPING_MASK,


	LAN1_PHY2_LED_MAP




	LAN0_LED_MAPPING_MASK,


	LAN0_PHY1_LED_MAP

},
.regmap_size = 2,
}, {

@@ -1811,8 +1812,8 @@ static const struct airoha_pinctrl_func_group phy2_led1_func_group[] = {
   	.regmap[1] = {
   		AIROHA_FUNC_MUX,
   		REG_LAN_LED1_MAPPING,

	LAN2_LED_MAPPING_MASK,


	LAN2_PHY2_LED_MAP




	LAN1_LED_MAPPING_MASK,


	LAN1_PHY1_LED_MAP

},
.regmap_size = 2,
}, {

@@ -1826,8 +1827,8 @@ static const struct airoha_pinctrl_func_group phy2_led1_func_group[] = {
   	.regmap[1] = {
   		AIROHA_FUNC_MUX,
   		REG_LAN_LED1_MAPPING,

	LAN3_LED_MAPPING_MASK,


	LAN3_PHY2_LED_MAP




	LAN2_LED_MAPPING_MASK,


	LAN2_PHY1_LED_MAP

},
.regmap_size = 2,
}, {

@@ -1841,8 +1842,8 @@ static const struct airoha_pinctrl_func_group phy2_led1_func_group[] = {
   	.regmap[1] = {
   		AIROHA_FUNC_MUX,
   		REG_LAN_LED1_MAPPING,

	LAN4_LED_MAPPING_MASK,


	LAN4_PHY2_LED_MAP




	LAN3_LED_MAPPING_MASK,


	LAN3_PHY1_LED_MAP

},
.regmap_size = 2,
},

@@ -1860,8 +1861,8 @@ static const struct airoha_pinctrl_func_group phy3_led1_func_group[] = {
   	.regmap[1] = {
   		AIROHA_FUNC_MUX,
   		REG_LAN_LED1_MAPPING,

	LAN1_LED_MAPPING_MASK,


	LAN1_PHY3_LED_MAP




	LAN0_LED_MAPPING_MASK,


	LAN0_PHY2_LED_MAP

},
.regmap_size = 2,
}, {

@@ -1875,8 +1876,8 @@ static const struct airoha_pinctrl_func_group phy3_led1_func_group[] = {
   	.regmap[1] = {
   		AIROHA_FUNC_MUX,
   		REG_LAN_LED1_MAPPING,

	LAN2_LED_MAPPING_MASK,


	LAN2_PHY3_LED_MAP




	LAN1_LED_MAPPING_MASK,


	LAN1_PHY2_LED_MAP

},
.regmap_size = 2,
}, {

@@ -1890,8 +1891,8 @@ static const struct airoha_pinctrl_func_group phy3_led1_func_group[] = {
   	.regmap[1] = {
   		AIROHA_FUNC_MUX,
   		REG_LAN_LED1_MAPPING,

	LAN3_LED_MAPPING_MASK,


	LAN3_PHY3_LED_MAP




	LAN2_LED_MAPPING_MASK,


	LAN2_PHY2_LED_MAP

},
.regmap_size = 2,
}, {

@@ -1905,8 +1906,8 @@ static const struct airoha_pinctrl_func_group phy3_led1_func_group[] = {
   	.regmap[1] = {
   		AIROHA_FUNC_MUX,
   		REG_LAN_LED1_MAPPING,

	LAN4_LED_MAPPING_MASK,


	LAN4_PHY3_LED_MAP




	LAN3_LED_MAPPING_MASK,


	LAN3_PHY2_LED_MAP

},
.regmap_size = 2,
},

@@ -1924,8 +1925,8 @@ static const struct airoha_pinctrl_func_group phy4_led1_func_group[] = {
   	.regmap[1] = {
   		AIROHA_FUNC_MUX,
   		REG_LAN_LED1_MAPPING,

	LAN1_LED_MAPPING_MASK,


	LAN1_PHY4_LED_MAP




	LAN0_LED_MAPPING_MASK,


	LAN0_PHY3_LED_MAP

},
.regmap_size = 2,
}, {

@@ -1939,8 +1940,8 @@ static const struct airoha_pinctrl_func_group phy4_led1_func_group[] = {
   	.regmap[1] = {
   		AIROHA_FUNC_MUX,
   		REG_LAN_LED1_MAPPING,

	LAN2_LED_MAPPING_MASK,


	LAN2_PHY4_LED_MAP




	LAN1_LED_MAPPING_MASK,


	LAN1_PHY3_LED_MAP

},
.regmap_size = 2,
}, {

@@ -1954,8 +1955,8 @@ static const struct airoha_pinctrl_func_group phy4_led1_func_group[] = {
   	.regmap[1] = {
   		AIROHA_FUNC_MUX,
   		REG_LAN_LED1_MAPPING,

	LAN3_LED_MAPPING_MASK,


	LAN3_PHY4_LED_MAP




	LAN2_LED_MAPPING_MASK,


	LAN2_PHY3_LED_MAP

},
.regmap_size = 2,
}, {

@@ -1969,8 +1970,8 @@ static const struct airoha_pinctrl_func_group phy4_led1_func_group[] = {
   	.regmap[1] = {
   		AIROHA_FUNC_MUX,
   		REG_LAN_LED1_MAPPING,

	LAN4_LED_MAPPING_MASK,


	LAN4_PHY4_LED_MAP




	LAN3_LED_MAPPING_MASK,


	LAN3_PHY3_LED_MAP

},
.regmap_size = 2,
},

-- 
2.48.1

    

2025

2024

2023

2022

2021

2020

2019

2018

2017

Re: [PATCH] pinctrl: airoha: fix wrong PHY LED mapping and PHY2 LED defines