pinctrl/at91: fix compatible order
PATCH 1/1 pinctrl/at91: fix compatible order
the sam9x5 is new version of the rm9200 not the invert
--- drivers/pinctrl/pinctrl-at91.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pinctrl/pinctrl-at91.c +1 -1
@@ -1331,8 +1331,8 @@ static void __devinit at91_gpio_probe_fixup(void) }static struct of_device_id at91_gpio_of_match[]__devinitdata = { - { .compatible ="atmel,at91rm9200-gpio" , .data = &at91rm9200_ops }, { .compatible ="atmel,at91sam9x5-gpio" , .data = &at91sam9x5_ops, }, + { .compatible ="atmel,at91rm9200-gpio" , .data = &at91rm9200_ops }, {/* sentinel */ } };
Signature · 1 line
1.7.10.4
PATCH 1/1 pinctrl/at91: fix compatible order
Le 10/12/2012 11:23 AM, Jean-Christophe PLAGNIOL-VILLARD a ?crit :
Quoted 14 lines
the sam9x5 is new version of the rm9200 not the invert
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>Cc Linus Walleij <[email protected]>--- drivers/pinctrl/pinctrl-at91.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/pinctrl/pinctrl-at91.c +0
-0
drivers/pinctrl/pinctrl-at91.c static void __devinit at91_gpio_probe_fixup(void) · line 1338
Quoted 9 lines
drivers/pinctrl/pinctrl-at91.c +1
-1@@ -1331,8 +1331,8 @@ static void __devinit at91_gpio_probe_fixup(void) }static struct of_device_id at91_gpio_of_match[]__devinitdata = { - { .compatible ="atmel,at91rm9200-gpio" , .data = &at91rm9200_ops }, { .compatible ="atmel,at91sam9x5-gpio" , .data = &at91sam9x5_ops, }, + { .compatible ="atmel,at91rm9200-gpio" , .data = &at91rm9200_ops }, {/* sentinel */ } };
Do it also for at91_pinctrl_of_match[], there is the same issue.
Regards
Ludovic
PATCH 1/1 pinctrl/at91: fix compatible order
Quoted 18 lines · ludovic.desroches
Le 10/12/2012 11:23 AM, Jean-Christophe PLAGNIOL-VILLARD a ?crit :
Quoted 16 lines
the sam9x5 is new version of the rm9200 not the invert
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>Cc Linus Walleij <[email protected]>--- drivers/pinctrl/pinctrl-at91.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/pinctrl/pinctrl-at91.c +0
-0@@ -1331,8 +1331,8 @@ static void __devinit at91_gpio_probe_fixup(void) }
Quoted 12 lines
Quoted 10 lines
drivers/pinctrl/pinctrl-at91.c +1
-1static struct of_device_id at91_gpio_of_match[]__devinitdata = { - { .compatible ="atmel,at91rm9200-gpio" , .data = &at91rm9200_ops }, { .compatible = "atmel,at91sam9x5-gpio", .data = &at91sam9x5_ops, }, + { .compatible = "atmel,at91rm9200-gpio", .data = &at91rm9200_ops },{ /* sentinel */ }};
Do it also for at91_pinctrl_of_match[], there is the same issue.
Shall I apply this patch to my at91 branch or will it be updated to cover both cases?
Yours,
Linus Walleij
PATCH 1/1 pinctrl/at91: fix compatible order
Quoted 33 lines · Linus Walleij
Quoted 18 lines · ludovic.desroches
Le 10/12/2012 11:23 AM, Jean-Christophe PLAGNIOL-VILLARD a ?crit :
Quoted 16 lines
the sam9x5 is new version of the rm9200 not the invert
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>Cc Linus Walleij <[email protected]>--- drivers/pinctrl/pinctrl-at91.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/pinctrl/pinctrl-at91.c +0
-0@@ -1331,8 +1331,8 @@ static void __devinit at91_gpio_probe_fixup(void) }Quoted 12 lines
Quoted 10 lines
drivers/pinctrl/pinctrl-at91.c +1
-1static struct of_device_id at91_gpio_of_match[]__devinitdata = { - { .compatible ="atmel,at91rm9200-gpio" , .data = &at91rm9200_ops }, { .compatible = "atmel,at91sam9x5-gpio", .data = &at91sam9x5_ops, }, + { .compatible = "atmel,at91rm9200-gpio", .data = &at91rm9200_ops },{ /* sentinel */ }};
Do it also for at91_pinctrl_of_match[], there is the same issue.
Quoted 2 lines
Shall I apply this patch to my at91 branch or will it be updated to cover both cases?
the one in your tree is ok
Best Regards,
J.