Skip to content

Commit 503a02b

Browse files
committed
pinctrl: merrifield: Update pin names in accordance with official list
Some of the pin names were provided officially to the customers in different spelling. We update pin names in accordance with the official list. Signed-off-by: Andy Shevchenko <[email protected]>
1 parent 156abe2 commit 503a02b

File tree

1 file changed

+23
-23
lines changed

1 file changed

+23
-23
lines changed

drivers/pinctrl/intel/pinctrl-merrifield.c

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ static const struct pinctrl_pin_desc mrfld_pins[] = {
135135
PINCTRL_PIN(43, "GP83_SD_D3"),
136136
PINCTRL_PIN(44, "GP84_SD_LS_CLK_FB"),
137137
PINCTRL_PIN(45, "GP85_SD_LS_CMD_DIR"),
138-
PINCTRL_PIN(46, "GP86_SD_LVL_D_DIR"),
138+
PINCTRL_PIN(46, "GP86_SD_LS_D_DIR"),
139139
PINCTRL_PIN(47, "GP88_SD_LS_SEL"),
140140
PINCTRL_PIN(48, "GP87_SD_PD"),
141141
PINCTRL_PIN(49, "GP89_SD_WP"),
@@ -171,28 +171,28 @@ static const struct pinctrl_pin_desc mrfld_pins[] = {
171171
PINCTRL_PIN(77, "GP42_I2S_2_RXD"),
172172
PINCTRL_PIN(78, "GP43_I2S_2_TXD"),
173173
/* Family 6: GP SSP (22 pins) */
174-
PINCTRL_PIN(79, "GP120_SPI_3_CLK"),
175-
PINCTRL_PIN(80, "GP121_SPI_3_SS"),
176-
PINCTRL_PIN(81, "GP122_SPI_3_RXD"),
177-
PINCTRL_PIN(82, "GP123_SPI_3_TXD"),
178-
PINCTRL_PIN(83, "GP102_SPI_4_CLK"),
179-
PINCTRL_PIN(84, "GP103_SPI_4_SS_0"),
180-
PINCTRL_PIN(85, "GP104_SPI_4_SS_1"),
181-
PINCTRL_PIN(86, "GP105_SPI_4_SS_2"),
182-
PINCTRL_PIN(87, "GP106_SPI_4_SS_3"),
183-
PINCTRL_PIN(88, "GP107_SPI_4_RXD"),
184-
PINCTRL_PIN(89, "GP108_SPI_4_TXD"),
185-
PINCTRL_PIN(90, "GP109_SPI_5_CLK"),
186-
PINCTRL_PIN(91, "GP110_SPI_5_SS_0"),
187-
PINCTRL_PIN(92, "GP111_SPI_5_SS_1"),
188-
PINCTRL_PIN(93, "GP112_SPI_5_SS_2"),
189-
PINCTRL_PIN(94, "GP113_SPI_5_SS_3"),
190-
PINCTRL_PIN(95, "GP114_SPI_5_RXD"),
191-
PINCTRL_PIN(96, "GP115_SPI_5_TXD"),
192-
PINCTRL_PIN(97, "GP116_SPI_6_CLK"),
193-
PINCTRL_PIN(98, "GP117_SPI_6_SS"),
194-
PINCTRL_PIN(99, "GP118_SPI_6_RXD"),
195-
PINCTRL_PIN(100, "GP119_SPI_6_TXD"),
174+
PINCTRL_PIN(79, "GP120_SPI_0_CLK"),
175+
PINCTRL_PIN(80, "GP121_SPI_0_SS"),
176+
PINCTRL_PIN(81, "GP122_SPI_0_RXD"),
177+
PINCTRL_PIN(82, "GP123_SPI_0_TXD"),
178+
PINCTRL_PIN(83, "GP102_SPI_1_CLK"),
179+
PINCTRL_PIN(84, "GP103_SPI_1_SS0"),
180+
PINCTRL_PIN(85, "GP104_SPI_1_SS1"),
181+
PINCTRL_PIN(86, "GP105_SPI_1_SS2"),
182+
PINCTRL_PIN(87, "GP106_SPI_1_SS3"),
183+
PINCTRL_PIN(88, "GP107_SPI_1_RXD"),
184+
PINCTRL_PIN(89, "GP108_SPI_1_TXD"),
185+
PINCTRL_PIN(90, "GP109_SPI_2_CLK"),
186+
PINCTRL_PIN(91, "GP110_SPI_2_SS0"),
187+
PINCTRL_PIN(92, "GP111_SPI_2_SS1"),
188+
PINCTRL_PIN(93, "GP112_SPI_2_SS2"),
189+
PINCTRL_PIN(94, "GP113_SPI_2_SS3"),
190+
PINCTRL_PIN(95, "GP114_SPI_2_RXD"),
191+
PINCTRL_PIN(96, "GP115_SPI_2_TXD"),
192+
PINCTRL_PIN(97, "GP116_SPI_3_CLK"),
193+
PINCTRL_PIN(98, "GP117_SPI_3_SS"),
194+
PINCTRL_PIN(99, "GP118_SPI_3_RXD"),
195+
PINCTRL_PIN(100, "GP119_SPI_3_TXD"),
196196
/* Family 7: I2C (14 pins) */
197197
PINCTRL_PIN(101, "GP19_I2C_1_SCL"),
198198
PINCTRL_PIN(102, "GP20_I2C_1_SDA"),

0 commit comments

Comments
 (0)