From 8b36d83d5c300a53ddd94cce17b4aff89be74946 Mon Sep 17 00:00:00 2001 From: Jean-Christophe PLAGNIOL-VILLARD Date: Sun, 23 Dec 2012 18:07:49 +0000 Subject: [PATCH] --- yaml --- r: 349127 b: refs/heads/master c: 36224d0fe0f34cdde66a381708853ebadeac799c h: refs/heads/master i: 349125: a7e15f048514a9a5935b27d75757a414fc34271f 349123: e1e02fa63a84f42e1d0aba5114bb46f89a6138dd 349119: 4d54a36022331faaaf19513e26b58fa68be70f4a v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-at91/setup.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 1a7168094ef6..c2365b59b49c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 334c9e8d6d05be132792a855dcc637773d44cad3 +refs/heads/master: 36224d0fe0f34cdde66a381708853ebadeac799c diff --git a/trunk/arch/arm/mach-at91/setup.c b/trunk/arch/arm/mach-at91/setup.c index 9ee866ce0478..4b678478cf95 100644 --- a/trunk/arch/arm/mach-at91/setup.c +++ b/trunk/arch/arm/mach-at91/setup.c @@ -105,6 +105,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;