diff options
Diffstat (limited to 'drivers/pinctrl/nomadik/pinctrl-nomadik-stn8815.c')
-rw-r--r-- | drivers/pinctrl/nomadik/pinctrl-nomadik-stn8815.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/drivers/pinctrl/nomadik/pinctrl-nomadik-stn8815.c b/drivers/pinctrl/nomadik/pinctrl-nomadik-stn8815.c index a2de3b7a57a0..587b222f12f3 100644 --- a/drivers/pinctrl/nomadik/pinctrl-nomadik-stn8815.c +++ b/drivers/pinctrl/nomadik/pinctrl-nomadik-stn8815.c | |||
@@ -271,9 +271,11 @@ static const struct pinctrl_pin_desc nmk_stn8815_pins[] = { | |||
271 | */ | 271 | */ |
272 | 272 | ||
273 | /* Altfunction A */ | 273 | /* Altfunction A */ |
274 | static const unsigned u0_a_1_pins[] = { STN8815_PIN_B4, STN8815_PIN_D5, | 274 | static const unsigned u0txrx_a_1_pins[] = { STN8815_PIN_B4, STN8815_PIN_D5 }; |
275 | STN8815_PIN_C5, STN8815_PIN_A4, STN8815_PIN_B5, STN8815_PIN_D6, | 275 | static const unsigned u0ctsrts_a_1_pins[] = { STN8815_PIN_C5, STN8815_PIN_B6 }; |
276 | STN8815_PIN_C6, STN8815_PIN_B6 }; | 276 | /* Modem pins: DCD, DSR, RI, DTR */ |
277 | static const unsigned u0modem_a_1_pins[] = { STN8815_PIN_A4, STN8815_PIN_B5, | ||
278 | STN8815_PIN_D6, STN8815_PIN_C6 }; | ||
277 | static const unsigned mmcsd_a_1_pins[] = { STN8815_PIN_B10, STN8815_PIN_A10, | 279 | static const unsigned mmcsd_a_1_pins[] = { STN8815_PIN_B10, STN8815_PIN_A10, |
278 | STN8815_PIN_C11, STN8815_PIN_B11, STN8815_PIN_A11, STN8815_PIN_C12, | 280 | STN8815_PIN_C11, STN8815_PIN_B11, STN8815_PIN_A11, STN8815_PIN_C12, |
279 | STN8815_PIN_B12, STN8815_PIN_A12, STN8815_PIN_C13, STN8815_PIN_C15 }; | 281 | STN8815_PIN_B12, STN8815_PIN_A12, STN8815_PIN_C13, STN8815_PIN_C15 }; |
@@ -290,7 +292,9 @@ static const unsigned i2cusb_b_1_pins[] = { STN8815_PIN_C21, STN8815_PIN_C20 }; | |||
290 | .npins = ARRAY_SIZE(a##_pins), .altsetting = b } | 292 | .npins = ARRAY_SIZE(a##_pins), .altsetting = b } |
291 | 293 | ||
292 | static const struct nmk_pingroup nmk_stn8815_groups[] = { | 294 | static const struct nmk_pingroup nmk_stn8815_groups[] = { |
293 | STN8815_PIN_GROUP(u0_a_1, NMK_GPIO_ALT_A), | 295 | STN8815_PIN_GROUP(u0txrx_a_1, NMK_GPIO_ALT_A), |
296 | STN8815_PIN_GROUP(u0ctsrts_a_1, NMK_GPIO_ALT_A), | ||
297 | STN8815_PIN_GROUP(u0modem_a_1, NMK_GPIO_ALT_A), | ||
294 | STN8815_PIN_GROUP(mmcsd_a_1, NMK_GPIO_ALT_A), | 298 | STN8815_PIN_GROUP(mmcsd_a_1, NMK_GPIO_ALT_A), |
295 | STN8815_PIN_GROUP(mmcsd_b_1, NMK_GPIO_ALT_B), | 299 | STN8815_PIN_GROUP(mmcsd_b_1, NMK_GPIO_ALT_B), |
296 | STN8815_PIN_GROUP(u1_a_1, NMK_GPIO_ALT_A), | 300 | STN8815_PIN_GROUP(u1_a_1, NMK_GPIO_ALT_A), |
@@ -304,7 +308,7 @@ static const struct nmk_pingroup nmk_stn8815_groups[] = { | |||
304 | #define STN8815_FUNC_GROUPS(a, b...) \ | 308 | #define STN8815_FUNC_GROUPS(a, b...) \ |
305 | static const char * const a##_groups[] = { b }; | 309 | static const char * const a##_groups[] = { b }; |
306 | 310 | ||
307 | STN8815_FUNC_GROUPS(u0, "u0_a_1"); | 311 | STN8815_FUNC_GROUPS(u0, "u0txrx_a_1", "u0ctsrts_a_1", "u0modem_a_1"); |
308 | STN8815_FUNC_GROUPS(mmcsd, "mmcsd_a_1", "mmcsd_b_1"); | 312 | STN8815_FUNC_GROUPS(mmcsd, "mmcsd_a_1", "mmcsd_b_1"); |
309 | STN8815_FUNC_GROUPS(u1, "u1_a_1", "u1_b_1"); | 313 | STN8815_FUNC_GROUPS(u1, "u1_a_1", "u1_b_1"); |
310 | STN8815_FUNC_GROUPS(i2c1, "i2c1_a_1"); | 314 | STN8815_FUNC_GROUPS(i2c1, "i2c1_a_1"); |