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

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

ARM: imx: dynamically allocate imx-keypad devices 



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

arch/arm/mach-imx/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ choice 
config MACH_EUKREA_MBIMX27_BASEBOARD

	bool "Eukrea MBIMX27 development board"

	select IMX_HAVE_PLATFORM_IMX_FB

	select IMX_HAVE_PLATFORM_IMX_KEYPAD

	select IMX_HAVE_PLATFORM_IMX_SSI

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MXC_MMC
@@ -175,6 +176,7 @@ endchoice 


config MACH_MX27_3DS

	bool "MX27PDK platform"

	select IMX_HAVE_PLATFORM_IMX_KEYPAD

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MXC_MMC

	help

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

+4 −0
Original line number Diff line number Diff line
@@ -21,6 +21,10 @@ extern const struct imx_imx_i2c_data imx21_imx_i2c_data __initconst; 
#define imx21_add_imx_i2c(pdata)	\

	imx_add_imx_i2c(&imx21_imx_i2c_data, pdata)



extern const struct imx_imx_keypad_data imx21_imx_keypad_data __initconst;

#define imx21_add_imx_keypad(pdata)	\

	imx_add_imx_keypad(&imx21_imx_keypad_data, 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)

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

+4 −0
Original line number Diff line number Diff line
@@ -29,6 +29,10 @@ extern const struct imx_imx_i2c_data imx27_imx_i2c_data[] __initconst; 
#define imx27_add_imx_i2c(id, pdata)	\

	imx_add_imx_i2c(&imx27_imx_i2c_data[id], pdata)



extern const struct imx_imx_keypad_data imx27_imx_keypad_data __initconst;

#define imx27_add_imx_keypad(pdata)	\

	imx_add_imx_keypad(&imx27_imx_keypad_data, 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)

arch/arm/mach-imx/devices.c

+0 −19
Original line number Diff line number Diff line
@@ -149,23 +149,4 @@ struct platform_device mx21_usbhc_device = { 
};

#endif



static struct resource imx_kpp_resources[] = {

	{

		.start  = MX2x_KPP_BASE_ADDR,

		.end    = MX2x_KPP_BASE_ADDR + 0xf,

		.flags  = IORESOURCE_MEM

	}, {

		.start  = MX2x_INT_KPP,

		.end    = MX2x_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,

};



#endif

arch/arm/mach-imx/devices.h

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

extern struct platform_device mx21_usbhc_device;

extern struct platform_device imx_kpp_device;

#endif