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

Commit 9d3d945a authored by Uwe Kleine-König's avatar Uwe Kleine-König
Browse files

ARM: imx: dynamically register mxc-mmc devices 



... plus a trivial simplification of mx21ads_sdhc_init()

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
parent c194daad

arch/arm/mach-imx/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ config MACH_MX21ADS 
	bool "MX21ADS platform"

	select IMX_HAVE_PLATFORM_IMX_FB

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MXC_MMC

	select IMX_HAVE_PLATFORM_MXC_NAND

	help

	  Include support for MX21ADS platform. This includes specific
@@ -89,6 +90,7 @@ config MACH_MX27ADS 
	select IMX_HAVE_PLATFORM_IMX_FB

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MXC_MMC

	select IMX_HAVE_PLATFORM_MXC_NAND

	select IMX_HAVE_PLATFORM_MXC_W1

	help
@@ -116,6 +118,7 @@ choice 
config MACH_PCM970_BASEBOARD

	bool "PHYTEC PCM970 development board"

	select IMX_HAVE_PLATFORM_IMX_FB

	select IMX_HAVE_PLATFORM_MXC_MMC

	help

	  This adds board specific devices that can be found on Phytec's

	  PCM970 evaluation board.
@@ -137,6 +140,7 @@ config MACH_CPUIMX27 
config MACH_EUKREA_CPUIMX27_USESDHC2

	bool "CPUIMX27 integrates SDHC2 module"

	depends on MACH_CPUIMX27

	select IMX_HAVE_PLATFORM_MXC_MMC

	help

	  This adds support for the internal SDHC2 used on CPUIMX27

	  for wifi or eMMC.
@@ -158,6 +162,7 @@ config MACH_EUKREA_MBIMX27_BASEBOARD 
	select IMX_HAVE_PLATFORM_IMX_FB

	select IMX_HAVE_PLATFORM_IMX_SSI

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MXC_MMC

	select IMX_HAVE_PLATFORM_SPI_IMX

	help

	  This adds board specific devices that can be found on Eukrea's
@@ -168,6 +173,7 @@ endchoice 
config MACH_MX27_3DS

	bool "MX27PDK platform"

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MXC_MMC

	help

	  Include support for MX27PDK platform. This includes specific

	  configurations for the board and its peripherals.
@@ -176,6 +182,7 @@ config MACH_IMX27_VISSTRIM_M10 
	bool "Vista Silicon i.MX27 Visstrim_m10"

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MXC_MMC

	help

	  Include support for Visstrim_m10 platform and its different variants.

	  This includes specific configurations for the board and its
@@ -195,6 +202,7 @@ config MACH_PCA100 
	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_SSI

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MXC_MMC

	select IMX_HAVE_PLATFORM_MXC_NAND

	select IMX_HAVE_PLATFORM_MXC_W1

	select IMX_HAVE_PLATFORM_SPI_IMX
@@ -208,6 +216,7 @@ config MACH_MXT_TD60 
	select IMX_HAVE_PLATFORM_IMX_FB

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MXC_MMC

	select IMX_HAVE_PLATFORM_MXC_NAND

	help

	  Include support for i-MXT (aka td60) platform. This

arch/arm/mach-imx/devices-imx21.h

+4 −0
Original line number Diff line number Diff line
@@ -33,6 +33,10 @@ extern const struct imx_imx_uart_1irq_data imx21_imx_uart_data[] __initconst; 
#define imx21_add_imx_uart2(pdata)	imx21_add_imx_uart(2, pdata)

#define imx21_add_imx_uart3(pdata)	imx21_add_imx_uart(3, pdata)



extern const struct imx_mxc_mmc_data imx21_mxc_mmc_data[] __initconst;

#define imx21_add_mxc_mmc(id, pdata)	\

	imx_add_mxc_mmc(&imx21_mxc_mmc_data[id], pdata)



extern const struct imx_mxc_nand_data imx21_mxc_nand_data __initconst;

#define imx21_add_mxc_nand(pdata)	\

	imx_add_mxc_nand(&imx21_mxc_nand_data, pdata)

arch/arm/mach-imx/devices-imx27.h

+4 −0
Original line number Diff line number Diff line
@@ -43,6 +43,10 @@ extern const struct imx_mx2_camera_data imx27_mx2_camera_data __initconst; 
#define imx27_add_mx2_camera(pdata)	\

	imx_add_mx2_camera(&imx27_mx2_camera_data, pdata)



extern const struct imx_mxc_mmc_data imx27_mxc_mmc_data[] __initconst;

#define imx27_add_mxc_mmc(id, pdata)	\

	imx_add_mxc_mmc(&imx27_mxc_mmc_data[id], pdata)



extern const struct imx_mxc_nand_data imx27_mxc_nand_data __initconst;

#define imx27_add_mxc_nand(pdata)	\

	imx_add_mxc_nand(&imx27_mxc_nand_data, pdata)

arch/arm/mach-imx/devices.c

+1 −34
Original line number Diff line number Diff line
@@ -76,40 +76,6 @@ int __init imx1_register_gpios(void) 
}

#endif



#if defined(CONFIG_MACH_MX21) || defined(CONFIG_MACH_MX27)

#define DEFINE_MXC_MMC_DEVICE(n, baseaddr, irq, dmareq)			\

	static struct resource mxc_sdhc_resources ## n[] = {		\

		{							\

			.start = baseaddr,				\

			.end = baseaddr + SZ_4K - 1,			\

			.flags = IORESOURCE_MEM,			\

		}, {							\

			.start = irq,					\

			.end = irq,					\

			.flags = IORESOURCE_IRQ,			\

		}, {							\

			.start = dmareq,				\

			.end = dmareq,					\

			.flags = IORESOURCE_DMA,			\

		},							\

	};								\

									\

	static u64 mxc_sdhc ## n ## _dmamask = DMA_BIT_MASK(32);	\

									\

	struct platform_device mxc_sdhc_device ## n = {			\

		.name = "mxc-mmc",					\

		.id = n,						\

		.dev = {						\

			.dma_mask = &mxc_sdhc ## n ## _dmamask,		\

			.coherent_dma_mask = DMA_BIT_MASK(32),		\

		},							\

		.num_resources = ARRAY_SIZE(mxc_sdhc_resources ## n),	\

		.resource = mxc_sdhc_resources ## n,		\

	}



DEFINE_MXC_MMC_DEVICE(0, MX2x_SDHC1_BASE_ADDR, MX2x_INT_SDHC1, MX2x_DMA_REQ_SDHC1);

DEFINE_MXC_MMC_DEVICE(1, MX2x_SDHC2_BASE_ADDR, MX2x_INT_SDHC2, MX2x_DMA_REQ_SDHC2);



#ifdef CONFIG_MACH_MX27

static struct resource otg_resources[] = {

	{
@@ -203,6 +169,7 @@ struct platform_device mxc_usbh2 = { 
};

#endif



#if defined(CONFIG_MACH_MX21) || defined(CONFIG_MACH_MX27)

/* GPIO port description */

#define DEFINE_MXC_GPIO_PORT_IRQ(SOC, n, _irq)				\

	{								\

arch/arm/mach-imx/devices.h

+0 −2
Original line number Diff line number Diff line 
#if defined(CONFIG_MACH_MX21) || defined(CONFIG_MACH_MX27)

extern struct platform_device mxc_sdhc_device0;

extern struct platform_device mxc_sdhc_device1;

extern struct platform_device mxc_otg_udc_device;

extern struct platform_device mxc_otg_host;

extern struct platform_device mxc_usbh1;