tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

ARM: imx3x: clean up ARCH_MX3X

Move to SOC_SOC_IMX3X.
Leave ARCH_MX31/35 definitions there, in case some place prevent multi-soc
single image.

Signed-off-by: Richard Zhao <richard.zhao@freescale.com>
Acked-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

authored by

Richard Zhao and committed by
Sascha Hauer c23eb89e 76851671

+9 -9
+1 -1
arch/arm/mm/Kconfig
··· 811 811 config CACHE_L2X0 812 812 bool "Enable the L2x0 outer cache controller" 813 813 depends on REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176 || \ 814 - REALVIEW_EB_A9MP || ARCH_MX35 || ARCH_MX31 || MACH_REALVIEW_PBX || \ 814 + REALVIEW_EB_A9MP || SOC_IMX35 || SOC_IMX31 || MACH_REALVIEW_PBX || \ 815 815 ARCH_NOMADIK || ARCH_OMAP4 || ARCH_S5PV310 || ARCH_TEGRA || \ 816 816 ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_SHMOBILE 817 817 default y
+2 -2
arch/arm/plat-mxc/devices/platform-imx-dma.c
··· 94 94 }; 95 95 #endif 96 96 97 - #ifdef CONFIG_ARCH_MX31 97 + #ifdef CONFIG_SOC_IMX31 98 98 static struct sdma_script_start_addrs addr_imx31_to1 = { 99 99 .per_2_per_addr = 1677, 100 100 }; ··· 106 106 }; 107 107 #endif 108 108 109 - #ifdef CONFIG_ARCH_MX35 109 + #ifdef CONFIG_SOC_IMX35 110 110 static struct sdma_script_start_addrs addr_imx35_to1 = { 111 111 .ap_2_ap_addr = 642, 112 112 .uart_2_mcu_addr = 817,
+2 -2
arch/arm/plat-mxc/include/mach/mxc.h
··· 103 103 # define cpu_is_mx27() (0) 104 104 #endif 105 105 106 - #ifdef CONFIG_ARCH_MX31 106 + #ifdef CONFIG_SOC_IMX31 107 107 # ifdef mxc_cpu_type 108 108 # undef mxc_cpu_type 109 109 # define mxc_cpu_type __mxc_cpu_type ··· 115 115 # define cpu_is_mx31() (0) 116 116 #endif 117 117 118 - #ifdef CONFIG_ARCH_MX35 118 + #ifdef CONFIG_SOC_IMX35 119 119 # ifdef mxc_cpu_type 120 120 # undef mxc_cpu_type 121 121 # define mxc_cpu_type __mxc_cpu_type
+1 -1
drivers/net/Kconfig
··· 1944 1944 config FEC 1945 1945 bool "FEC ethernet controller (of ColdFire and some i.MX CPUs)" 1946 1946 depends on M523x || M527x || M5272 || M528x || M520x || M532x || \ 1947 - MACH_MX27 || ARCH_MX35 || ARCH_MX25 || ARCH_MX5 || SOC_IMX28 1947 + IMX_HAVE_PLATFORM_FEC || SOC_IMX28 1948 1948 select PHYLIB 1949 1949 help 1950 1950 Say Y here if you want to use the built-in 10/100 Fast ethernet
+2 -2
drivers/spi/Kconfig
··· 161 161 def_bool y if SOC_IMX21 || SOC_IMX27 162 162 163 163 config SPI_IMX_VER_0_4 164 - def_bool y if ARCH_MX31 164 + def_bool y if SOC_MX31 165 165 166 166 config SPI_IMX_VER_0_7 167 - def_bool y if ARCH_MX25 || ARCH_MX35 || SOC_IMX51 || SOC_IMX53 167 + def_bool y if ARCH_MX25 || SOC_IMX35 || SOC_IMX51 || SOC_IMX53 168 168 169 169 config SPI_IMX_VER_2_3 170 170 def_bool y if SOC_IMX51 || SOC_IMX53
+1 -1
drivers/usb/gadget/fsl_mxc_udc.c
··· 88 88 void fsl_udc_clk_finalize(struct platform_device *pdev) 89 89 { 90 90 struct fsl_usb2_platform_data *pdata = pdev->dev.platform_data; 91 - #if defined(CONFIG_ARCH_MX35) 91 + #if defined(CONFIG_SOC_IMX35) 92 92 unsigned int v; 93 93 94 94 /* workaround ENGcm09152 for i.MX35 */