ARM: at91: Remove rstc and shdwnc global base addresses
authorMaxime Ripard <maxime.ripard@free-electrons.com>
Thu, 3 Jul 2014 12:46:31 +0000 (14:46 +0200)
committerNicolas Ferre <nicolas.ferre@atmel.com>
Mon, 25 Aug 2014 14:27:33 +0000 (16:27 +0200)
Now that there's no user left for the global variables holding the reset and
shutdown controllers base address, we can remove these variables and their
associated mapping function.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
arch/arm/mach-at91/at91sam9260.c
arch/arm/mach-at91/at91sam9261.c
arch/arm/mach-at91/at91sam9263.c
arch/arm/mach-at91/at91sam9g45.c
arch/arm/mach-at91/at91sam9rl.c
arch/arm/mach-at91/generic.h
arch/arm/mach-at91/setup.c

index 601f2c708767159c81e07e18d3d18daeb7b7b171..dbb069f4a0a6992db9f8d33063de474583db3e1f 100644 (file)
@@ -343,8 +343,6 @@ static void __init at91sam9260_map_io(void)
 
 static void __init at91sam9260_ioremap_registers(void)
 {
-       at91_ioremap_shdwc(AT91SAM9260_BASE_SHDWC);
-       at91_ioremap_rstc(AT91SAM9260_BASE_RSTC);
        at91_ioremap_ramc(0, AT91SAM9260_BASE_SDRAMC, 512);
        at91sam926x_ioremap_pit(AT91SAM9260_BASE_PIT);
        at91sam9_ioremap_smc(0, AT91SAM9260_BASE_SMC);
index 5e8ac0d271b88a042373443221c3aba6b1833960..80cae87283169afe2a0e1d37cac57d22abdf54a4 100644 (file)
@@ -302,8 +302,6 @@ static void __init at91sam9261_map_io(void)
 
 static void __init at91sam9261_ioremap_registers(void)
 {
-       at91_ioremap_shdwc(AT91SAM9261_BASE_SHDWC);
-       at91_ioremap_rstc(AT91SAM9261_BASE_RSTC);
        at91_ioremap_ramc(0, AT91SAM9261_BASE_SDRAMC, 512);
        at91sam926x_ioremap_pit(AT91SAM9261_BASE_PIT);
        at91sam9_ioremap_smc(0, AT91SAM9261_BASE_SMC);
index bcc8b04d3cfb2de63df80a0832cb7f9ddf61c422..37bb02ce8b6280f1f813ceb513a62fa3a74978c9 100644 (file)
@@ -322,8 +322,6 @@ static void __init at91sam9263_map_io(void)
 
 static void __init at91sam9263_ioremap_registers(void)
 {
-       at91_ioremap_shdwc(AT91SAM9263_BASE_SHDWC);
-       at91_ioremap_rstc(AT91SAM9263_BASE_RSTC);
        at91_ioremap_ramc(0, AT91SAM9263_BASE_SDRAMC0, 512);
        at91_ioremap_ramc(1, AT91SAM9263_BASE_SDRAMC1, 512);
        at91sam926x_ioremap_pit(AT91SAM9263_BASE_PIT);
index 665d378877a395c1997853b88eaf2f29c44ac369..7a329703f31a3b2ff5b857d5e2ffeab2bb403e31 100644 (file)
@@ -372,8 +372,6 @@ static void __init at91sam9g45_map_io(void)
 
 static void __init at91sam9g45_ioremap_registers(void)
 {
-       at91_ioremap_shdwc(AT91SAM9G45_BASE_SHDWC);
-       at91_ioremap_rstc(AT91SAM9G45_BASE_RSTC);
        at91_ioremap_ramc(0, AT91SAM9G45_BASE_DDRSDRC1, 512);
        at91_ioremap_ramc(1, AT91SAM9G45_BASE_DDRSDRC0, 512);
        at91sam926x_ioremap_pit(AT91SAM9G45_BASE_PIT);
index 5a18a76ac9e3daa4430835eb50414f4eb1d12294..1644aa250eba4bf3ce442ee0b21d4f1ae1508b6b 100644 (file)
@@ -312,8 +312,6 @@ static void __init at91sam9rl_map_io(void)
 
 static void __init at91sam9rl_ioremap_registers(void)
 {
-       at91_ioremap_shdwc(AT91SAM9RL_BASE_SHDWC);
-       at91_ioremap_rstc(AT91SAM9RL_BASE_RSTC);
        at91_ioremap_ramc(0, AT91SAM9RL_BASE_SDRAMC, 512);
        at91sam926x_ioremap_pit(AT91SAM9RL_BASE_PIT);
        at91sam9_ioremap_smc(0, AT91SAM9RL_BASE_SMC);
index 5d5e55237c41c7239d57751723a2d834c468ef5f..f42b0490ad98e005e2036e00ccdb1b86c81d2890 100644 (file)
@@ -64,12 +64,6 @@ extern void at91_irq_resume(void);
 /* idle */
 extern void at91sam9_idle(void);
 
-/* reset */
-extern void at91_ioremap_rstc(u32 base_addr);
-
-/* shutdown */
-extern void at91_ioremap_shdwc(u32 base_addr);
-
 /* Matrix */
 extern void at91_ioremap_matrix(u32 base_addr);
 
index a46df6759c92f1a86a7464468c7542568da5b6a8..bf9b03df11f60563d9c1cb1946f0fd87790f0fe3 100644 (file)
@@ -320,24 +320,6 @@ void __init at91_map_io(void)
                at91_boot_soc.map_io();
 }
 
-void __iomem *at91_shdwc_base = NULL;
-
-void __init at91_ioremap_shdwc(u32 base_addr)
-{
-       at91_shdwc_base = ioremap(base_addr, 16);
-       if (!at91_shdwc_base)
-               panic(pr_fmt("Impossible to ioremap at91_shdwc_base\n"));
-}
-
-void __iomem *at91_rstc_base;
-
-void __init at91_ioremap_rstc(u32 base_addr)
-{
-       at91_rstc_base = ioremap(base_addr, 16);
-       if (!at91_rstc_base)
-               panic(pr_fmt("Impossible to ioremap at91_rstc_base\n"));
-}
-
 void __iomem *at91_matrix_base;
 EXPORT_SYMBOL_GPL(at91_matrix_base);