diff options
author | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2015-01-15 09:59:28 -0500 |
---|---|---|
committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2015-01-16 12:08:41 -0500 |
commit | 14efc54a9470e63ce004ae17e9512f4b3953a2fe (patch) | |
tree | 910458f694d217e16605a37ac01107582f285db2 /arch/arm/mach-at91 | |
parent | 4db0ba22da9f4406c292a6a6110eeb2edd12f16a (diff) |
ARM: at91: remove useless map_io
Now that the SRAM is initialized by the mmio-sram driver, .map_io is useless.
remove it.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat (limited to 'arch/arm/mach-at91')
-rw-r--r-- | arch/arm/mach-at91/at91rm9200.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-at91/at91sam9260.c | 27 | ||||
-rw-r--r-- | arch/arm/mach-at91/at91sam9261.c | 9 | ||||
-rw-r--r-- | arch/arm/mach-at91/at91sam9263.c | 7 | ||||
-rw-r--r-- | arch/arm/mach-at91/at91sam9g45.c | 7 | ||||
-rw-r--r-- | arch/arm/mach-at91/at91sam9n12.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-at91/at91sam9rl.c | 18 | ||||
-rw-r--r-- | arch/arm/mach-at91/at91sam9x5.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-at91/sama5d3.c | 6 |
9 files changed, 0 insertions, 92 deletions
diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c index b52916947535..fc7c26138037 100644 --- a/arch/arm/mach-at91/at91rm9200.c +++ b/arch/arm/mach-at91/at91rm9200.c | |||
@@ -42,11 +42,6 @@ static void at91rm9200_restart(enum reboot_mode reboot_mode, const char *cmd) | |||
42 | /* -------------------------------------------------------------------- | 42 | /* -------------------------------------------------------------------- |
43 | * AT91RM9200 processor initialization | 43 | * AT91RM9200 processor initialization |
44 | * -------------------------------------------------------------------- */ | 44 | * -------------------------------------------------------------------- */ |
45 | static void __init at91rm9200_map_io(void) | ||
46 | { | ||
47 | /* Map peripherals */ | ||
48 | at91_init_sram(0, AT91RM9200_SRAM_BASE, AT91RM9200_SRAM_SIZE); | ||
49 | } | ||
50 | 45 | ||
51 | static void __init at91rm9200_initialize(void) | 46 | static void __init at91rm9200_initialize(void) |
52 | { | 47 | { |
@@ -56,6 +51,5 @@ static void __init at91rm9200_initialize(void) | |||
56 | 51 | ||
57 | 52 | ||
58 | AT91_SOC_START(at91rm9200) | 53 | AT91_SOC_START(at91rm9200) |
59 | .map_io = at91rm9200_map_io, | ||
60 | .init = at91rm9200_initialize, | 54 | .init = at91rm9200_initialize, |
61 | AT91_SOC_END | 55 | AT91_SOC_END |
diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c index 34e2abe82ae4..ab9841c8b0d5 100644 --- a/arch/arm/mach-at91/at91sam9260.c +++ b/arch/arm/mach-at91/at91sam9260.c | |||
@@ -22,38 +22,11 @@ | |||
22 | * AT91SAM9260 processor initialization | 22 | * AT91SAM9260 processor initialization |
23 | * -------------------------------------------------------------------- */ | 23 | * -------------------------------------------------------------------- */ |
24 | 24 | ||
25 | static void __init at91sam9xe_map_io(void) | ||
26 | { | ||
27 | unsigned long sram_size; | ||
28 | |||
29 | switch (at91_soc_initdata.cidr & AT91_CIDR_SRAMSIZ) { | ||
30 | case AT91_CIDR_SRAMSIZ_32K: | ||
31 | sram_size = 2 * SZ_16K; | ||
32 | break; | ||
33 | case AT91_CIDR_SRAMSIZ_16K: | ||
34 | default: | ||
35 | sram_size = SZ_16K; | ||
36 | } | ||
37 | |||
38 | at91_init_sram(0, AT91SAM9XE_SRAM_BASE, sram_size); | ||
39 | } | ||
40 | |||
41 | static void __init at91sam9260_map_io(void) | ||
42 | { | ||
43 | if (cpu_is_at91sam9xe()) | ||
44 | at91sam9xe_map_io(); | ||
45 | else if (cpu_is_at91sam9g20()) | ||
46 | at91_init_sram(0, AT91SAM9G20_SRAM_BASE, AT91SAM9G20_SRAM_SIZE); | ||
47 | else | ||
48 | at91_init_sram(0, AT91SAM9260_SRAM_BASE, AT91SAM9260_SRAM_SIZE); | ||
49 | } | ||
50 | |||
51 | static void __init at91sam9260_initialize(void) | 25 | static void __init at91sam9260_initialize(void) |
52 | { | 26 | { |
53 | arm_pm_idle = at91sam9_idle; | 27 | arm_pm_idle = at91sam9_idle; |
54 | } | 28 | } |
55 | 29 | ||
56 | AT91_SOC_START(at91sam9260) | 30 | AT91_SOC_START(at91sam9260) |
57 | .map_io = at91sam9260_map_io, | ||
58 | .init = at91sam9260_initialize, | 31 | .init = at91sam9260_initialize, |
59 | AT91_SOC_END | 32 | AT91_SOC_END |
diff --git a/arch/arm/mach-at91/at91sam9261.c b/arch/arm/mach-at91/at91sam9261.c index 47878b849975..2029096b93fa 100644 --- a/arch/arm/mach-at91/at91sam9261.c +++ b/arch/arm/mach-at91/at91sam9261.c | |||
@@ -21,20 +21,11 @@ | |||
21 | * AT91SAM9261 processor initialization | 21 | * AT91SAM9261 processor initialization |
22 | * -------------------------------------------------------------------- */ | 22 | * -------------------------------------------------------------------- */ |
23 | 23 | ||
24 | static void __init at91sam9261_map_io(void) | ||
25 | { | ||
26 | if (cpu_is_at91sam9g10()) | ||
27 | at91_init_sram(0, AT91SAM9G10_SRAM_BASE, AT91SAM9G10_SRAM_SIZE); | ||
28 | else | ||
29 | at91_init_sram(0, AT91SAM9261_SRAM_BASE, AT91SAM9261_SRAM_SIZE); | ||
30 | } | ||
31 | |||
32 | static void __init at91sam9261_initialize(void) | 24 | static void __init at91sam9261_initialize(void) |
33 | { | 25 | { |
34 | arm_pm_idle = at91sam9_idle; | 26 | arm_pm_idle = at91sam9_idle; |
35 | } | 27 | } |
36 | 28 | ||
37 | AT91_SOC_START(at91sam9261) | 29 | AT91_SOC_START(at91sam9261) |
38 | .map_io = at91sam9261_map_io, | ||
39 | .init = at91sam9261_initialize, | 30 | .init = at91sam9261_initialize, |
40 | AT91_SOC_END | 31 | AT91_SOC_END |
diff --git a/arch/arm/mach-at91/at91sam9263.c b/arch/arm/mach-at91/at91sam9263.c index aabcb66145d0..1fe672a05513 100644 --- a/arch/arm/mach-at91/at91sam9263.c +++ b/arch/arm/mach-at91/at91sam9263.c | |||
@@ -20,18 +20,11 @@ | |||
20 | * AT91SAM9263 processor initialization | 20 | * AT91SAM9263 processor initialization |
21 | * -------------------------------------------------------------------- */ | 21 | * -------------------------------------------------------------------- */ |
22 | 22 | ||
23 | static void __init at91sam9263_map_io(void) | ||
24 | { | ||
25 | at91_init_sram(0, AT91SAM9263_SRAM0_BASE, AT91SAM9263_SRAM0_SIZE); | ||
26 | at91_init_sram(1, AT91SAM9263_SRAM1_BASE, AT91SAM9263_SRAM1_SIZE); | ||
27 | } | ||
28 | |||
29 | static void __init at91sam9263_initialize(void) | 23 | static void __init at91sam9263_initialize(void) |
30 | { | 24 | { |
31 | arm_pm_idle = at91sam9_idle; | 25 | arm_pm_idle = at91sam9_idle; |
32 | } | 26 | } |
33 | 27 | ||
34 | AT91_SOC_START(at91sam9263) | 28 | AT91_SOC_START(at91sam9263) |
35 | .map_io = at91sam9263_map_io, | ||
36 | .init = at91sam9263_initialize, | 29 | .init = at91sam9263_initialize, |
37 | AT91_SOC_END | 30 | AT91_SOC_END |
diff --git a/arch/arm/mach-at91/at91sam9g45.c b/arch/arm/mach-at91/at91sam9g45.c index 000166777a8d..d0493df40a13 100644 --- a/arch/arm/mach-at91/at91sam9g45.c +++ b/arch/arm/mach-at91/at91sam9g45.c | |||
@@ -19,18 +19,11 @@ | |||
19 | /* -------------------------------------------------------------------- | 19 | /* -------------------------------------------------------------------- |
20 | * AT91SAM9G45 processor initialization | 20 | * AT91SAM9G45 processor initialization |
21 | * -------------------------------------------------------------------- */ | 21 | * -------------------------------------------------------------------- */ |
22 | |||
23 | static void __init at91sam9g45_map_io(void) | ||
24 | { | ||
25 | at91_init_sram(0, AT91SAM9G45_SRAM_BASE, AT91SAM9G45_SRAM_SIZE); | ||
26 | } | ||
27 | |||
28 | static void __init at91sam9g45_initialize(void) | 22 | static void __init at91sam9g45_initialize(void) |
29 | { | 23 | { |
30 | arm_pm_idle = at91sam9_idle; | 24 | arm_pm_idle = at91sam9_idle; |
31 | } | 25 | } |
32 | 26 | ||
33 | AT91_SOC_START(at91sam9g45) | 27 | AT91_SOC_START(at91sam9g45) |
34 | .map_io = at91sam9g45_map_io, | ||
35 | .init = at91sam9g45_initialize, | 28 | .init = at91sam9g45_initialize, |
36 | AT91_SOC_END | 29 | AT91_SOC_END |
diff --git a/arch/arm/mach-at91/at91sam9n12.c b/arch/arm/mach-at91/at91sam9n12.c index 0135f868ea4f..b5ea69a3eaf6 100644 --- a/arch/arm/mach-at91/at91sam9n12.c +++ b/arch/arm/mach-at91/at91sam9n12.c | |||
@@ -16,11 +16,5 @@ | |||
16 | * AT91SAM9N12 processor initialization | 16 | * AT91SAM9N12 processor initialization |
17 | * -------------------------------------------------------------------- */ | 17 | * -------------------------------------------------------------------- */ |
18 | 18 | ||
19 | static void __init at91sam9n12_map_io(void) | ||
20 | { | ||
21 | at91_init_sram(0, AT91SAM9N12_SRAM_BASE, AT91SAM9N12_SRAM_SIZE); | ||
22 | } | ||
23 | |||
24 | AT91_SOC_START(at91sam9n12) | 19 | AT91_SOC_START(at91sam9n12) |
25 | .map_io = at91sam9n12_map_io, | ||
26 | AT91_SOC_END | 20 | AT91_SOC_END |
diff --git a/arch/arm/mach-at91/at91sam9rl.c b/arch/arm/mach-at91/at91sam9rl.c index 1babfb27694a..33acae30bb0b 100644 --- a/arch/arm/mach-at91/at91sam9rl.c +++ b/arch/arm/mach-at91/at91sam9rl.c | |||
@@ -21,29 +21,11 @@ | |||
21 | * AT91SAM9RL processor initialization | 21 | * AT91SAM9RL processor initialization |
22 | * -------------------------------------------------------------------- */ | 22 | * -------------------------------------------------------------------- */ |
23 | 23 | ||
24 | static void __init at91sam9rl_map_io(void) | ||
25 | { | ||
26 | unsigned long sram_size; | ||
27 | |||
28 | switch (at91_soc_initdata.cidr & AT91_CIDR_SRAMSIZ) { | ||
29 | case AT91_CIDR_SRAMSIZ_32K: | ||
30 | sram_size = 2 * SZ_16K; | ||
31 | break; | ||
32 | case AT91_CIDR_SRAMSIZ_16K: | ||
33 | default: | ||
34 | sram_size = SZ_16K; | ||
35 | } | ||
36 | |||
37 | /* Map SRAM */ | ||
38 | at91_init_sram(0, AT91SAM9RL_SRAM_BASE, sram_size); | ||
39 | } | ||
40 | |||
41 | static void __init at91sam9rl_initialize(void) | 24 | static void __init at91sam9rl_initialize(void) |
42 | { | 25 | { |
43 | arm_pm_idle = at91sam9_idle; | 26 | arm_pm_idle = at91sam9_idle; |
44 | } | 27 | } |
45 | 28 | ||
46 | AT91_SOC_START(at91sam9rl) | 29 | AT91_SOC_START(at91sam9rl) |
47 | .map_io = at91sam9rl_map_io, | ||
48 | .init = at91sam9rl_initialize, | 30 | .init = at91sam9rl_initialize, |
49 | AT91_SOC_END | 31 | AT91_SOC_END |
diff --git a/arch/arm/mach-at91/at91sam9x5.c b/arch/arm/mach-at91/at91sam9x5.c index aa17520ccb0a..7b60a529db01 100644 --- a/arch/arm/mach-at91/at91sam9x5.c +++ b/arch/arm/mach-at91/at91sam9x5.c | |||
@@ -16,11 +16,5 @@ | |||
16 | * AT91SAM9x5 processor initialization | 16 | * AT91SAM9x5 processor initialization |
17 | * -------------------------------------------------------------------- */ | 17 | * -------------------------------------------------------------------- */ |
18 | 18 | ||
19 | static void __init at91sam9x5_map_io(void) | ||
20 | { | ||
21 | at91_init_sram(0, AT91SAM9X5_SRAM_BASE, AT91SAM9X5_SRAM_SIZE); | ||
22 | } | ||
23 | |||
24 | AT91_SOC_START(at91sam9x5) | 19 | AT91_SOC_START(at91sam9x5) |
25 | .map_io = at91sam9x5_map_io, | ||
26 | AT91_SOC_END | 20 | AT91_SOC_END |
diff --git a/arch/arm/mach-at91/sama5d3.c b/arch/arm/mach-at91/sama5d3.c index ae58feada72b..b7c64ca7107f 100644 --- a/arch/arm/mach-at91/sama5d3.c +++ b/arch/arm/mach-at91/sama5d3.c | |||
@@ -25,11 +25,5 @@ | |||
25 | * AT91SAM9x5 processor initialization | 25 | * AT91SAM9x5 processor initialization |
26 | * -------------------------------------------------------------------- */ | 26 | * -------------------------------------------------------------------- */ |
27 | 27 | ||
28 | static void __init sama5d3_map_io(void) | ||
29 | { | ||
30 | at91_init_sram(0, SAMA5D3_SRAM_BASE, SAMA5D3_SRAM_SIZE); | ||
31 | } | ||
32 | |||
33 | AT91_SOC_START(sama5d3) | 28 | AT91_SOC_START(sama5d3) |
34 | .map_io = sama5d3_map_io, | ||
35 | AT91_SOC_END | 29 | AT91_SOC_END |