diff options
-rw-r--r-- | arch/arm/mach-mxs/include/mach/common.h | 9 | ||||
-rw-r--r-- | arch/arm/mach-mxs/mm.c | 39 |
2 files changed, 0 insertions, 48 deletions
diff --git a/arch/arm/mach-mxs/include/mach/common.h b/arch/arm/mach-mxs/include/mach/common.h index de6c7ba42544..4dec79563f19 100644 --- a/arch/arm/mach-mxs/include/mach/common.h +++ b/arch/arm/mach-mxs/include/mach/common.h | |||
@@ -17,21 +17,12 @@ extern void mxs_timer_init(int); | |||
17 | extern void mxs_restart(char, const char *); | 17 | extern void mxs_restart(char, const char *); |
18 | extern int mxs_saif_clkmux_select(unsigned int clkmux); | 18 | extern int mxs_saif_clkmux_select(unsigned int clkmux); |
19 | 19 | ||
20 | extern void mx23_soc_init(void); | ||
21 | extern int mx23_clocks_init(void); | 20 | extern int mx23_clocks_init(void); |
22 | extern void mx23_map_io(void); | 21 | extern void mx23_map_io(void); |
23 | extern void mx23_init_irq(void); | ||
24 | 22 | ||
25 | extern void mx28_soc_init(void); | ||
26 | extern int mx28_clocks_init(void); | 23 | extern int mx28_clocks_init(void); |
27 | extern void mx28_map_io(void); | 24 | extern void mx28_map_io(void); |
28 | extern void mx28_init_irq(void); | ||
29 | 25 | ||
30 | extern void icoll_init_irq(void); | 26 | extern void icoll_init_irq(void); |
31 | 27 | ||
32 | extern struct platform_device *mxs_add_dma(const char *devid, | ||
33 | resource_size_t base); | ||
34 | extern struct platform_device *mxs_add_gpio(char *name, int id, | ||
35 | resource_size_t iobase, int irq); | ||
36 | |||
37 | #endif /* __MACH_MXS_COMMON_H__ */ | 28 | #endif /* __MACH_MXS_COMMON_H__ */ |
diff --git a/arch/arm/mach-mxs/mm.c b/arch/arm/mach-mxs/mm.c index dccb67a9e7c4..a4294aa9f301 100644 --- a/arch/arm/mach-mxs/mm.c +++ b/arch/arm/mach-mxs/mm.c | |||
@@ -13,14 +13,11 @@ | |||
13 | 13 | ||
14 | #include <linux/mm.h> | 14 | #include <linux/mm.h> |
15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
16 | #include <linux/pinctrl/machine.h> | ||
17 | 16 | ||
18 | #include <asm/mach/map.h> | 17 | #include <asm/mach/map.h> |
19 | 18 | ||
20 | #include <mach/mx23.h> | 19 | #include <mach/mx23.h> |
21 | #include <mach/mx28.h> | 20 | #include <mach/mx28.h> |
22 | #include <mach/common.h> | ||
23 | #include <mach/iomux.h> | ||
24 | 21 | ||
25 | /* | 22 | /* |
26 | * Define the MX23 memory map. | 23 | * Define the MX23 memory map. |
@@ -48,43 +45,7 @@ void __init mx23_map_io(void) | |||
48 | iotable_init(mx23_io_desc, ARRAY_SIZE(mx23_io_desc)); | 45 | iotable_init(mx23_io_desc, ARRAY_SIZE(mx23_io_desc)); |
49 | } | 46 | } |
50 | 47 | ||
51 | void __init mx23_init_irq(void) | ||
52 | { | ||
53 | icoll_init_irq(); | ||
54 | } | ||
55 | |||
56 | void __init mx28_map_io(void) | 48 | void __init mx28_map_io(void) |
57 | { | 49 | { |
58 | iotable_init(mx28_io_desc, ARRAY_SIZE(mx28_io_desc)); | 50 | iotable_init(mx28_io_desc, ARRAY_SIZE(mx28_io_desc)); |
59 | } | 51 | } |
60 | |||
61 | void __init mx28_init_irq(void) | ||
62 | { | ||
63 | icoll_init_irq(); | ||
64 | } | ||
65 | |||
66 | void __init mx23_soc_init(void) | ||
67 | { | ||
68 | pinctrl_provide_dummies(); | ||
69 | |||
70 | mxs_add_dma("imx23-dma-apbh", MX23_APBH_DMA_BASE_ADDR); | ||
71 | mxs_add_dma("imx23-dma-apbx", MX23_APBX_DMA_BASE_ADDR); | ||
72 | |||
73 | mxs_add_gpio("imx23-gpio", 0, MX23_PINCTRL_BASE_ADDR, MX23_INT_GPIO0); | ||
74 | mxs_add_gpio("imx23-gpio", 1, MX23_PINCTRL_BASE_ADDR, MX23_INT_GPIO1); | ||
75 | mxs_add_gpio("imx23-gpio", 2, MX23_PINCTRL_BASE_ADDR, MX23_INT_GPIO2); | ||
76 | } | ||
77 | |||
78 | void __init mx28_soc_init(void) | ||
79 | { | ||
80 | pinctrl_provide_dummies(); | ||
81 | |||
82 | mxs_add_dma("imx28-dma-apbh", MX23_APBH_DMA_BASE_ADDR); | ||
83 | mxs_add_dma("imx28-dma-apbx", MX23_APBX_DMA_BASE_ADDR); | ||
84 | |||
85 | mxs_add_gpio("imx28-gpio", 0, MX28_PINCTRL_BASE_ADDR, MX28_INT_GPIO0); | ||
86 | mxs_add_gpio("imx28-gpio", 1, MX28_PINCTRL_BASE_ADDR, MX28_INT_GPIO1); | ||
87 | mxs_add_gpio("imx28-gpio", 2, MX28_PINCTRL_BASE_ADDR, MX28_INT_GPIO2); | ||
88 | mxs_add_gpio("imx28-gpio", 3, MX28_PINCTRL_BASE_ADDR, MX28_INT_GPIO3); | ||
89 | mxs_add_gpio("imx28-gpio", 4, MX28_PINCTRL_BASE_ADDR, MX28_INT_GPIO4); | ||
90 | } | ||