17 files changed, 63 insertions, 18 deletions

diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c
index d3638bd994d..b228ce9e21a 100644
--- a/arch/arm/mach-at91/at91rm9200.c
+++ b/arch/arm/mach-at91/at91rm9200.c
@@ -18,6 +18,7 @@
 #include <mach/at91rm9200.h>
 #include <mach/at91_pmc.h>
 #include <mach/at91_st.h>
+#include <mach/cpu.h>
 
 #include "generic.h"
 #include "clock.h"
@@ -303,6 +304,13 @@ static void at91rm9200_reset(void)
         at91_sys_write(AT91_ST_CR, AT91_ST_WDRST);
 }
 
+int rm9200_type;
+EXPORT_SYMBOL(rm9200_type);
+
+void __init at91rm9200_set_type(int type)
+{
+        rm9200_type = type;
+}
 
 /* --------------------------------------------------------------------
  *  AT91RM9200 processor initialization
@@ -313,7 +321,7 @@ void __init at91rm9200_map_io(void)
         iotable_init(at91rm9200_io_desc, ARRAY_SIZE(at91rm9200_io_desc));
 }
 
-void __init at91rm9200_initialize(unsigned long main_clock, unsigned short banks)
+void __init at91rm9200_initialize(unsigned long main_clock)
 {
         at91_arch_reset = at91rm9200_reset;
         at91_extern_irq = (1 << AT91RM9200_ID_IRQ0) | (1 << AT91RM9200_ID_IRQ1)
@@ -328,7 +336,8 @@ void __init at91rm9200_initialize(unsigned long main_clock, unsigned short banks
         at91rm9200_register_clocks();
 
         /* Initialize GPIO subsystem */
-        at91_gpio_init(at91rm9200_gpio, banks);
+        at91_gpio_init(at91rm9200_gpio,
+                cpu_is_at91rm9200_bga() ? AT91RM9200_BGA : AT91RM9200_PQFP);
 }
 
 
diff --git a/arch/arm/mach-at91/board-1arm.c b/arch/arm/mach-at91/board-1arm.c
index 73372ca868d..ab1d463aa47 100644
--- a/arch/arm/mach-at91/board-1arm.c
+++ b/arch/arm/mach-at91/board-1arm.c
@@ -35,14 +35,18 @@
 
 #include <mach/board.h>
 #include <mach/gpio.h>
