Skip to content

Commit 55a2034

Browse files
dangowrtfrank-w
authored andcommitted
pinctrl: mt7988: add additional PWM pingroups
to be merged with "pinctrl: mediatek: add MT7988 pinctrl driver"
1 parent 6837c39 commit 55a2034

File tree

1 file changed

+33
-1
lines changed

1 file changed

+33
-1
lines changed

drivers/pinctrl/mediatek/pinctrl-mt7988.c

+33-1
Original file line numberDiff line numberDiff line change
@@ -776,21 +776,39 @@ static int mt7988_pwm1_funcs[] = { 1 };
776776
static int mt7988_pwm2_pins[] = { 80 };
777777
static int mt7988_pwm2_funcs[] = { 2 };
778778

779+
static int mt7988_pwm2_0_pins[] = { 58 };
780+
static int mt7988_pwm2_0_funcs[] = { 5 };
781+
779782
static int mt7988_pwm3_pins[] = { 81 };
780783
static int mt7988_pwm3_funcs[] = { 2 };
781784

785+
static int mt7988_pwm3_0_pins[] = { 59 };
786+
static int mt7988_pwm3_0_funcs[] = { 5 };
787+
782788
static int mt7988_pwm4_pins[] = { 82 };
783789
static int mt7988_pwm4_funcs[] = { 2 };
784790

791+
static int mt7988_pwm4_0_pins[] = { 60 };
792+
static int mt7988_pwm4_0_funcs[] = { 5 };
793+
785794
static int mt7988_pwm5_pins[] = { 83 };
786795
static int mt7988_pwm5_funcs[] = { 2 };
787796

797+
static int mt7988_pwm5_0_pins[] = { 61 };
798+
static int mt7988_pwm5_0_funcs[] = { 5 };
799+
788800
static int mt7988_pwm6_pins[] = { 69 };
789801
static int mt7988_pwm6_funcs[] = { 3 };
790802

803+
static int mt7988_pwm6_0_pins[] = { 62 };
804+
static int mt7988_pwm6_0_funcs[] = { 5 };
805+
791806
static int mt7988_pwm7_pins[] = { 70 };
792807
static int mt7988_pwm7_funcs[] = { 3 };
793808

809+
static int mt7988_pwm7_0_pins[] = { 4 };
810+
static int mt7988_pwm7_0_funcs[] = { 3 };
811+
794812
/* dfd */
795813
static int mt7988_dfd_pins[] = { 0, 1, 2, 3, 4 };
796814
static int mt7988_dfd_funcs[] = { 4, 4, 4, 4, 4 };
@@ -1113,6 +1131,8 @@ static const struct group_desc mt7988_groups[] = {
11131131
PINCTRL_PIN_GROUP("xfi_phy_pll_i2c0", mt7988_xfi_phy_pll_i2c0),
11141132
/* @GPIO(3,4): xfi_phy_pll_i2c1 */
11151133
PINCTRL_PIN_GROUP("xfi_phy_pll_i2c1", mt7988_xfi_phy_pll_i2c1),
1134+
/* @GPIO(4): pwm7 */
1135+
PINCTRL_PIN_GROUP("pwm7_0", mt7988_pwm7_0),
11161136
/* @GPIO(5,6) i2c0_0 */
11171137
PINCTRL_PIN_GROUP("i2c0_0", mt7988_i2c0_0),
11181138
/* @GPIO(5,6) i2c1_sfp */
@@ -1243,6 +1263,14 @@ static const struct group_desc mt7988_groups[] = {
12431263
PINCTRL_PIN_GROUP("wo2_jtag", mt7988_wo2_jtag),
12441264
/* @GPIO(57) pwm0 */
12451265
PINCTRL_PIN_GROUP("pwm0", mt7988_pwm0),
1266+
/* @GPIO(58) pwm2_0 */
1267+
PINCTRL_PIN_GROUP("pwm2_0", mt7988_pwm2_0),
1268+
/* @GPIO(59) pwm3_0 */
1269+
PINCTRL_PIN_GROUP("pwm3_0", mt7988_pwm3_0),
1270+
/* @GPIO(60) pwm4_0 */
1271+
PINCTRL_PIN_GROUP("pwm4_0", mt7988_pwm4_0),
1272+
/* @GPIO(61) pwm5_0 */
1273+
PINCTRL_PIN_GROUP("pwm5_0", mt7988_pwm5_0),
12461274
/* @GPIO(58,59,60,61,62) jtag */
12471275
PINCTRL_PIN_GROUP("jtag", mt7988_jtag),
12481276
/* @GPIO(58,59,60,61,62) tops_jtag0_1 */
@@ -1256,6 +1284,8 @@ static const struct group_desc mt7988_groups[] = {
12561284
PINCTRL_PIN_GROUP("gbe1_led1", mt7988_gbe1_led1),
12571285
PINCTRL_PIN_GROUP("gbe2_led1", mt7988_gbe2_led1),
12581286
PINCTRL_PIN_GROUP("gbe3_led1", mt7988_gbe3_led1),
1287+
/* @GPIO(62) pwm6_0 */
1288+
PINCTRL_PIN_GROUP("pwm6_0", mt7988_pwm6_0),
12591289
/* @GPIO(62) 2p5gbe_led1 */
12601290
PINCTRL_PIN_GROUP("2p5gbe_led1", mt7988_2p5gbe_led1),
12611291
/* @GPIO(64,65,66,67) gbe_led0 */
@@ -1336,7 +1366,9 @@ static const char * const mt7988_int_usxgmii_groups[] = {
13361366
"int_usxgmii",
13371367
};
13381368
static const char * const mt7988_pwm_groups[] = {
1339-
"pwm0", "pwm1", "pwm2", "pwm3", "pwm4", "pwm5", "pwm6", "pwm7"
1369+
"pwm0", "pwm1", "pwm2", "pwm2_0", "pwm3", "pwm3_0", "pwm4", "pwm4_0",
1370+
"pwm5", "pwm5_0", "pwm6", "pwm6_0", "pwm7", "pwm7_0",
1371+
13401372
};
13411373
static const char * const mt7988_dfd_groups[] = {
13421374
"dfd",

0 commit comments

Comments
 (0)