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

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

ARM: mx3: dynamically allocate imx-keypad devices 



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

arch/arm/mach-mx3/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -91,6 +91,7 @@ config MACH_MX31_3DS 
	select SOC_IMX31

	select SOC_IMX31

	select MXC_DEBUG_BOARD

	select MXC_DEBUG_BOARD

	select IMX_HAVE_PLATFORM_FSL_USB2_UDC

	select IMX_HAVE_PLATFORM_FSL_USB2_UDC

	select IMX_HAVE_PLATFORM_IMX_KEYPAD

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MXC_NAND

	select IMX_HAVE_PLATFORM_MXC_NAND

	select IMX_HAVE_PLATFORM_SPI_IMX

	select IMX_HAVE_PLATFORM_SPI_IMX

arch/arm/mach-mx3/devices-imx31.h

+4 −0
Original line number Original line Diff line number Diff line
@@ -24,6 +24,10 @@ extern const struct imx_imx_i2c_data imx31_imx_i2c_data[] __initconst; 
#define imx31_add_imx_i2c1(pdata)	imx31_add_imx_i2c(1, pdata)

#define imx31_add_imx_i2c1(pdata)	imx31_add_imx_i2c(1, pdata)

#define imx31_add_imx_i2c2(pdata)	imx31_add_imx_i2c(2, pdata)

#define imx31_add_imx_i2c2(pdata)	imx31_add_imx_i2c(2, pdata)





extern const struct imx_imx_keypad_data imx31_imx_keypad_data __initconst;

#define imx31_add_imx_keypad(pdata)	\

	imx_add_imx_keypad(&imx31_imx_keypad_data, pdata)



extern const struct imx_imx_ssi_data imx31_imx_ssi_data[] __initconst;

extern const struct imx_imx_ssi_data imx31_imx_ssi_data[] __initconst;

#define imx31_add_imx_ssi(id, pdata)    \

#define imx31_add_imx_ssi(id, pdata)    \

	imx_add_imx_ssi(&imx31_imx_ssi_data[id], pdata)

	imx_add_imx_ssi(&imx31_imx_ssi_data[id], pdata)

arch/arm/mach-mx3/devices-imx35.h

+4 −0
Original line number Original line Diff line number Diff line
@@ -34,6 +34,10 @@ extern const struct imx_imx_i2c_data imx35_imx_i2c_data[] __initconst; 
#define imx35_add_imx_i2c1(pdata)	imx35_add_imx_i2c(1, pdata)

#define imx35_add_imx_i2c1(pdata)	imx35_add_imx_i2c(1, pdata)

#define imx35_add_imx_i2c2(pdata)	imx35_add_imx_i2c(2, pdata)

#define imx35_add_imx_i2c2(pdata)	imx35_add_imx_i2c(2, pdata)





extern const struct imx_imx_keypad_data imx35_imx_keypad_data __initconst;

#define imx31_add_imx_keypad(pdata)	\

	imx_add_imx_keypad(&imx35_imx_keypad_data, pdata)



extern const struct imx_imx_ssi_data imx35_imx_ssi_data[] __initconst;

extern const struct imx_imx_ssi_data imx35_imx_ssi_data[] __initconst;

#define imx35_add_imx_ssi(id, pdata)    \

#define imx35_add_imx_ssi(id, pdata)    \

	imx_add_imx_ssi(&imx35_imx_ssi_data[id], pdata)

	imx_add_imx_ssi(&imx35_imx_ssi_data[id], pdata)

arch/arm/mach-mx3/devices.c

+0 −19
Original line number Original line Diff line number Diff line
@@ -113,22 +113,3 @@ struct platform_device imx_rtc_device0 = { 
	.num_resources  = ARRAY_SIZE(imx_rtc_resources),

	.num_resources  = ARRAY_SIZE(imx_rtc_resources),

	.resource       = imx_rtc_resources,

	.resource       = imx_rtc_resources,

};
 
};
 


static struct resource imx_kpp_resources[] = {

	{

		.start	= MX3x_KPP_BASE_ADDR,

		.end	= MX3x_KPP_BASE_ADDR + 0xf,

		.flags	= IORESOURCE_MEM

	}, {

		.start	= MX3x_INT_KPP,

		.end	= MX3x_INT_KPP,

		.flags	= IORESOURCE_IRQ,

	},

};



struct platform_device imx_kpp_device = {

	.name = "imx-keypad",

	.id = -1,

	.num_resources = ARRAY_SIZE(imx_kpp_resources),

	.resource = imx_kpp_resources,

};

arch/arm/mach-mx3/devices.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -2,4 +2,3 @@ extern struct platform_device mx3_ipu; 
extern struct platform_device mx3_fb;

extern struct platform_device mx3_fb;

extern struct platform_device mx3_camera;

extern struct platform_device mx3_camera;

extern struct platform_device imx_rtc_device0;
 
extern struct platform_device imx_rtc_device0;
 
extern struct platform_device imx_kpp_device;