aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mxs
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2013-03-29 01:15:53 -0400
committerShawn Guo <shawn.guo@linaro.org>2013-04-01 08:42:18 -0400
commit0265b6cbfe77f0064989852a2b52d6572957525c (patch)
tree0f0809afec1f79cf9624ca6586c46b1129f0ae2a /arch/arm/mach-mxs
parent1f629564d08d44e1960800f96b1c6ad19e44b4ae (diff)
ARM: mxs: remove mm.c
The static mapping is used nowhere now. Hence mm.c can be removed completely. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm/mach-mxs')
-rw-r--r--arch/arm/mach-mxs/Makefile2
-rw-r--r--arch/arm/mach-mxs/include/mach/common.h2
-rw-r--r--arch/arm/mach-mxs/mm.c52
3 files changed, 1 insertions, 55 deletions
diff --git a/arch/arm/mach-mxs/Makefile b/arch/arm/mach-mxs/Makefile
index 5339973d503f..2568d24358ef 100644
--- a/arch/arm/mach-mxs/Makefile
+++ b/arch/arm/mach-mxs/Makefile
@@ -1,5 +1,5 @@
1# Common support 1# Common support
2obj-y := ocotp.o mm.o 2obj-y := ocotp.o
3 3
4obj-$(CONFIG_PM) += pm.o 4obj-$(CONFIG_PM) += pm.o
5 5
diff --git a/arch/arm/mach-mxs/include/mach/common.h b/arch/arm/mach-mxs/include/mach/common.h
index b7946a62d350..79cb572c092d 100644
--- a/arch/arm/mach-mxs/include/mach/common.h
+++ b/arch/arm/mach-mxs/include/mach/common.h
@@ -15,9 +15,7 @@ extern const u32 *mxs_get_ocotp(void);
15extern int mxs_saif_clkmux_select(unsigned int clkmux); 15extern int mxs_saif_clkmux_select(unsigned int clkmux);
16 16
17extern int mx23_clocks_init(void); 17extern int mx23_clocks_init(void);
18extern void mx23_map_io(void);
19 18
20extern int mx28_clocks_init(void); 19extern int mx28_clocks_init(void);
21extern void mx28_map_io(void);
22 20
23#endif /* __MACH_MXS_COMMON_H__ */ 21#endif /* __MACH_MXS_COMMON_H__ */
diff --git a/arch/arm/mach-mxs/mm.c b/arch/arm/mach-mxs/mm.c
deleted file mode 100644
index e63b7d87acbd..000000000000
--- a/arch/arm/mach-mxs/mm.c
+++ /dev/null
@@ -1,52 +0,0 @@
1/*
2 * Copyright 2008-2010 Freescale Semiconductor, Inc. All Rights Reserved.
3 *
4 * The code contained herein is licensed under the GNU General Public
5 * License. You may obtain a copy of the GNU General Public License
6 * Version 2 or later at the following locations:
7 *
8 * http://www.opensource.org/licenses/gpl-license.html
9 * http://www.gnu.org/copyleft/gpl.html
10 *
11 * Create static mapping between physical to virtual memory.
12 */
13
14#include <linux/mm.h>
15#include <linux/init.h>
16
17#include <asm/mach/map.h>
18
19#include <mach/mx23.h>
20#include <mach/mx28.h>
21#include <mach/common.h>
22
23/*
24 * Define the MX23 memory map.
25 */
26static struct map_desc mx23_io_desc[] __initdata = {
27 mxs_map_entry(MX23, OCRAM, MT_DEVICE),
28 mxs_map_entry(MX23, IO, MT_DEVICE),
29};
30
31/*
32 * Define the MX28 memory map.
33 */
34static struct map_desc mx28_io_desc[] __initdata = {
35 mxs_map_entry(MX28, OCRAM, MT_DEVICE),
36 mxs_map_entry(MX28, IO, MT_DEVICE),
37};
38
39/*
40 * This function initializes the memory map. It is called during the
41 * system startup to create static physical to virtual memory mappings
42 * for the IO modules.
43 */
44void __init mx23_map_io(void)
45{
46 iotable_init(mx23_io_desc, ARRAY_SIZE(mx23_io_desc));
47}
48
49void __init mx28_map_io(void)
50{
51 iotable_init(mx28_io_desc, ARRAY_SIZE(mx28_io_desc));
52}