diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-mx5/Kconfig | 3 | ||||
-rw-r--r-- | arch/arm/plat-mxc/devices/platform-imx-dma.c | 2 | ||||
-rw-r--r-- | arch/arm/plat-mxc/include/mach/irqs.h | 6 | ||||
-rw-r--r-- | arch/arm/plat-mxc/include/mach/mxc.h | 6 |
4 files changed, 9 insertions, 8 deletions
diff --git a/arch/arm/mach-mx5/Kconfig b/arch/arm/mach-mx5/Kconfig index 03ec6e90bb46..83ee08847d4d 100644 --- a/arch/arm/mach-mx5/Kconfig +++ b/arch/arm/mach-mx5/Kconfig | |||
@@ -1,5 +1,6 @@ | |||
1 | if ARCH_MX5 | 1 | if ARCH_MX5 |
2 | # ARCH_MX51 and ARCH_MX50 are left for compatibility | 2 | # ARCH_MX50/51/53 are left to mark places where prevent multi-soc in single |
3 | # image. So for most time, SOC_IMX50/51/53 should be used. | ||
3 | 4 | ||
4 | config ARCH_MX50 | 5 | config ARCH_MX50 |
5 | bool | 6 | bool |
diff --git a/arch/arm/plat-mxc/devices/platform-imx-dma.c b/arch/arm/plat-mxc/devices/platform-imx-dma.c index 33530d2d5ed1..be7df13ad236 100644 --- a/arch/arm/plat-mxc/devices/platform-imx-dma.c +++ b/arch/arm/plat-mxc/devices/platform-imx-dma.c | |||
@@ -194,7 +194,7 @@ static int __init imxXX_add_imx_dma(void) | |||
194 | } else | 194 | } else |
195 | #endif | 195 | #endif |
196 | 196 | ||
197 | #if defined(CONFIG_ARCH_MX51) | 197 | #if defined(CONFIG_SOC_IMX51) |
198 | if (cpu_is_mx51()) { | 198 | if (cpu_is_mx51()) { |
199 | imx51_imx_sdma_data.pdata.script_addrs = &addr_imx51_to1; | 199 | imx51_imx_sdma_data.pdata.script_addrs = &addr_imx51_to1; |
200 | ret = imx_add_imx_sdma(&imx51_imx_sdma_data); | 200 | ret = imx_add_imx_sdma(&imx51_imx_sdma_data); |
diff --git a/arch/arm/plat-mxc/include/mach/irqs.h b/arch/arm/plat-mxc/include/mach/irqs.h index ba65c9231a78..a3d930d3e65d 100644 --- a/arch/arm/plat-mxc/include/mach/irqs.h +++ b/arch/arm/plat-mxc/include/mach/irqs.h | |||
@@ -23,17 +23,17 @@ | |||
23 | #define MXC_GPIO_IRQ_START MXC_INTERNAL_IRQS | 23 | #define MXC_GPIO_IRQ_START MXC_INTERNAL_IRQS |
24 | 24 | ||
25 | /* these are ordered by size to support multi-SoC kernels */ | 25 | /* these are ordered by size to support multi-SoC kernels */ |
26 | #if defined CONFIG_ARCH_MX53 | 26 | #if defined CONFIG_SOC_IMX53 |
27 | #define MXC_GPIO_IRQS (32 * 7) | 27 | #define MXC_GPIO_IRQS (32 * 7) |
28 | #elif defined CONFIG_ARCH_MX2 | 28 | #elif defined CONFIG_ARCH_MX2 |
29 | #define MXC_GPIO_IRQS (32 * 6) | 29 | #define MXC_GPIO_IRQS (32 * 6) |
30 | #elif defined CONFIG_ARCH_MX50 | 30 | #elif defined CONFIG_SOC_IMX50 |
31 | #define MXC_GPIO_IRQS (32 * 6) | 31 | #define MXC_GPIO_IRQS (32 * 6) |
32 | #elif defined CONFIG_ARCH_MX1 | 32 | #elif defined CONFIG_ARCH_MX1 |
33 | #define MXC_GPIO_IRQS (32 * 4) | 33 | #define MXC_GPIO_IRQS (32 * 4) |
34 | #elif defined CONFIG_ARCH_MX25 | 34 | #elif defined CONFIG_ARCH_MX25 |
35 | #define MXC_GPIO_IRQS (32 * 4) | 35 | #define MXC_GPIO_IRQS (32 * 4) |
36 | #elif defined CONFIG_ARCH_MX51 | 36 | #elif defined CONFIG_SOC_IMX51 |
37 | #define MXC_GPIO_IRQS (32 * 4) | 37 | #define MXC_GPIO_IRQS (32 * 4) |
38 | #elif defined CONFIG_ARCH_MXC91231 | 38 | #elif defined CONFIG_ARCH_MXC91231 |
39 | #define MXC_GPIO_IRQS (32 * 4) | 39 | #define MXC_GPIO_IRQS (32 * 4) |
diff --git a/arch/arm/plat-mxc/include/mach/mxc.h b/arch/arm/plat-mxc/include/mach/mxc.h index 04c7a26b1f26..3781f2f24257 100644 --- a/arch/arm/plat-mxc/include/mach/mxc.h +++ b/arch/arm/plat-mxc/include/mach/mxc.h | |||
@@ -127,7 +127,7 @@ extern unsigned int __mxc_cpu_type; | |||
127 | # define cpu_is_mx35() (0) | 127 | # define cpu_is_mx35() (0) |
128 | #endif | 128 | #endif |
129 | 129 | ||
130 | #ifdef CONFIG_ARCH_MX50 | 130 | #ifdef CONFIG_SOC_IMX50 |
131 | # ifdef mxc_cpu_type | 131 | # ifdef mxc_cpu_type |
132 | # undef mxc_cpu_type | 132 | # undef mxc_cpu_type |
133 | # define mxc_cpu_type __mxc_cpu_type | 133 | # define mxc_cpu_type __mxc_cpu_type |
@@ -139,7 +139,7 @@ extern unsigned int __mxc_cpu_type; | |||
139 | # define cpu_is_mx50() (0) | 139 | # define cpu_is_mx50() (0) |
140 | #endif | 140 | #endif |
141 | 141 | ||
142 | #ifdef CONFIG_ARCH_MX51 | 142 | #ifdef CONFIG_SOC_IMX51 |
143 | # ifdef mxc_cpu_type | 143 | # ifdef mxc_cpu_type |
144 | # undef mxc_cpu_type | 144 | # undef mxc_cpu_type |
145 | # define mxc_cpu_type __mxc_cpu_type | 145 | # define mxc_cpu_type __mxc_cpu_type |
@@ -151,7 +151,7 @@ extern unsigned int __mxc_cpu_type; | |||
151 | # define cpu_is_mx51() (0) | 151 | # define cpu_is_mx51() (0) |
152 | #endif | 152 | #endif |
153 | 153 | ||
154 | #ifdef CONFIG_ARCH_MX53 | 154 | #ifdef CONFIG_SOC_IMX53 |
155 | # ifdef mxc_cpu_type | 155 | # ifdef mxc_cpu_type |
156 | # undef mxc_cpu_type | 156 | # undef mxc_cpu_type |
157 | # define mxc_cpu_type __mxc_cpu_type | 157 | # define mxc_cpu_type __mxc_cpu_type |