pinctrl/nomadik : add MC1_a_2 pin MC1 function group list

Commit Message

Linus Walleij Sept. 10, 2012, 8:31 a.m. UTC

From: Patrice Chotard <[e-mail]>

Another possible pin configuration for the MC1 pin group.

Signed-off-by: Patrice Chotard <[e-mail]>
Signed-off-by: Linus Walleij <[e-mail]>
---
 drivers/pinctrl/pinctrl-nomadik-db8500.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

Stephen Warren Sept. 10, 2012, 5:38 p.m. UTC | #1

On 09/10/2012 02:31 AM, Linus Walleij wrote:
> From: Patrice Chotard <[e-mail]>
> 
> Another possible pin configuration for the MC1 pin group.

I have no objection to this, but I wonder if these will keep trickling
in. Is it a good idea to audit the whole driver and add everything
that's missing in one go?

Linus Walleij Sept. 10, 2012, 5:43 p.m. UTC | #2

On Mon, Sep 10, 2012 at 10:38 AM, Stephen Warren <[e-mail]> wrote:
> On 09/10/2012 02:31 AM, Linus Walleij wrote:
>> From: Patrice Chotard <[e-mail]>
>>
>> Another possible pin configuration for the MC1 pin group.
>
> I have no objection to this, but I wonder if these will keep trickling
> in. Is it a good idea to audit the whole driver and add everything
> that's missing in one go?

I think Patrice has most of it working and is adding the minor missing
pieces to make it perfect ... in our case the group set is driven from
usecases rather than specification, and we have a few different
boards around.

Yours,
Linus Walleij

Patch

diff --git a/drivers/pinctrl/pinctrl-nomadik-db8500.c b/drivers/pinctrl/pinctrl-nomadik-db8500.c
index a39fb7a..ec6209d 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,
 static const unsigned mc1_a_1_pins[] = { DB8500_PIN_AH16, DB8500_PIN_AG15,
 	DB8500_PIN_AJ15, DB8500_PIN_AG14, DB8500_PIN_AF13, DB8500_PIN_AG13,
 	DB8500_PIN_AH15 };
+static const unsigned mc1_a_2_pins[] = { DB8500_PIN_AH16, DB8500_PIN_AJ15,
+	DB8500_PIN_AG14, DB8500_PIN_AF13, DB8500_PIN_AG13,DB8500_PIN_AH15 };
 static const unsigned mc1dir_a_1_pins[] = { DB8500_PIN_AH13, DB8500_PIN_AG12,
 	DB8500_PIN_AH12, DB8500_PIN_AH11 };
 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[] = {
 	DB8500_PIN_GROUP(msp2_a_1, NMK_GPIO_ALT_A),
 	DB8500_PIN_GROUP(mc4_a_1, NMK_GPIO_ALT_A),
 	DB8500_PIN_GROUP(mc1_a_1, NMK_GPIO_ALT_A),
+	DB8500_PIN_GROUP(mc1_a_2, NMK_GPIO_ALT_A),
 	DB8500_PIN_GROUP(hsir_a_1, NMK_GPIO_ALT_A),
 	DB8500_PIN_GROUP(hsit_a_1, NMK_GPIO_ALT_A),
 	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",
 /* MSP2 can not invert the RX/TX pins but has the optional SCK pin */
 DB8500_FUNC_GROUPS(msp2, "msp2sck_a_1", "msp2_a_1");
 DB8500_FUNC_GROUPS(mc4, "mc4_a_1", "mc4rstn_c_1");
-DB8500_FUNC_GROUPS(mc1, "mc1_a_1", "mc1dir_a_1");
+DB8500_FUNC_GROUPS(mc1, "mc1_a_1", "mc1_a_2", "mc1dir_a_1");
 DB8500_FUNC_GROUPS(hsi, "hsir_a_1", "hsit_a_1", "hsit_a_2");
 DB8500_FUNC_GROUPS(clkout, "clkout_a_1", "clkout_a_2", "clkout_c_1");
 DB8500_FUNC_GROUPS(usb, "usb_a_1");