aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl
diff options
context:
space:
mode:
authorPatrice Chotard <patrice.chotard@stericsson.com>2012-10-26 11:48:31 -0400
committerLinus Walleij <linus.walleij@linaro.org>2012-10-28 16:29:18 -0400
commit0c61ae779c4da98d47a8cf39492bca8a92842a25 (patch)
treede8123893620d906066d48303d208c7990eee29f /drivers/pinctrl
parent2249b19f377f02e1ce9159a42cfcce31ce7cdff5 (diff)
pinctrl/nomadik: db8500: fix kp pin group
kp_a_2 pin group was defined but was not declared as a group of kp function. 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.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pinctrl/pinctrl-nomadik-db8500.c b/drivers/pinctrl/pinctrl-nomadik-db8500.c
index ef6f26d6ab71..6de52e7c57f0 100644
--- a/drivers/pinctrl/pinctrl-nomadik-db8500.c
+++ b/drivers/pinctrl/pinctrl-nomadik-db8500.c
@@ -691,6 +691,7 @@ static const struct nmk_pingroup nmk_db8500_groups[] = {
691 DB8500_PIN_GROUP(i2c0_a_1, NMK_GPIO_ALT_A), 691 DB8500_PIN_GROUP(i2c0_a_1, NMK_GPIO_ALT_A),
692 DB8500_PIN_GROUP(ipgpio0_a_1, NMK_GPIO_ALT_A), 692 DB8500_PIN_GROUP(ipgpio0_a_1, NMK_GPIO_ALT_A),
693 DB8500_PIN_GROUP(ipgpio1_a_1, NMK_GPIO_ALT_A), 693 DB8500_PIN_GROUP(ipgpio1_a_1, NMK_GPIO_ALT_A),
694 DB8500_PIN_GROUP(kp_a_2, NMK_GPIO_ALT_A),
694 DB8500_PIN_GROUP(msp2sck_a_1, NMK_GPIO_ALT_A), 695 DB8500_PIN_GROUP(msp2sck_a_1, NMK_GPIO_ALT_A),
695 DB8500_PIN_GROUP(msp2_a_1, NMK_GPIO_ALT_A), 696 DB8500_PIN_GROUP(msp2_a_1, NMK_GPIO_ALT_A),
696 DB8500_PIN_GROUP(mc4_a_1, NMK_GPIO_ALT_A), 697 DB8500_PIN_GROUP(mc4_a_1, NMK_GPIO_ALT_A),
@@ -834,7 +835,7 @@ DB8500_FUNC_GROUPS(msp1, "msp1txrx_a_1", "msp1_a_1", "msp1txrx_b_1");
834DB8500_FUNC_GROUPS(lcdb, "lcdb_a_1"); 835DB8500_FUNC_GROUPS(lcdb, "lcdb_a_1");
835DB8500_FUNC_GROUPS(lcd, "lcdvsi0_a_1", "lcdvsi1_a_1", "lcd_d0_d7_a_1", 836DB8500_FUNC_GROUPS(lcd, "lcdvsi0_a_1", "lcdvsi1_a_1", "lcd_d0_d7_a_1",
836 "lcd_d8_d11_a_1", "lcd_d12_d23_a_1", "lcd_b_1"); 837 "lcd_d8_d11_a_1", "lcd_d12_d23_a_1", "lcd_b_1");
837DB8500_FUNC_GROUPS(kp, "kp_a_1", "kp_b_1", "kp_b_2", "kp_c_1", "kp_oc1_1"); 838DB8500_FUNC_GROUPS(kp, "kp_a_1", "kp_a_2", "kp_b_1", "kp_b_2", "kp_c_1", "kp_oc1_1");
838DB8500_FUNC_GROUPS(mc2, "mc2_a_1", "mc2rstn_c_1"); 839DB8500_FUNC_GROUPS(mc2, "mc2_a_1", "mc2rstn_c_1");
839DB8500_FUNC_GROUPS(ssp1, "ssp1_a_1"); 840DB8500_FUNC_GROUPS(ssp1, "ssp1_a_1");
840DB8500_FUNC_GROUPS(ssp0, "ssp0_a_1"); 841DB8500_FUNC_GROUPS(ssp0, "ssp0_a_1");