diff options
author | Patrice Chotard <patrice.chotard@stericsson.com> | 2012-09-07 09:24:02 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2012-09-10 04:29:35 -0400 |
commit | 2830c3686be31f74cc788250eb54dc2d7a7e48d8 (patch) | |
tree | 4ff07acbe453e1e21f79838c30078297a05b2d96 /drivers/pinctrl | |
parent | 00ba7a502d9a8ba49c54a88f5903bf7bfc33e449 (diff) |
pinctrl/nomadik : add MC1_a_2 pin MC1 function group list
Another possible pin configuration for the MC1 pin group.
Signed-off-by: Patrice Chotard <patrice.chotard@stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl')
-rw-r--r-- | drivers/pinctrl/pinctrl-nomadik-db8500.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/pinctrl/pinctrl-nomadik-db8500.c b/drivers/pinctrl/pinctrl-nomadik-db8500.c index a39fb7a6fc51..ec6209dd7c39 100644 --- a/drivers/pinctrl/pinctrl-nomadik-db8500.c +++ b/drivers/pinctrl/pinctrl-nomadik-db8500.c | |||
@@ -465,6 +465,8 @@ static const unsigned mc4_a_1_pins[] = { DB8500_PIN_AH24, DB8500_PIN_AG25, | |||
465 | static const unsigned mc1_a_1_pins[] = { DB8500_PIN_AH16, DB8500_PIN_AG15, | 465 | static const unsigned mc1_a_1_pins[] = { DB8500_PIN_AH16, DB8500_PIN_AG15, |
466 | DB8500_PIN_AJ15, DB8500_PIN_AG14, DB8500_PIN_AF13, DB8500_PIN_AG13, | 466 | DB8500_PIN_AJ15, DB8500_PIN_AG14, DB8500_PIN_AF13, DB8500_PIN_AG13, |
467 | DB8500_PIN_AH15 }; | 467 | DB8500_PIN_AH15 }; |
468 | static const unsigned mc1_a_2_pins[] = { DB8500_PIN_AH16, DB8500_PIN_AJ15, | ||
469 | DB8500_PIN_AG14, DB8500_PIN_AF13, DB8500_PIN_AG13,DB8500_PIN_AH15 }; | ||
468 | static const unsigned mc1dir_a_1_pins[] = { DB8500_PIN_AH13, DB8500_PIN_AG12, | 470 | static const unsigned mc1dir_a_1_pins[] = { DB8500_PIN_AH13, DB8500_PIN_AG12, |
469 | DB8500_PIN_AH12, DB8500_PIN_AH11 }; | 471 | DB8500_PIN_AH12, DB8500_PIN_AH11 }; |
470 | static const unsigned hsir_a_1_pins[] = { DB8500_PIN_AG10, DB8500_PIN_AH10, | 472 | static const unsigned hsir_a_1_pins[] = { DB8500_PIN_AG10, DB8500_PIN_AH10, |
@@ -641,6 +643,7 @@ static const struct nmk_pingroup nmk_db8500_groups[] = { | |||
641 | DB8500_PIN_GROUP(msp2_a_1, NMK_GPIO_ALT_A), | 643 | DB8500_PIN_GROUP(msp2_a_1, NMK_GPIO_ALT_A), |
642 | DB8500_PIN_GROUP(mc4_a_1, NMK_GPIO_ALT_A), | 644 | DB8500_PIN_GROUP(mc4_a_1, NMK_GPIO_ALT_A), |
643 | DB8500_PIN_GROUP(mc1_a_1, NMK_GPIO_ALT_A), | 645 | DB8500_PIN_GROUP(mc1_a_1, NMK_GPIO_ALT_A), |
646 | DB8500_PIN_GROUP(mc1_a_2, NMK_GPIO_ALT_A), | ||
644 | DB8500_PIN_GROUP(hsir_a_1, NMK_GPIO_ALT_A), | 647 | DB8500_PIN_GROUP(hsir_a_1, NMK_GPIO_ALT_A), |
645 | DB8500_PIN_GROUP(hsit_a_1, NMK_GPIO_ALT_A), | 648 | DB8500_PIN_GROUP(hsit_a_1, NMK_GPIO_ALT_A), |
646 | DB8500_PIN_GROUP(hsit_a_2, NMK_GPIO_ALT_A), | 649 | DB8500_PIN_GROUP(hsit_a_2, NMK_GPIO_ALT_A), |
@@ -768,7 +771,7 @@ DB8500_FUNC_GROUPS(ipgpio, "ipgpio0_a_1", "ipgpio1_a_1", "ipgpio7_b_1", | |||
768 | /* MSP2 can not invert the RX/TX pins but has the optional SCK pin */ | 771 | /* MSP2 can not invert the RX/TX pins but has the optional SCK pin */ |
769 | DB8500_FUNC_GROUPS(msp2, "msp2sck_a_1", "msp2_a_1"); | 772 | DB8500_FUNC_GROUPS(msp2, "msp2sck_a_1", "msp2_a_1"); |
770 | DB8500_FUNC_GROUPS(mc4, "mc4_a_1", "mc4rstn_c_1"); | 773 | DB8500_FUNC_GROUPS(mc4, "mc4_a_1", "mc4rstn_c_1"); |
771 | DB8500_FUNC_GROUPS(mc1, "mc1_a_1", "mc1dir_a_1"); | 774 | DB8500_FUNC_GROUPS(mc1, "mc1_a_1", "mc1_a_2", "mc1dir_a_1"); |
772 | DB8500_FUNC_GROUPS(hsi, "hsir_a_1", "hsit_a_1", "hsit_a_2"); | 775 | DB8500_FUNC_GROUPS(hsi, "hsir_a_1", "hsit_a_1", "hsit_a_2"); |
773 | DB8500_FUNC_GROUPS(clkout, "clkout_a_1", "clkout_a_2", "clkout_c_1"); | 776 | DB8500_FUNC_GROUPS(clkout, "clkout_a_1", "clkout_a_2", "clkout_c_1"); |
774 | DB8500_FUNC_GROUPS(usb, "usb_a_1"); | 777 | DB8500_FUNC_GROUPS(usb, "usb_a_1"); |