diff options
author | Patrice Chotard <patrice.chotard@stericsson.com> | 2012-07-04 11:00:04 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2012-07-05 04:37:37 -0400 |
commit | 3923040bd1ba2ee5357f6ac01c82d8c24d73ce26 (patch) | |
tree | 031dbc342a79f80935f99db25138d26521f07187 /drivers/pinctrl/pinctrl-nomadik-db8500.c | |
parent | 50bcd47c31372b09a39da7288bf80450805b2ca6 (diff) |
pinctrl/nomadik: add spi2_oc1_2 pin group
On 8500 and 9540, all SPI2 pins are driven by SPI block except SPI2_FRM
which is driven as GPIO due to specific constraints.
A new group spi2_oc1_2 is created which exclude SPI2_FRM pin.
Signed-off-by: Patrice Chotard <patrice.chotard@stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/pinctrl-nomadik-db8500.c')
-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 98174936cb5c..6f99769c6733 100644 --- a/drivers/pinctrl/pinctrl-nomadik-db8500.c +++ b/drivers/pinctrl/pinctrl-nomadik-db8500.c | |||
@@ -601,6 +601,8 @@ static const unsigned kp_oc1_1_pins[] = { DB8500_PIN_C6, DB8500_PIN_B3, | |||
601 | DB8500_PIN_D6, DB8500_PIN_B7 }; | 601 | DB8500_PIN_D6, DB8500_PIN_B7 }; |
602 | static const unsigned spi2_oc1_1_pins[] = { DB8500_PIN_AH13, DB8500_PIN_AG12, | 602 | static const unsigned spi2_oc1_1_pins[] = { DB8500_PIN_AH13, DB8500_PIN_AG12, |
603 | DB8500_PIN_AH12, DB8500_PIN_AH11 }; | 603 | DB8500_PIN_AH12, DB8500_PIN_AH11 }; |
604 | static const unsigned spi2_oc1_2_pins[] = { DB8500_PIN_AH13, DB8500_PIN_AH12, | ||
605 | DB8500_PIN_AH11 }; | ||
604 | 606 | ||
605 | #define DB8500_PIN_GROUP(a,b) { .name = #a, .pins = a##_pins, \ | 607 | #define DB8500_PIN_GROUP(a,b) { .name = #a, .pins = a##_pins, \ |
606 | .npins = ARRAY_SIZE(a##_pins), .altsetting = b } | 608 | .npins = ARRAY_SIZE(a##_pins), .altsetting = b } |
@@ -720,6 +722,7 @@ static const struct nmk_pingroup nmk_db8500_groups[] = { | |||
720 | /* Other alt C1 column, these are still configured as alt C */ | 722 | /* Other alt C1 column, these are still configured as alt C */ |
721 | DB8500_PIN_GROUP(kp_oc1_1, NMK_GPIO_ALT_C), | 723 | DB8500_PIN_GROUP(kp_oc1_1, NMK_GPIO_ALT_C), |
722 | DB8500_PIN_GROUP(spi2_oc1_1, NMK_GPIO_ALT_C), | 724 | DB8500_PIN_GROUP(spi2_oc1_1, NMK_GPIO_ALT_C), |
725 | DB8500_PIN_GROUP(spi2_oc1_2, NMK_GPIO_ALT_C), | ||
723 | }; | 726 | }; |
724 | 727 | ||
725 | /* We use this macro to define the groups applicable to a function */ | 728 | /* We use this macro to define the groups applicable to a function */ |
@@ -795,7 +798,7 @@ DB8500_FUNC_GROUPS(mc5, "mc5_c_1"); | |||
795 | DB8500_FUNC_GROUPS(usbsim, "usbsim_c_1", "usbsim_c_2"); | 798 | DB8500_FUNC_GROUPS(usbsim, "usbsim_c_1", "usbsim_c_2"); |
796 | DB8500_FUNC_GROUPS(i2c3, "i2c3_c_1", "i2c3_c_2"); | 799 | DB8500_FUNC_GROUPS(i2c3, "i2c3_c_1", "i2c3_c_2"); |
797 | DB8500_FUNC_GROUPS(spi0, "spi0_c_1"); | 800 | DB8500_FUNC_GROUPS(spi0, "spi0_c_1"); |
798 | DB8500_FUNC_GROUPS(spi2, "spi2_oc1_1"); | 801 | DB8500_FUNC_GROUPS(spi2, "spi2_oc1_1", "spi2_oc1_2"); |
799 | 802 | ||
800 | #define FUNCTION(fname) \ | 803 | #define FUNCTION(fname) \ |
801 | { \ | 804 | { \ |