at91: drop AT91_BASE_PIOx for soc specific one for none boot code

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

7 files changed, 28 insertions, 28 deletions

diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c
index d3aedea7f2..8eeaa551eb 100644
--- a/arch/arm/mach-at91/at91rm9200.c
+++ b/arch/arm/mach-at91/at91rm9200.c
@@ -232,10 +232,10 @@ static void __init at91rm9200_initialize(void)
 	at91rm9200_register_clocks();
 
 	/* Register GPIO subsystem */
-	at91_add_rm9200_gpio(0, AT91_BASE_PIOA);
-	at91_add_rm9200_gpio(1, AT91_BASE_PIOB);
-	at91_add_rm9200_gpio(2, AT91_BASE_PIOC);
-	at91_add_rm9200_gpio(3, AT91_BASE_PIOD);
+	at91_add_rm9200_gpio(0, AT91RM9200_BASE_PIOA);
+	at91_add_rm9200_gpio(1, AT91RM9200_BASE_PIOB);
+	at91_add_rm9200_gpio(2, AT91RM9200_BASE_PIOC);
+	at91_add_rm9200_gpio(3, AT91RM9200_BASE_PIOD);
 }
 
 AT91_SOC_START(rm9200)
diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c
index 2a06f0dd79..fa65fe7fef 100644
--- a/arch/arm/mach-at91/at91sam9260.c
+++ b/arch/arm/mach-at91/at91sam9260.c
@@ -231,9 +231,9 @@ static void at91sam9260_initialize(void)
 	at91sam9260_register_clocks();
 
 	/* Register GPIO subsystem */
-	at91_add_rm9200_gpio(0, AT91_BASE_PIOA);
-	at91_add_rm9200_gpio(1, AT91_BASE_PIOB);
-	at91_add_rm9200_gpio(2, AT91_BASE_PIOC);
+	at91_add_rm9200_gpio(0, AT91SAM9260_BASE_PIOA);
+	at91_add_rm9200_gpio(1, AT91SAM9260_BASE_PIOB);
+	at91_add_rm9200_gpio(2, AT91SAM9260_BASE_PIOC);
 
 	at91_add_pit(AT91SAM9260_BASE_PIT);
 	at91_add_sam9_smc(DEVICE_ID_SINGLE, AT91SAM9260_BASE_SMC, 0x200);
diff --git a/arch/arm/mach-at91/at91sam9261.c b/arch/arm/mach-at91/at91sam9261.c
index c801d9db5e..edac177400 100644
--- a/arch/arm/mach-at91/at91sam9261.c
+++ b/arch/arm/mach-at91/at91sam9261.c
@@ -223,9 +223,9 @@ static void at91sam9261_initialize(void)
 	at91sam9261_register_clocks();
 
 	/* Register GPIO subsystem */
-	at91_add_rm9200_gpio(0, AT91_BASE_PIOA);
-	at91_add_rm9200_gpio(1, AT91_BASE_PIOB);
-	at91_add_rm9200_gpio(2, AT91_BASE_PIOC);
+	at91_add_rm9200_gpio(0, AT91SAM9261_BASE_PIOA);
+	at91_add_rm9200_gpio(1, AT91SAM9261_BASE_PIOB);
+	at91_add_rm9200_gpio(2, AT91SAM9261_BASE_PIOC);
 
 	at91_add_pit(AT91SAM9261_BASE_PIT);
 	at91_add_sam9_smc(DEVICE_ID_SINGLE, AT91SAM9261_BASE_SMC, 0x200);
diff --git a/arch/arm/mach-at91/at91sam9263.c b/arch/arm/mach-at91/at91sam9263.c
index 42777d0a65..eeea1cea20 100644
--- a/arch/arm/mach-at91/at91sam9263.c
+++ b/arch/arm/mach-at91/at91sam9263.c
@@ -240,11 +240,11 @@ static void at91sam9263_initialize(void)
 	at91sam9263_register_clocks();
 
 	/* Register GPIO subsystem */
-	at91_add_rm9200_gpio(0, AT91_BASE_PIOA);
-	at91_add_rm9200_gpio(1, AT91_BASE_PIOB);
-	at91_add_rm9200_gpio(2, AT91_BASE_PIOC);
-	at91_add_rm9200_gpio(3, AT91_BASE_PIOD);
-	at91_add_rm9200_gpio(4, AT91_BASE_PIOE);
+	at91_add_rm9200_gpio(0, AT91SAM9263_BASE_PIOA);
+	at91_add_rm9200_gpio(1, AT91SAM9263_BASE_PIOB);
+	at91_add_rm9200_gpio(2, AT91SAM9263_BASE_PIOC);
+	at91_add_rm9200_gpio(3, AT91SAM9263_BASE_PIOD);
+	at91_add_rm9200_gpio(4, AT91SAM9263_BASE_PIOE);
 
 	at91_add_pit(AT91SAM9263_BASE_PIT);
 	at91_add_sam9_smc(0, AT91SAM9263_BASE_SMC0, 0x200);
