Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/arm/mach-mx5/Kconfig

+10 −1
Original line number Diff line number Diff line 
if ARCH_MX5

# ARCH_MX51 is left for compatibility



config ARCH_MX51

	bool

	default y



config	SOC_IMX51

	bool

	select MXC_TZIC

	select ARCH_MXC_IOMUX_V3

	select ARCH_MXC_AUDMUX_V2

	select ARCH_HAS_CPUFREQ

	select ARCH_MX51



comment "MX5 platforms:"



config MACH_MX51_BABBAGE

	bool "Support MX51 BABBAGE platforms"

	select SOC_IMX51

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
@@ -23,6 +28,7 @@ config MACH_MX51_BABBAGE 


config MACH_MX51_3DS

	bool "Support MX51PDK (3DS)"

	select SOC_IMX51

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX

	select IMX_HAVE_PLATFORM_SPI_IMX
@@ -33,6 +39,7 @@ config MACH_MX51_3DS 


config MACH_EUKREA_CPUIMX51

	bool "Support Eukrea CPUIMX51 module"

	select SOC_IMX51

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MXC_NAND
@@ -58,6 +65,7 @@ endchoice 


config MACH_EUKREA_CPUIMX51SD

	bool "Support Eukrea CPUIMX51SD module"

	select SOC_IMX51

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_SPI_IMX

	select IMX_HAVE_PLATFORM_IMX_UART
@@ -83,6 +91,7 @@ endchoice 


config MACH_MX51_EFIKAMX

	bool "Support MX51 Genesi Efika MX nettop"

	select SOC_IMX51

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX

	select IMX_HAVE_PLATFORM_SPI_IMX

arch/arm/plat-mxc/devices/Kconfig

+2 −2
Original line number Diff line number Diff line 
config IMX_HAVE_PLATFORM_FEC

	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

	select HAVE_CAN_FLEXCAN if CAN
@@ -11,7 +11,7 @@ config IMX_HAVE_PLATFORM_FSL_USB2_UDC 


config IMX_HAVE_PLATFORM_GPIO_KEYS

	bool

	default y if ARCH_MX51

	default y if SOC_IMX51



config IMX_HAVE_PLATFORM_IMX21_HCD

	bool

arch/arm/plat-mxc/devices/platform-fec.c

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ const struct imx_fec_data imx35_fec_data __initconst = 
	imx_fec_data_entry_single(MX35);

#endif



#ifdef CONFIG_ARCH_MX51

#ifdef CONFIG_SOC_IMX51

const struct imx_fec_data imx51_fec_data __initconst =

	imx_fec_data_entry_single(MX51);

#endif

arch/arm/plat-mxc/devices/platform-imx-dma.c

+3 −3
Original line number Diff line number Diff line
@@ -54,10 +54,10 @@ struct imx_imx_sdma_data imx35_imx_sdma_data __initdata = 
	imx_imx_sdma_data_entry_single(MX35, 2, "imx35", 0);

#endif /* ifdef CONFIG_SOC_IMX35 */



#ifdef CONFIG_ARCH_MX51

#ifdef CONFIG_SOC_IMX51

struct imx_imx_sdma_data imx51_imx_sdma_data __initconst =

	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(

		const struct imx_imx_sdma_data *data)
@@ -146,7 +146,7 @@ static struct sdma_script_start_addrs addr_imx35_to2 = { 
};

#endif



#ifdef CONFIG_ARCH_MX51

#ifdef CONFIG_SOC_IMX51

static struct sdma_script_start_addrs addr_imx51_to1 = {

	.ap_2_ap_addr = 642,

	.uart_2_mcu_addr = 817,

arch/arm/plat-mxc/devices/platform-imx-i2c.c

+2 −2
Original line number Diff line number Diff line
@@ -69,14 +69,14 @@ const struct imx_imx_i2c_data imx35_imx_i2c_data[] __initconst = { 
};

#endif /* ifdef CONFIG_SOC_IMX35 */



#ifdef CONFIG_ARCH_MX51

#ifdef CONFIG_SOC_IMX51

const struct imx_imx_i2c_data imx51_imx_i2c_data[] __initconst = {

#define imx51_imx_i2c_data_entry(_id, _hwid)				\

	imx_imx_i2c_data_entry(MX51, _id, _hwid, SZ_4K)

	imx51_imx_i2c_data_entry(0, 1),

	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(

		const struct imx_imx_i2c_data *data,