diff options
| author | Nicolas Ferre <nicolas.ferre@atmel.com> | 2011-12-28 13:10:04 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-03 09:21:45 -0800 |
| commit | 5e0ff93a215968c5ae4a9cb41c88a819499b57fa (patch) | |
| tree | b00ffc5387fe44b1ba9b12a5e21b75ad1572b1f4 | |
| parent | 3141ec606540f9cb82b40dc291066279bf92e64c (diff) | |
| download | lwn-5e0ff93a215968c5ae4a9cb41c88a819499b57fa.tar.gz lwn-5e0ff93a215968c5ae4a9cb41c88a819499b57fa.zip | |
ARM: at91: fix at91rm9200 soc subtype handling
commit 3e90772f76010c315474bde59eaca7cc4c94d645 upstream.
Currently setting it to PQFP changes subtype to BGA as subtypes are
swapped in at91rm9200_set_type().
Wrong subtype causes GPIO bank D not to work at all.
After this fix, subtype is still set as unknown. But board code should
fill it in with proper value. Another information is thus printed.
Bug discovery and first implementation made by Veli-Pekka Peltola.
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | arch/arm/mach-at91/setup.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c index aa64294c7db3..f5bbe0ef439c 100644 --- a/arch/arm/mach-at91/setup.c +++ b/arch/arm/mach-at91/setup.c @@ -27,9 +27,12 @@ EXPORT_SYMBOL(at91_soc_initdata); void __init at91rm9200_set_type(int type) { if (type == ARCH_REVISON_9200_PQFP) - at91_soc_initdata.subtype = AT91_SOC_RM9200_BGA; - else at91_soc_initdata.subtype = AT91_SOC_RM9200_PQFP; + else + at91_soc_initdata.subtype = AT91_SOC_RM9200_BGA; + + pr_info("AT91: filled in soc subtype: %s\n", + at91_get_soc_subtype(&at91_soc_initdata)); } void __init at91_init_irq_default(void) |