Skip to content

L
linux
Commit d94ed128 authored by Fabio Estevam's avatar Fabio Estevam Committed by Sascha Hauer
Browse files
Options

ARM: mx5: introduce SOC_IMX51 

Introduce SOC_IMX51 to keep consistency with the other i.MX devices
Signed-off-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
Acked-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent abebbb46
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 19 deletions
arch/arm/mach-mx5/Kconfig
View file @ d94ed128
if ARCH_MX5 if ARCH_MX5
# ARCH_MX51 is left for compatibility
config ARCH_MX51 config ARCH_MX51
bool bool
default y
config SOC_IMX51
bool
select MXC_TZIC select MXC_TZIC
select ARCH_MXC_IOMUX_V3 select ARCH_MXC_IOMUX_V3
select ARCH_MXC_AUDMUX_V2 select ARCH_MXC_AUDMUX_V2
select ARCH_HAS_CPUFREQ select ARCH_HAS_CPUFREQ
select ARCH_MX51
comment "MX5 platforms:" comment "MX5 platforms:"
config MACH_MX51_BABBAGE config MACH_MX51_BABBAGE
bool "Support MX51 BABBAGE platforms" bool "Support MX51 BABBAGE platforms"
select SOC_IMX51
select IMX_HAVE_PLATFORM_IMX_I2C select IMX_HAVE_PLATFORM_IMX_I2C
select IMX_HAVE_PLATFORM_IMX_UART select IMX_HAVE_PLATFORM_IMX_UART
select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
...@@ -23,6 +28,7 @@ config MACH_MX51_BABBAGE ...@@ -23,6 +28,7 @@ config MACH_MX51_BABBAGE
config MACH_MX51_3DS config MACH_MX51_3DS
bool "Support MX51PDK (3DS)" bool "Support MX51PDK (3DS)"
select SOC_IMX51
select IMX_HAVE_PLATFORM_IMX_UART select IMX_HAVE_PLATFORM_IMX_UART
select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
select IMX_HAVE_PLATFORM_SPI_IMX select IMX_HAVE_PLATFORM_SPI_IMX
...@@ -33,6 +39,7 @@ config MACH_MX51_3DS ...@@ -33,6 +39,7 @@ config MACH_MX51_3DS
config MACH_EUKREA_CPUIMX51 config MACH_EUKREA_CPUIMX51
bool "Support Eukrea CPUIMX51 module" bool "Support Eukrea CPUIMX51 module"
select SOC_IMX51
select IMX_HAVE_PLATFORM_IMX_I2C select IMX_HAVE_PLATFORM_IMX_I2C
select IMX_HAVE_PLATFORM_IMX_UART select IMX_HAVE_PLATFORM_IMX_UART
select IMX_HAVE_PLATFORM_MXC_NAND select IMX_HAVE_PLATFORM_MXC_NAND
...@@ -58,6 +65,7 @@ endchoice ...@@ -58,6 +65,7 @@ endchoice
config MACH_EUKREA_CPUIMX51SD config MACH_EUKREA_CPUIMX51SD
bool "Support Eukrea CPUIMX51SD module" bool "Support Eukrea CPUIMX51SD module"
select SOC_IMX51
select IMX_HAVE_PLATFORM_IMX_I2C select IMX_HAVE_PLATFORM_IMX_I2C
select IMX_HAVE_PLATFORM_SPI_IMX select IMX_HAVE_PLATFORM_SPI_IMX
select IMX_HAVE_PLATFORM_IMX_UART select IMX_HAVE_PLATFORM_IMX_UART
...@@ -83,6 +91,7 @@ endchoice ...@@ -83,6 +91,7 @@ endchoice
config MACH_MX51_EFIKAMX config MACH_MX51_EFIKAMX
bool "Support MX51 Genesi Efika MX nettop" bool "Support MX51 Genesi Efika MX nettop"
select SOC_IMX51
select IMX_HAVE_PLATFORM_IMX_UART select IMX_HAVE_PLATFORM_IMX_UART
select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
select IMX_HAVE_PLATFORM_SPI_IMX select IMX_HAVE_PLATFORM_SPI_IMX
......
arch/arm/plat-mxc/devices/Kconfig
View file @ d94ed128
config IMX_HAVE_PLATFORM_FEC config IMX_HAVE_PLATFORM_FEC
bool bool
default y if ARCH_MX25 || SOC_IMX27 || SOC_IMX35 || ARCH_MX51 default y if ARCH_MX25 || SOC_IMX27 || SOC_IMX35 || SOC_IMX51
config IMX_HAVE_PLATFORM_FLEXCAN config IMX_HAVE_PLATFORM_FLEXCAN
select HAVE_CAN_FLEXCAN if CAN select HAVE_CAN_FLEXCAN if CAN
...@@ -11,7 +11,7 @@ config IMX_HAVE_PLATFORM_FSL_USB2_UDC ...@@ -11,7 +11,7 @@ config IMX_HAVE_PLATFORM_FSL_USB2_UDC
config IMX_HAVE_PLATFORM_GPIO_KEYS config IMX_HAVE_PLATFORM_GPIO_KEYS
bool bool
default y if ARCH_MX51 default y if SOC_IMX51
config IMX_HAVE_PLATFORM_IMX21_HCD config IMX_HAVE_PLATFORM_IMX21_HCD
bool bool
......
arch/arm/plat-mxc/devices/platform-fec.c
View file @ d94ed128
...@@ -31,7 +31,7 @@ const struct imx_fec_data imx35_fec_data __initconst = ...@@ -31,7 +31,7 @@ const struct imx_fec_data imx35_fec_data __initconst =
imx_fec_data_entry_single(MX35); imx_fec_data_entry_single(MX35);
#endif #endif
#ifdef CONFIG_ARCH_MX51 #ifdef CONFIG_SOC_IMX51
const struct imx_fec_data imx51_fec_data __initconst = const struct imx_fec_data imx51_fec_data __initconst =
imx_fec_data_entry_single(MX51); imx_fec_data_entry_single(MX51);
#endif #endif
......
arch/arm/plat-mxc/devices/platform-imx-dma.c
View file @ d94ed128
...@@ -54,10 +54,10 @@ struct imx_imx_sdma_data imx35_imx_sdma_data __initdata = ...@@ -54,10 +54,10 @@ struct imx_imx_sdma_data imx35_imx_sdma_data __initdata =
imx_imx_sdma_data_entry_single(MX35, 2, "imx35", 0); imx_imx_sdma_data_entry_single(MX35, 2, "imx35", 0);
#endif /* ifdef CONFIG_SOC_IMX35 */ #endif /* ifdef CONFIG_SOC_IMX35 */
#ifdef CONFIG_ARCH_MX51 #ifdef CONFIG_SOC_IMX51
struct imx_imx_sdma_data imx51_imx_sdma_data __initconst = struct imx_imx_sdma_data imx51_imx_sdma_data __initconst =
imx_imx_sdma_data_entry_single(MX51, 2, "imx51", 0); imx_imx_sdma_data_entry_single(MX51, 2, "imx51", 0);
#endif /* ifdef CONFIG_ARCH_MX51 */ #endif /* ifdef CONFIG_SOC_IMX51 */
static struct platform_device __init __maybe_unused *imx_add_imx_sdma( static struct platform_device __init __maybe_unused *imx_add_imx_sdma(
const struct imx_imx_sdma_data *data) const struct imx_imx_sdma_data *data)
...@@ -146,7 +146,7 @@ static struct sdma_script_start_addrs addr_imx35_to2 = { ...@@ -146,7 +146,7 @@ static struct sdma_script_start_addrs addr_imx35_to2 = {
}; };
#endif #endif
#ifdef CONFIG_ARCH_MX51 #ifdef CONFIG_SOC_IMX51
static struct sdma_script_start_addrs addr_imx51_to1 = { static struct sdma_script_start_addrs addr_imx51_to1 = {
.ap_2_ap_addr = 642, .ap_2_ap_addr = 642,
.uart_2_mcu_addr = 817, .uart_2_mcu_addr = 817,
......
arch/arm/plat-mxc/devices/platform-imx-i2c.c
View file @ d94ed128
...@@ -69,14 +69,14 @@ const struct imx_imx_i2c_data imx35_imx_i2c_data[] __initconst = { ...@@ -69,14 +69,14 @@ const struct imx_imx_i2c_data imx35_imx_i2c_data[] __initconst = {
}; };
#endif /* ifdef CONFIG_SOC_IMX35 */ #endif /* ifdef CONFIG_SOC_IMX35 */
#ifdef CONFIG_ARCH_MX51 #ifdef CONFIG_SOC_IMX51
const struct imx_imx_i2c_data imx51_imx_i2c_data[] __initconst = { const struct imx_imx_i2c_data imx51_imx_i2c_data[] __initconst = {
#define imx51_imx_i2c_data_entry(_id, _hwid) \ #define imx51_imx_i2c_data_entry(_id, _hwid) \
imx_imx_i2c_data_entry(MX51, _id, _hwid, SZ_4K) imx_imx_i2c_data_entry(MX51, _id, _hwid, SZ_4K)
imx51_imx_i2c_data_entry(0, 1), imx51_imx_i2c_data_entry(0, 1),
imx51_imx_i2c_data_entry(1, 2), imx51_imx_i2c_data_entry(1, 2),
}; };
#endif /* ifdef CONFIG_ARCH_MX51 */ #endif /* ifdef CONFIG_SOC_IMX51 */
struct platform_device *__init imx_add_imx_i2c( struct platform_device *__init imx_add_imx_i2c(
const struct imx_imx_i2c_data *data, const struct imx_imx_i2c_data *data,
......
arch/arm/plat-mxc/devices/platform-imx-ssi.c
View file @ d94ed128
...@@ -66,14 +66,14 @@ const struct imx_imx_ssi_data imx35_imx_ssi_data[] __initconst = { ...@@ -66,14 +66,14 @@ const struct imx_imx_ssi_data imx35_imx_ssi_data[] __initconst = {
}; };
#endif /* ifdef CONFIG_SOC_IMX35 */ #endif /* ifdef CONFIG_SOC_IMX35 */
#ifdef CONFIG_ARCH_MX51 #ifdef CONFIG_SOC_IMX51
const struct imx_imx_ssi_data imx51_imx_ssi_data[] __initconst = { const struct imx_imx_ssi_data imx51_imx_ssi_data[] __initconst = {
#define imx51_imx_ssi_data_entry(_id, _hwid) \ #define imx51_imx_ssi_data_entry(_id, _hwid) \
imx_imx_ssi_data_entry(MX51, _id, _hwid, SZ_4K) imx_imx_ssi_data_entry(MX51, _id, _hwid, SZ_4K)
imx51_imx_ssi_data_entry(0, 1), imx51_imx_ssi_data_entry(0, 1),
imx51_imx_ssi_data_entry(1, 2), imx51_imx_ssi_data_entry(1, 2),
}; };
#endif /* ifdef CONFIG_ARCH_MX51 */ #endif /* ifdef CONFIG_SOC_IMX51 */
struct platform_device *__init imx_add_imx_ssi( struct platform_device *__init imx_add_imx_ssi(
const struct imx_imx_ssi_data *data, const struct imx_imx_ssi_data *data,
......
arch/arm/plat-mxc/devices/platform-imx-uart.c
View file @ d94ed128
...@@ -94,7 +94,7 @@ const struct imx_imx_uart_1irq_data imx35_imx_uart_data[] __initconst = { ...@@ -94,7 +94,7 @@ const struct imx_imx_uart_1irq_data imx35_imx_uart_data[] __initconst = {
}; };
#endif /* ifdef CONFIG_SOC_IMX35 */ #endif /* ifdef CONFIG_SOC_IMX35 */
#ifdef CONFIG_ARCH_MX51 #ifdef CONFIG_SOC_IMX51
const struct imx_imx_uart_1irq_data imx51_imx_uart_data[] __initconst = { const struct imx_imx_uart_1irq_data imx51_imx_uart_data[] __initconst = {
#define imx51_imx_uart_data_entry(_id, _hwid) \ #define imx51_imx_uart_data_entry(_id, _hwid) \
imx_imx_uart_1irq_data_entry(MX51, _id, _hwid, SZ_4K) imx_imx_uart_1irq_data_entry(MX51, _id, _hwid, SZ_4K)
...@@ -102,7 +102,7 @@ const struct imx_imx_uart_1irq_data imx51_imx_uart_data[] __initconst = { ...@@ -102,7 +102,7 @@ const struct imx_imx_uart_1irq_data imx51_imx_uart_data[] __initconst = {
imx51_imx_uart_data_entry(1, 2), imx51_imx_uart_data_entry(1, 2),
imx51_imx_uart_data_entry(2, 3), imx51_imx_uart_data_entry(2, 3),
}; };
#endif /* ifdef CONFIG_ARCH_MX51 */ #endif /* ifdef CONFIG_SOC_IMX51 */
struct platform_device *__init imx_add_imx_uart_3irq( struct platform_device *__init imx_add_imx_uart_3irq(
const struct imx_imx_uart_3irq_data *data, const struct imx_imx_uart_3irq_data *data,
......
arch/arm/plat-mxc/devices/platform-mxc_nand.c
View file @ d94ed128
...@@ -51,7 +51,7 @@ const struct imx_mxc_nand_data imx35_mxc_nand_data __initconst = ...@@ -51,7 +51,7 @@ const struct imx_mxc_nand_data imx35_mxc_nand_data __initconst =
imx_mxc_nand_data_entry_single(MX35, SZ_8K); imx_mxc_nand_data_entry_single(MX35, SZ_8K);
#endif #endif
#ifdef CONFIG_ARCH_MX51 #ifdef CONFIG_SOC_IMX51
const struct imx_mxc_nand_data imx51_mxc_nand_data __initconst = const struct imx_mxc_nand_data imx51_mxc_nand_data __initconst =
imx_mxc_nandv3_data_entry_single(MX51, SZ_16K); imx_mxc_nandv3_data_entry_single(MX51, SZ_16K);
#endif #endif
......
arch/arm/plat-mxc/devices/platform-sdhci-esdhc-imx.c
View file @ d94ed128
...@@ -41,7 +41,7 @@ imx35_sdhci_esdhc_imx_data[] __initconst = { ...@@ -41,7 +41,7 @@ imx35_sdhci_esdhc_imx_data[] __initconst = {
}; };
#endif /* ifdef CONFIG_SOC_IMX35 */ #endif /* ifdef CONFIG_SOC_IMX35 */
#ifdef CONFIG_ARCH_MX51 #ifdef CONFIG_SOC_IMX51
const struct imx_sdhci_esdhc_imx_data const struct imx_sdhci_esdhc_imx_data
imx51_sdhci_esdhc_imx_data[] __initconst = { imx51_sdhci_esdhc_imx_data[] __initconst = {
#define imx51_sdhci_esdhc_imx_data_entry(_id, _hwid) \ #define imx51_sdhci_esdhc_imx_data_entry(_id, _hwid) \
...@@ -51,7 +51,7 @@ imx51_sdhci_esdhc_imx_data[] __initconst = { ...@@ -51,7 +51,7 @@ imx51_sdhci_esdhc_imx_data[] __initconst = {
imx51_sdhci_esdhc_imx_data_entry(2, 3), imx51_sdhci_esdhc_imx_data_entry(2, 3),
imx51_sdhci_esdhc_imx_data_entry(3, 4), imx51_sdhci_esdhc_imx_data_entry(3, 4),
}; };
#endif /* ifdef CONFIG_ARCH_MX51 */ #endif /* ifdef CONFIG_SOC_IMX51 */
struct platform_device *__init imx_add_sdhci_esdhc_imx( struct platform_device *__init imx_add_sdhci_esdhc_imx(
const struct imx_sdhci_esdhc_imx_data *data, const struct imx_sdhci_esdhc_imx_data *data,
......
arch/arm/plat-mxc/devices/platform-spi_imx.c
View file @ d94ed128
...@@ -68,7 +68,7 @@ const struct imx_spi_imx_data imx35_cspi_data[] __initconst = { ...@@ -68,7 +68,7 @@ const struct imx_spi_imx_data imx35_cspi_data[] __initconst = {
}; };
#endif /* ifdef CONFIG_SOC_IMX35 */ #endif /* ifdef CONFIG_SOC_IMX35 */
#ifdef CONFIG_ARCH_MX51 #ifdef CONFIG_SOC_IMX51
const struct imx_spi_imx_data imx51_cspi_data __initconst = const struct imx_spi_imx_data imx51_cspi_data __initconst =
imx_spi_imx_data_entry_single(MX51, CSPI, "imx51-cspi", 0, , SZ_4K); imx_spi_imx_data_entry_single(MX51, CSPI, "imx51-cspi", 0, , SZ_4K);
...@@ -78,7 +78,7 @@ const struct imx_spi_imx_data imx51_ecspi_data[] __initconst = { ...@@ -78,7 +78,7 @@ const struct imx_spi_imx_data imx51_ecspi_data[] __initconst = {
imx51_ecspi_data_entry(0, 1), imx51_ecspi_data_entry(0, 1),
imx51_ecspi_data_entry(1, 2), imx51_ecspi_data_entry(1, 2),
}; };
#endif /* ifdef CONFIG_ARCH_MX51 */ #endif /* ifdef CONFIG_SOC_IMX51 */
struct platform_device *__init imx_add_spi_imx( struct platform_device *__init imx_add_spi_imx(
const struct imx_spi_imx_data *data, const struct imx_spi_imx_data *data,
......
arch/arm/plat-mxc/ehci.c
View file @ d94ed128
...@@ -246,7 +246,7 @@ int mxc_initialize_usb_hw(int port, unsigned int flags) ...@@ -246,7 +246,7 @@ int mxc_initialize_usb_hw(int port, unsigned int flags)
return 0; return 0;
} }
#endif /* CONFIG_MACH_MX27 */ #endif /* CONFIG_MACH_MX27 */
#ifdef CONFIG_ARCH_MX51 #ifdef CONFIG_SOC_IMX51
if (cpu_is_mx51()) { if (cpu_is_mx51()) {
void __iomem *usb_base; void __iomem *usb_base;
void __iomem *usbotg_base; void __iomem *usbotg_base;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7