summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2012-12-23 18:07:49 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-02-03 18:24:40 -0600
commit399f41521ecb4dfb55bf86210864ce7c60157d8a (patch)
tree4e39ff5d446b7312aaa30310af77bfa0cb5c843a /arch
parent96b3ce5cd4186b58085c03412416e9d540e90183 (diff)
downloadlinux-3.10-399f41521ecb4dfb55bf86210864ce7c60157d8a.tar.gz
linux-3.10-399f41521ecb4dfb55bf86210864ce7c60157d8a.tar.bz2
linux-3.10-399f41521ecb4dfb55bf86210864ce7c60157d8a.zip
ARM: at91: rm9200: remake the BGA as default version
commit 36224d0fe0f34cdde66a381708853ebadeac799c upstream. Make BGA as the default version as we are supposed to just have to specify when we use the PQFP version. Issue was existing since commit: 3e90772 (ARM: at91: fix at91rm9200 soc subtype handling). Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-at91/setup.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c
index 582142e049a..55293a78cfa 100644
--- a/arch/arm/mach-at91/setup.c
+++ b/arch/arm/mach-at91/setup.c
@@ -104,6 +104,8 @@ static void __init soc_detect(u32 dbgu_base)
switch (socid) {
case ARCH_ID_AT91RM9200:
at91_soc_initdata.type = AT91_SOC_RM9200;
+ if (at91_soc_initdata.subtype == AT91_SOC_SUBTYPE_NONE)
+ at91_soc_initdata.subtype = AT91_SOC_RM9200_BGA;
at91_boot_soc = at91rm9200_soc;
break;