diff options
author | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2015-03-12 10:54:24 -0400 |
---|---|---|
committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2015-03-13 10:11:04 -0400 |
commit | 0d3441928b45cc42fdc8949153e8a0b51615300d (patch) | |
tree | b68393f028a2e9322290e03dccb25cd3489459b9 | |
parent | 1be27c62d61d23e8426834785d7989daa6745aa8 (diff) |
ARM: at91: remove unused at91_ioremap_matrix and header
at91_ioremap_matrix and the at91_matrix.h header are not used anymore, remove
them.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
-rw-r--r-- | arch/arm/mach-at91/generic.h | 4 | ||||
-rw-r--r-- | arch/arm/mach-at91/include/mach/at91_matrix.h | 23 | ||||
-rw-r--r-- | arch/arm/mach-at91/setup.c | 10 |
3 files changed, 0 insertions, 37 deletions
diff --git a/arch/arm/mach-at91/generic.h b/arch/arm/mach-at91/generic.h index 583369ffc284..2b396c4e1fc1 100644 --- a/arch/arm/mach-at91/generic.h +++ b/arch/arm/mach-at91/generic.h | |||
@@ -25,10 +25,6 @@ extern void at91rm9200_timer_init(void); | |||
25 | extern void at91rm9200_idle(void); | 25 | extern void at91rm9200_idle(void); |
26 | extern void at91sam9_idle(void); | 26 | extern void at91sam9_idle(void); |
27 | 27 | ||
28 | /* Matrix */ | ||
29 | extern void at91_ioremap_matrix(u32 base_addr); | ||
30 | |||
31 | |||
32 | #ifdef CONFIG_PM | 28 | #ifdef CONFIG_PM |
33 | extern void __init at91rm9200_pm_init(void); | 29 | extern void __init at91rm9200_pm_init(void); |
34 | extern void __init at91sam9260_pm_init(void); | 30 | extern void __init at91sam9260_pm_init(void); |
diff --git a/arch/arm/mach-at91/include/mach/at91_matrix.h b/arch/arm/mach-at91/include/mach/at91_matrix.h deleted file mode 100644 index f8996c954131..000000000000 --- a/arch/arm/mach-at91/include/mach/at91_matrix.h +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2011 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | ||
3 | * | ||
4 | * Under GPLv2 | ||
5 | */ | ||
6 | |||
7 | #ifndef __MACH_AT91_MATRIX_H__ | ||
8 | #define __MACH_AT91_MATRIX_H__ | ||
9 | |||
10 | #ifndef __ASSEMBLY__ | ||
11 | extern void __iomem *at91_matrix_base; | ||
12 | |||
13 | #define at91_matrix_read(field) \ | ||
14 | __raw_readl(at91_matrix_base + field) | ||
15 | |||
16 | #define at91_matrix_write(field, value) \ | ||
17 | __raw_writel(value, at91_matrix_base + field) | ||
18 | |||
19 | #else | ||
20 | .extern at91_matrix_base | ||
21 | #endif | ||
22 | |||
23 | #endif /* __MACH_AT91_MATRIX_H__ */ | ||
diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c index 4e58bc90ed21..ef778f33c488 100644 --- a/arch/arm/mach-at91/setup.c +++ b/arch/arm/mach-at91/setup.c | |||
@@ -318,13 +318,3 @@ void __init at91_alt_map_io(void) | |||
318 | pr_info("AT91: Detected soc subtype: %s\n", | 318 | pr_info("AT91: Detected soc subtype: %s\n", |
319 | at91_get_soc_subtype(&at91_soc_initdata)); | 319 | at91_get_soc_subtype(&at91_soc_initdata)); |
320 | } | 320 | } |
321 | |||
322 | void __iomem *at91_matrix_base; | ||
323 | EXPORT_SYMBOL_GPL(at91_matrix_base); | ||
324 | |||
325 | void __init at91_ioremap_matrix(u32 base_addr) | ||
326 | { | ||
327 | at91_matrix_base = ioremap(base_addr, 512); | ||
328 | if (!at91_matrix_base) | ||
329 | panic(pr_fmt("Impossible to ioremap at91_matrix_base\n")); | ||
330 | } | ||