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

Commit 4697bb92 authored by Uwe Kleine-König's avatar Uwe Kleine-König
Browse files

ARM: imx: dynamically allocate imx-ssi devices 



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

arch/arm/mach-imx/Kconfig

+3 −2
Original line number Diff line number Diff line
@@ -146,8 +146,8 @@ choice 
	default MACH_EUKREA_MBIMX27_BASEBOARD



config MACH_EUKREA_MBIMX27_BASEBOARD

	prompt "Eukrea MBIMX27 development board"

	bool

	bool "Eukrea MBIMX27 development board"

	select IMX_HAVE_PLATFORM_IMX_SSI

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_SPI_IMX

	help
@@ -182,6 +182,7 @@ config MACH_IMX27LITE 
config MACH_PCA100

	bool "Phytec phyCARD-s (pca100)"

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_SSI

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MXC_NAND

	select IMX_HAVE_PLATFORM_SPI_IMX

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

+4 −0
Original line number Diff line number Diff line
@@ -12,6 +12,10 @@ 
#define imx21_add_i2c_imx(pdata)	\

	imx_add_imx_i2c(0, MX2x_I2C_BASE_ADDR, SZ_4K, MX2x_INT_I2C, pdata)



extern const struct imx_imx_ssi_data imx21_imx_ssi_data[] __initconst;

#define imx21_add_imx_ssi(id, pdata)	\

	imx_add_imx_ssi(&imx21_imx_ssi_data[id], pdata)



extern const struct imx_imx_uart_1irq_data imx21_imx_uart_data[] __initconst;

#define imx21_add_imx_uart(id, pdata)	\

	imx_add_imx_uart_1irq(&imx21_imx_uart_data[id], pdata)

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

+4 −0
Original line number Diff line number Diff line
@@ -14,6 +14,10 @@ 
#define imx27_add_i2c_imx1(pdata)	\

	imx_add_imx_i2c(1, MX27_I2C2_BASE_ADDR, SZ_4K, MX27_INT_I2C2, pdata)



extern const struct imx_imx_ssi_data imx27_imx_ssi_data[] __initconst;

#define imx27_add_imx_ssi(id, pdata)    \

	imx_add_imx_ssi(&imx27_imx_ssi_data[id], pdata)



extern const struct imx_imx_uart_1irq_data imx27_imx_uart_data[] __initconst;

#define imx27_add_imx_uart(id, pdata)	\

	imx_add_imx_uart_1irq(&imx27_imx_uart_data[id], pdata)

arch/arm/mach-imx/devices.c

+0 −35
Original line number Diff line number Diff line
@@ -480,41 +480,6 @@ struct platform_device mxc_usbh2 = { 
};

#endif



#define DEFINE_IMX_SSI_DMARES(_name, ssin, suffix)			\

	{								\

		.name = _name,						\

		.start = MX2x_DMA_REQ_SSI ## ssin ## _ ## suffix,	\

		.end = MX2x_DMA_REQ_SSI ## ssin ## _ ## suffix,		\

		.flags = IORESOURCE_DMA,				\

	}



#define DEFINE_IMX_SSI_DEVICE(n, ssin, baseaddr, irq)			\

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

		{							\

			.start = MX2x_SSI ## ssin ## _BASE_ADDR,	\

			.end = MX2x_SSI ## ssin ## _BASE_ADDR + 0x6f,	\

			.flags = IORESOURCE_MEM,			\

		}, {							\

			.start = MX2x_INT_SSI1,				\

			.end = MX2x_INT_SSI1,				\

			.flags = IORESOURCE_IRQ,			\

		},							\

		DEFINE_IMX_SSI_DMARES("tx0", ssin, TX0),		\

		DEFINE_IMX_SSI_DMARES("rx0", ssin, RX0),		\

		DEFINE_IMX_SSI_DMARES("tx1", ssin, TX1),		\

		DEFINE_IMX_SSI_DMARES("rx1", ssin, RX1),		\

	};								\

									\

	struct platform_device imx_ssi_device ## n = {			\

		.name = "imx-ssi",					\

		.id = n,						\

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

		.resource = imx_ssi_resources ## n,			\

	}



DEFINE_IMX_SSI_DEVICE(0, 1, MX2x_SSI1_BASE_ADDR, MX2x_INT_SSI1);

DEFINE_IMX_SSI_DEVICE(1, 2, MX2x_SSI1_BASE_ADDR, MX2x_INT_SSI1);



/* 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
@@ -26,7 +26,5 @@ extern struct platform_device mxc_otg_host; 
extern struct platform_device mxc_usbh1;

extern struct platform_device mxc_usbh2;

extern struct platform_device mx21_usbhc_device;

extern struct platform_device imx_ssi_device0;

extern struct platform_device imx_ssi_device1;

extern struct platform_device imx_kpp_device;

#endif