diff options
Diffstat (limited to 'arch/arm/mach-imx/mm-imx5.c')
-rw-r--r-- | arch/arm/mach-imx/mm-imx5.c | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/arch/arm/mach-imx/mm-imx5.c b/arch/arm/mach-imx/mm-imx5.c index 79d71cf23a1d..cf34994cfe28 100644 --- a/arch/arm/mach-imx/mm-imx5.c +++ b/arch/arm/mach-imx/mm-imx5.c | |||
@@ -24,16 +24,6 @@ | |||
24 | #include "iomux-v3.h" | 24 | #include "iomux-v3.h" |
25 | 25 | ||
26 | /* | 26 | /* |
27 | * Define the MX50 memory map. | ||
28 | */ | ||
29 | static struct map_desc mx50_io_desc[] __initdata = { | ||
30 | imx_map_entry(MX50, TZIC, MT_DEVICE), | ||
31 | imx_map_entry(MX50, SPBA0, MT_DEVICE), | ||
32 | imx_map_entry(MX50, AIPS1, MT_DEVICE), | ||
33 | imx_map_entry(MX50, AIPS2, MT_DEVICE), | ||
34 | }; | ||
35 | |||
36 | /* | ||
37 | * Define the MX51 memory map. | 27 | * Define the MX51 memory map. |
38 | */ | 28 | */ |
39 | static struct map_desc mx51_io_desc[] __initdata = { | 29 | static struct map_desc mx51_io_desc[] __initdata = { |
@@ -59,11 +49,6 @@ static struct map_desc mx53_io_desc[] __initdata = { | |||
59 | * system startup to create static physical to virtual memory mappings | 49 | * system startup to create static physical to virtual memory mappings |
60 | * for the IO modules. | 50 | * for the IO modules. |
61 | */ | 51 | */ |
62 | void __init mx50_map_io(void) | ||
63 | { | ||
64 | iotable_init(mx50_io_desc, ARRAY_SIZE(mx50_io_desc)); | ||
65 | } | ||
66 | |||
67 | void __init mx51_map_io(void) | 52 | void __init mx51_map_io(void) |
68 | { | 53 | { |
69 | iotable_init(mx51_io_desc, ARRAY_SIZE(mx51_io_desc)); | 54 | iotable_init(mx51_io_desc, ARRAY_SIZE(mx51_io_desc)); |
@@ -74,13 +59,6 @@ void __init mx53_map_io(void) | |||
74 | iotable_init(mx53_io_desc, ARRAY_SIZE(mx53_io_desc)); | 59 | iotable_init(mx53_io_desc, ARRAY_SIZE(mx53_io_desc)); |
75 | } | 60 | } |
76 | 61 | ||
77 | void __init imx50_init_early(void) | ||
78 | { | ||
79 | mxc_set_cpu_type(MXC_CPU_MX50); | ||
80 | mxc_iomux_v3_init(MX50_IO_ADDRESS(MX50_IOMUXC_BASE_ADDR)); | ||
81 | mxc_arch_reset_init(MX50_IO_ADDRESS(MX50_WDOG_BASE_ADDR)); | ||
82 | } | ||
83 | |||
84 | /* | 62 | /* |
85 | * The MIPI HSC unit has been removed from the i.MX51 Reference Manual by | 63 | * The MIPI HSC unit has been removed from the i.MX51 Reference Manual by |
86 | * the Freescale marketing division. However this did not remove the | 64 | * the Freescale marketing division. However this did not remove the |
@@ -115,11 +93,6 @@ void __init imx53_init_early(void) | |||
115 | mxc_arch_reset_init(MX53_IO_ADDRESS(MX53_WDOG1_BASE_ADDR)); | 93 | mxc_arch_reset_init(MX53_IO_ADDRESS(MX53_WDOG1_BASE_ADDR)); |
116 | } | 94 | } |
117 | 95 | ||
118 | void __init mx50_init_irq(void) | ||
119 | { | ||
120 | tzic_init_irq(MX50_IO_ADDRESS(MX50_TZIC_BASE_ADDR)); | ||
121 | } | ||
122 | |||
123 | void __init mx51_init_irq(void) | 96 | void __init mx51_init_irq(void) |
124 | { | 97 | { |
125 | tzic_init_irq(MX51_IO_ADDRESS(MX51_TZIC_BASE_ADDR)); | 98 | tzic_init_irq(MX51_IO_ADDRESS(MX51_TZIC_BASE_ADDR)); |
@@ -148,31 +121,10 @@ static struct sdma_platform_data imx51_sdma_pdata __initdata = { | |||
148 | .script_addrs = &imx51_sdma_script, | 121 | .script_addrs = &imx51_sdma_script, |
149 | }; | 122 | }; |
150 | 123 | ||
151 | static const struct resource imx50_audmux_res[] __initconst = { | ||
152 | DEFINE_RES_MEM(MX50_AUDMUX_BASE_ADDR, SZ_16K), | ||
153 | }; | ||
154 | |||
155 | static const struct resource imx51_audmux_res[] __initconst = { | 124 | static const struct resource imx51_audmux_res[] __initconst = { |
156 | DEFINE_RES_MEM(MX51_AUDMUX_BASE_ADDR, SZ_16K), | 125 | DEFINE_RES_MEM(MX51_AUDMUX_BASE_ADDR, SZ_16K), |
157 | }; | 126 | }; |
158 | 127 | ||
159 | void __init imx50_soc_init(void) | ||
160 | { | ||
161 | mxc_device_init(); | ||
162 | |||
163 | /* i.mx50 has the i.mx35 type gpio */ | ||
164 | mxc_register_gpio("imx35-gpio", 0, MX50_GPIO1_BASE_ADDR, SZ_16K, MX50_INT_GPIO1_LOW, MX50_INT_GPIO1_HIGH); | ||
165 | mxc_register_gpio("imx35-gpio", 1, MX50_GPIO2_BASE_ADDR, SZ_16K, MX50_INT_GPIO2_LOW, MX50_INT_GPIO2_HIGH); | ||
166 | mxc_register_gpio("imx35-gpio", 2, MX50_GPIO3_BASE_ADDR, SZ_16K, MX50_INT_GPIO3_LOW, MX50_INT_GPIO3_HIGH); | ||
167 | mxc_register_gpio("imx35-gpio", 3, MX50_GPIO4_BASE_ADDR, SZ_16K, MX50_INT_GPIO4_LOW, MX50_INT_GPIO4_HIGH); | ||
168 | mxc_register_gpio("imx35-gpio", 4, MX50_GPIO5_BASE_ADDR, SZ_16K, MX50_INT_GPIO5_LOW, MX50_INT_GPIO5_HIGH); | ||
169 | mxc_register_gpio("imx35-gpio", 5, MX50_GPIO6_BASE_ADDR, SZ_16K, MX50_INT_GPIO6_LOW, MX50_INT_GPIO6_HIGH); | ||
170 | |||
171 | /* i.mx50 has the i.mx31 type audmux */ | ||
172 | platform_device_register_simple("imx31-audmux", 0, imx50_audmux_res, | ||
173 | ARRAY_SIZE(imx50_audmux_res)); | ||
174 | } | ||
175 | |||
176 | void __init imx51_soc_init(void) | 128 | void __init imx51_soc_init(void) |
177 | { | 129 | { |
178 | mxc_device_init(); | 130 | mxc_device_init(); |