+#include <mach/cpu.h>
 
 #include "generic.h"
 
 
 static void __init onearm_init_early(void)
 {
+        /* Set cpu type: PQFP */
+        at91rm9200_set_type(ARCH_REVISON_9200_PQFP);
+
         /* Initialize processor: 18.432 MHz crystal */
-        at91rm9200_initialize(18432000, AT91RM9200_PQFP);
+        at91rm9200_initialize(18432000);
 
         /* DBGU on ttyS0. (Rx & Tx only) */
         at91_register_uart(0, 0, 0);
diff --git a/arch/arm/mach-at91/board-carmeva.c b/arch/arm/mach-at91/board-carmeva.c
index 3929b117206..f36b1868749 100644
--- a/arch/arm/mach-at91/board-carmeva.c
+++ b/arch/arm/mach-at91/board-carmeva.c
@@ -43,7 +43,7 @@
 static void __init carmeva_init_early(void)
 {
         /* Initialize processor: 20.000 MHz crystal */
-        at91rm9200_initialize(20000000, AT91RM9200_BGA);
+        at91rm9200_initialize(20000000);
 
         /* DBGU on ttyS0. (Rx & Tx only) */
         at91_register_uart(0, 0, 0);
diff --git a/arch/arm/mach-at91/board-cpuat91.c b/arch/arm/mach-at91/board-cpuat91.c
index 620a36ae79c..6daabe3907a 100644
--- a/arch/arm/mach-at91/board-cpuat91.c
+++ b/arch/arm/mach-at91/board-cpuat91.c
@@ -38,6 +38,7 @@
 #include <mach/board.h>
 #include <mach/gpio.h>
 #include <mach/at91rm9200_mc.h>
+#include <mach/cpu.h>
 
 #include "generic.h"
 
@@ -52,8 +53,11 @@ static struct gpio_led cpuat91_leds[] = {
 
 static void __init cpuat91_init_early(void)
 {
+        /* Set cpu type: PQFP */
+        at91rm9200_set_type(ARCH_REVISON_9200_PQFP);
+
         /* Initialize processor: 18.432 MHz crystal */
-        at91rm9200_initialize(18432000, AT91RM9200_PQFP);
+        at91rm9200_initialize(18432000);
 
         /* DBGU on ttyS0. (Rx & Tx only) */
         at91_register_uart(0, 0, 0);
diff --git a/arch/arm/mach-at91/board-csb337.c b/arch/arm/mach-at91/board-csb337.c
index a7be81e8b91..d98bcec1dfe 100644
--- a/arch/arm/mach-at91/board-csb337.c
+++ b/arch/arm/mach-at91/board-csb337.c
@@ -46,7 +46,7 @@
 static void __init csb337_init_early(void)
 {
         /* Initialize processor: 3.6864 MHz crystal */
-        at91rm9200_initialize(3686400, AT91RM9200_BGA);
+        at91rm9200_initialize(3686400);
 
         /* Setup the LEDs */
         at91_init_leds(AT91_PIN_PB0, AT91_PIN_PB1);
diff --git a/arch/arm/mach-at91/board-csb637.c b/arch/arm/mach-at91/board-csb637.c
index 58a80c36865..019aab4e20b 100644
--- a/arch/arm/mach-at91/board-csb637.c
+++ b/arch/arm/mach-at91/board-csb637.c
@@ -43,7 +43,7 @@
 static void __init csb637_init_early(void)
 {
         /* Initialize processor: 3.6864 MHz crystal */
-        at91rm9200_initialize(3686400, AT91RM9200_BGA);
+        at91rm9200_initialize(3686400);
 
         /* DBGU on ttyS0. (Rx & Tx only) */
         at91_register_uart(0, 0, 0);
diff --git a/arch/arm/mach-at91/board-eb9200.c b/arch/arm/mach-at91/board-eb9200.c
index e9fff803029..e9484535cbc 100644
--- a/arch/arm/mach-at91/board-eb9200.c
+++ b/arch/arm/mach-at91/board-eb9200.c
@@ -43,7 +43,7 @@
 static void __init eb9200_init_early(void)
 {
         /* Initialize processor: 18.432 MHz crystal */
-        at91rm9200_initialize(18432000, AT91RM9200_BGA);
+        at91rm9200_initialize(18432000);
 
         /* DBGU on ttyS0. (Rx & Tx only) */
         at91_register_uart(0, 0, 0);
diff --git a/arch/arm/mach-at91/board-ecbat91.c b/arch/arm/mach-at91/board-ecbat91.c
index eea65eaf062..a6f57faa10a 100644
--- a/arch/arm/mach-at91/board-ecbat91.c
+++ b/arch/arm/mach-at91/board-ecbat91.c
@@ -38,14 +38,18 @@
 
 #include <mach/board.h>
 #include <mach/gpio.h>
+#include <mach/cpu.h>
 
 #include "generic.h"
 
 
 static void __init ecb_at91init_early(void)
 {
+        /* Set cpu type: PQFP */
+        at91rm9200_set_type(ARCH_REVISON_9200_PQFP);
+
         /* Initialize processor: 18.432 MHz crystal */
-        at91rm9200_initialize(18432000, AT91RM9200_PQFP);
+        at91rm9200_initialize(18432000);
 
         /* Setup the LEDs */
         at91_init_leds(AT91_PIN_PC7, AT91_PIN_PC7);
diff --git a/arch/arm/mach-at91/board-eco920.c b/arch/arm/mach-at91/board-eco920.c
index 90a44e5c639..bfc0062d148 100644
--- a/arch/arm/mach-at91/board-eco920.c
+++ b/arch/arm/mach-at91/board-eco920.c
@@ -26,11 +26,16 @@
 
 #include <mach/board.h>
 #include <mach/at91rm9200_mc.h>
+#include <mach/cpu.h>
+
 #include "generic.h"
 
 static void __init eco920_init_early(void)
 {
-        at91rm9200_initialize(18432000, AT91RM9200_PQFP);
+        /* Set cpu type: PQFP */
+        at91rm9200_set_type(ARCH_REVISON_9200_PQFP);
+
+        at91rm9200_initialize(18432000);
 
         /* Setup the LEDs */
         at91_init_leds(AT91_PIN_PB0, AT91_PIN_PB1);
diff --git a/arch/arm/mach-at91/board-kafa.c b/arch/arm/mach-at91/board-kafa.c
index 4f17a1c98f2..9b003ff744b 100644
--- a/arch/arm/mach-at91/board-kafa.c
+++ b/arch/arm/mach-at91/board-kafa.c
@@ -35,14 +35,18 @@
 
 #include <mach/board.h>
 #include <mach/gpio.h>
+#include <mach/cpu.h>
 
 #include "generic.h"
 
 
 static void __init kafa_init_early(void)
 {
+        /* Set cpu type: PQFP */
+        at91rm9200_set_type(ARCH_REVISON_9200_PQFP);
+
         /* Initialize processor: 18.432 MHz crystal */
-        at91rm9200_initialize(18432000, AT91RM9200_PQFP);
+        at91rm9200_initialize(18432000);
 
         /* Set up the LEDs */
         at91_init_leds(AT91_PIN_PB4, AT91_PIN_PB4);
diff --git a/arch/arm/mach-at91/board-kb9202.c b/arch/arm/mach-at91/board-kb9202.c
index 39247fae517..a813a74b65f 100644
--- a/arch/arm/mach-at91/board-kb9202.c
+++ b/arch/arm/mach-at91/board-kb9202.c
@@ -36,7 +36,7 @@
 
 #include <mach/board.h>
 #include <mach/gpio.h>
-
+#include <mach/cpu.h>
 #include <mach/at91rm9200_mc.h>
 
 #include "generic.h"
@@ -44,8 +44,11 @@
 
 static void __init kb9202_init_early(void)
 {
+        /* Set cpu type: PQFP */
+        at91rm9200_set_type(ARCH_REVISON_9200_PQFP);
+
         /* Initialize processor: 10 MHz crystal */
-        at91rm9200_initialize(10000000, AT91RM9200_PQFP);
+        at91rm9200_initialize(10000000);
 
         /* Set up the LEDs */
         at91_init_leds(AT91_PIN_PC19, AT91_PIN_PC18);
diff --git a/arch/arm/mach-at91/board-picotux200.c b/arch/arm/mach-at91/board-picotux200.c
index 8294eae1e66..756cc2a745d 100644
--- a/arch/arm/mach-at91/board-picotux200.c
+++ b/arch/arm/mach-at91/board-picotux200.c
@@ -46,7 +46,7 @@
 static void __init picotux200_init_early(void)
 {
         /* Initialize processor: 18.432 MHz crystal */
-        at91rm9200_initialize(18432000, AT91RM9200_BGA);
+        at91rm9200_initialize(18432000);
 
         /* DBGU on ttyS0. (Rx & Tx only) */
         at91_register_uart(0, 0, 0);
diff --git a/arch/arm/mach-at91/board-rm9200dk.c b/arch/arm/mach-at91/board-rm9200dk.c
index b90d0f9ade3..aef9627710b 100644
--- a/arch/arm/mach-at91/board-rm9200dk.c
+++ b/arch/arm/mach-at91/board-rm9200dk.c
@@ -48,7 +48,7 @@
 static void __init dk_init_early(void)
 {
         /* Initialize processor: 18.432 MHz crystal */
-        at91rm9200_initialize(18432000, AT91RM9200_BGA);
+        at91rm9200_initialize(18432000);
 
         /* Setup the LEDs */
         at91_init_leds(AT91_PIN_PB2, AT91_PIN_PB2);
diff --git a/arch/arm/mach-at91/board-rm9200ek.c b/arch/arm/mach-at91/board-rm9200ek.c
index 51c266807b1..015a0218308 100644
--- a/arch/arm/mach-at91/board-rm9200ek.c
+++ b/arch/arm/mach-at91/board-rm9200ek.c
@@ -48,7 +48,7 @@
 static void __init ek_init_early(void)
 {
         /* Initialize processor: 18.432 MHz crystal */
-        at91rm9200_initialize(18432000, AT91RM9200_BGA);
+        at91rm9200_initialize(18432000);
 
         /* Setup the LEDs */
         at91_init_leds(AT91_PIN_PB1, AT91_PIN_PB2);
diff --git a/arch/arm/mach-at91/board-yl-9200.c b/arch/arm/mach-at91/board-yl-9200.c
index 167337ff79c..c208cc334d7 100644
--- a/arch/arm/mach-at91/board-yl-9200.c
+++ b/arch/arm/mach-at91/board-yl-9200.c
@@ -45,14 +45,18 @@
 #include <mach/board.h>
 #include <mach/gpio.h>
 #include <mach/at91rm9200_mc.h>
+#include <mach/cpu.h>
 
 #include "generic.h"
 
 
 static void __init yl9200_init_early(void)
 {
+        /* Set cpu type: PQFP */
+        at91rm9200_set_type(ARCH_REVISON_9200_PQFP);
+
         /* Initialize processor: 18.432 MHz crystal */
-        at91rm9200_initialize(18432000, AT91RM9200_PQFP);
+        at91rm9200_initialize(18432000);
 
         /* Setup the LEDs D2=PB17 (timer), D3=PB16 (cpu) */
         at91_init_leds(AT91_PIN_PB16, AT91_PIN_PB17);
diff --git a/arch/arm/mach-at91/generic.h b/arch/arm/mach-at91/generic.h
index ecba94ee520..5783bd1b6c4 100644
--- a/arch/arm/mach-at91/generic.h
+++ b/arch/arm/mach-at91/generic.h
@@ -22,7 +22,8 @@ extern void __init at91cap9_map_io(void);
 extern void __init at572d940hf_map_io(void);
 
  /* Processors */
-extern void __init at91rm9200_initialize(unsigned long main_clock, unsigned short banks);
+extern void __init at91rm9200_set_type(int type);
+extern void __init at91rm9200_initialize(unsigned long main_clock);
 extern void __init at91sam9260_initialize(unsigned long main_clock);
 extern void __init at91sam9261_initialize(unsigned long main_clock);
 extern void __init at91sam9263_initialize(unsigned long main_clock);
diff --git a/arch/arm/mach-at91/include/mach/cpu.h b/arch/arm/mach-at91/include/mach/cpu.h
index 0700f212530..ab00372ca04 100644
--- a/arch/arm/mach-at91/include/mach/cpu.h
+++ b/arch/arm/mach-at91/include/mach/cpu.h
@@ -90,9 +90,16 @@ static inline unsigned long at91cap9_rev_identify(void)
 #endif
 
 #ifdef CONFIG_ARCH_AT91RM9200
+extern int rm9200_type;
+#define ARCH_REVISON_9200_BGA   (0 << 0)
+#define ARCH_REVISON_9200_PQFP  (1 << 0)
 #define cpu_is_at91rm9200()     (at91_cpu_identify() == ARCH_ID_AT91RM9200)
+#define cpu_is_at91rm9200_bga() (!cpu_is_at91rm9200_pqfp())
+#define cpu_is_at91rm9200_pqfp() (cpu_is_at91rm9200() && rm9200_type & ARCH_REVISON_9200_PQFP)
 #else
 #define cpu_is_at91rm9200()     (0)
+#define cpu_is_at91rm9200_bga() (0)
+#define cpu_is_at91rm9200_pqfp() (0)
 #endif
 
 #ifdef CONFIG_ARCH_AT91SAM9260