diff --git a/arch/arm/mach-at91/at91sam9g45.c b/arch/arm/mach-at91/at91sam9g45.c
index 7ca1f3b8c1..7118efe9a4 100644
--- a/arch/arm/mach-at91/at91sam9g45.c
+++ b/arch/arm/mach-at91/at91sam9g45.c
@@ -252,11 +252,11 @@ static void at91sam9g45_initialize(void)
 	at91sam9g45_register_clocks();
 
 	/* Register GPIO subsystem */
-	at91_add_rm9200_gpio(0, AT91_BASE_PIOA);
-	at91_add_rm9200_gpio(1, AT91_BASE_PIOB);
-	at91_add_rm9200_gpio(2, AT91_BASE_PIOC);
-	at91_add_rm9200_gpio(3, AT91_BASE_PIOD);
-	at91_add_rm9200_gpio(4, AT91_BASE_PIOE);
+	at91_add_rm9200_gpio(0, AT91SAM9G45_BASE_PIOA);
+	at91_add_rm9200_gpio(1, AT91SAM9G45_BASE_PIOB);
+	at91_add_rm9200_gpio(2, AT91SAM9G45_BASE_PIOC);
+	at91_add_rm9200_gpio(3, AT91SAM9G45_BASE_PIOD);
+	at91_add_rm9200_gpio(4, AT91SAM9G45_BASE_PIOE);
 
 	at91_add_pit(AT91SAM9G45_BASE_PIT);
 	at91_add_sam9_smc(DEVICE_ID_SINGLE, AT91SAM9G45_BASE_SMC, 0x200);
diff --git a/arch/arm/mach-at91/at91sam9n12.c b/arch/arm/mach-at91/at91sam9n12.c
index 967885a9e3..c177975f33 100644
--- a/arch/arm/mach-at91/at91sam9n12.c
+++ b/arch/arm/mach-at91/at91sam9n12.c
@@ -213,10 +213,10 @@ static void at91sam9n12_initialize(void)
 	at91sam9n12_register_clocks();
 
 	/* Register GPIO subsystem */
-	at91_add_sam9x5_gpio(0, AT91_BASE_PIOA);
-	at91_add_sam9x5_gpio(1, AT91_BASE_PIOB);
-	at91_add_sam9x5_gpio(2, AT91_BASE_PIOC);
-	at91_add_sam9x5_gpio(3, AT91_BASE_PIOD);
+	at91_add_sam9x5_gpio(0, AT91SAM9N12_BASE_PIOA);
+	at91_add_sam9x5_gpio(1, AT91SAM9N12_BASE_PIOB);
+	at91_add_sam9x5_gpio(2, AT91SAM9N12_BASE_PIOC);
+	at91_add_sam9x5_gpio(3, AT91SAM9N12_BASE_PIOD);
 
 	at91_add_pit(AT91SAM9N12_BASE_PIT);
 	at91_add_sam9_smc(DEVICE_ID_SINGLE, AT91SAM9N12_BASE_SMC, 0x200);
diff --git a/arch/arm/mach-at91/at91sam9x5.c b/arch/arm/mach-at91/at91sam9x5.c
index 090d9ddeec..5d43423eb3 100644
--- a/arch/arm/mach-at91/at91sam9x5.c
+++ b/arch/arm/mach-at91/at91sam9x5.c
@@ -298,10 +298,10 @@ static void at91sam9x5_initialize(void)
 	at91sam9x5_register_clocks();
 
 	/* Register GPIO subsystem */
-	at91_add_sam9x5_gpio(0, AT91_BASE_PIOA);
-	at91_add_sam9x5_gpio(1, AT91_BASE_PIOB);
-	at91_add_sam9x5_gpio(2, AT91_BASE_PIOC);
-	at91_add_sam9x5_gpio(3, AT91_BASE_PIOD);
+	at91_add_sam9x5_gpio(0, AT91SAM9X5_BASE_PIOA);
+	at91_add_sam9x5_gpio(1, AT91SAM9X5_BASE_PIOB);
+	at91_add_sam9x5_gpio(2, AT91SAM9X5_BASE_PIOC);
+	at91_add_sam9x5_gpio(3, AT91SAM9X5_BASE_PIOD);
 
 	at91_add_pit(AT91SAM9X5_BASE_PIT);
 	at91_add_sam9_smc(DEVICE_ID_SINGLE, AT91SAM9X5_BASE_SMC, 0x200);