Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'pinctrl-v6.17-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
Pull pin control fixes from Linus Walleij:
"Two small driver fixes for the Airhoa driver:
- Correct a PHY LED mux value so the PHY LED will blink as it should
- Fix the MDIO function bitmasks, working around a HW bug to
force-enable the MDIO pins"
* tag 'pinctrl-v6.17-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
pinctrl: airoha: fix wrong MDIO function bitmaks
pinctrl: airoha: fix wrong PHY LED mux value for LED1 GPIO46
+17
-14
+17
-14
drivers/pinctrl/mediatek/pinctrl-airoha.c
+17
-14
drivers/pinctrl/mediatek/pinctrl-airoha.c
···
108
108
#define JTAG_UDI_EN_MASK BIT(4)
109
109
#define JTAG_DFD_EN_MASK BIT(3)
110
110
111
+
#define REG_FORCE_GPIO_EN 0x0228
112
+
#define FORCE_GPIO_EN(n) BIT(n)
113
+
111
114
/* LED MAP */
112
115
#define REG_LAN_LED0_MAPPING 0x027c
113
116
#define REG_LAN_LED1_MAPPING 0x0280
···
722
719
.name = "mdio",
723
720
.regmap[0] = {
724
721
AIROHA_FUNC_MUX,
725
-
REG_GPIO_PON_MODE,
726
-
GPIO_SGMII_MDIO_MODE_MASK,
727
-
GPIO_SGMII_MDIO_MODE_MASK
728
-
},
729
-
.regmap[1] = {
730
-
AIROHA_FUNC_MUX,
731
722
REG_GPIO_2ND_I2C_MODE,
732
723
GPIO_MDC_IO_MASTER_MODE_MODE,
733
724
GPIO_MDC_IO_MASTER_MODE_MODE
725
+
},
726
+
.regmap[1] = {
727
+
AIROHA_FUNC_MUX,
728
+
REG_FORCE_GPIO_EN,
729
+
FORCE_GPIO_EN(1) | FORCE_GPIO_EN(2),
730
+
FORCE_GPIO_EN(1) | FORCE_GPIO_EN(2)
734
731
},
735
732
.regmap_size = 2,
736
733
},
···
1755
1752
.regmap[0] = {
1756
1753
AIROHA_FUNC_MUX,
1757
1754
REG_GPIO_2ND_I2C_MODE,
1758
-
GPIO_LAN3_LED0_MODE_MASK,
1759
-
GPIO_LAN3_LED0_MODE_MASK
1755
+
GPIO_LAN3_LED1_MODE_MASK,
1756
+
GPIO_LAN3_LED1_MODE_MASK
1760
1757
},
1761
1758
.regmap[1] = {
1762
1759
AIROHA_FUNC_MUX,
···
1819
1816
.regmap[0] = {
1820
1817
AIROHA_FUNC_MUX,
1821
1818
REG_GPIO_2ND_I2C_MODE,
1822
-
GPIO_LAN3_LED0_MODE_MASK,
1823
-
GPIO_LAN3_LED0_MODE_MASK
1819
+
GPIO_LAN3_LED1_MODE_MASK,
1820
+
GPIO_LAN3_LED1_MODE_MASK
1824
1821
},
1825
1822
.regmap[1] = {
1826
1823
AIROHA_FUNC_MUX,
···
1883
1880
.regmap[0] = {
1884
1881
AIROHA_FUNC_MUX,
1885
1882
REG_GPIO_2ND_I2C_MODE,
1886
-
GPIO_LAN3_LED0_MODE_MASK,
1887
-
GPIO_LAN3_LED0_MODE_MASK
1883
+
GPIO_LAN3_LED1_MODE_MASK,
1884
+
GPIO_LAN3_LED1_MODE_MASK
1888
1885
},
1889
1886
.regmap[1] = {
1890
1887
AIROHA_FUNC_MUX,
···
1947
1944
.regmap[0] = {
1948
1945
AIROHA_FUNC_MUX,
1949
1946
REG_GPIO_2ND_I2C_MODE,
1950
-
GPIO_LAN3_LED0_MODE_MASK,
1951
-
GPIO_LAN3_LED0_MODE_MASK
1947
+
GPIO_LAN3_LED1_MODE_MASK,
1948
+
GPIO_LAN3_LED1_MODE_MASK
1952
1949
},
1953
1950
.regmap[1] = {
1954
1951
AIROHA_FUNC_MUX,