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

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

ARM: mx25: dynamically allocate imx-keypad devices 



The mxc-keypad device seems to be the result of an early and partial
merge of the keypad driver.  It's unused and there is no corresponding
driver available, so just remove it.

Cc: Alberto Panizzo <maramaopercheseimorto@gmail.com>
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
parent d485c7e7

arch/arm/mach-mx25/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -4,10 +4,11 @@ comment "MX25 platforms:" 


config MACH_MX25_3DS

	bool "Support MX25PDK (3DS) Platform"

	select IMX_HAVE_PLATFORM_ESDHC

	select IMX_HAVE_PLATFORM_IMX_KEYPAD

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MXC_EHCI

	select IMX_HAVE_PLATFORM_MXC_NAND

	select IMX_HAVE_PLATFORM_ESDHC



config MACH_EUKREA_CPUIMX25

	bool "Support Eukrea CPUIMX25 Platform"

arch/arm/mach-mx25/devices-imx25.h

+4 −0
Original line number Diff line number Diff line
@@ -30,6 +30,10 @@ extern const struct imx_imx_i2c_data imx25_imx_i2c_data[] __initconst; 
#define imx25_add_imx_i2c1(pdata)	imx25_add_imx_i2c(1, pdata)

#define imx25_add_imx_i2c2(pdata)	imx25_add_imx_i2c(2, pdata)



extern const struct imx_imx_keypad_data imx25_imx_keypad_data __initconst;

#define imx25_add_imx_keypad(pdata)	\

	imx_add_imx_keypad(&imx25_imx_keypad_data, pdata)



extern const struct imx_imx_ssi_data imx25_imx_ssi_data[] __initconst;

#define imx25_add_imx_ssi(id, pdata)	\

	imx_add_imx_ssi(&imx25_imx_ssi_data[id], pdata)

arch/arm/mach-mx25/devices.c

+0 −39
Original line number Diff line number Diff line
@@ -22,25 +22,6 @@ 
#include <mach/mx25.h>

#include <mach/irqs.h>



static struct resource mxc_keypad_resources[] = {

	{

		.start	= 0x43fa8000,

		.end	= 0x43fabfff,

		.flags	= IORESOURCE_MEM,

	}, {

		.start   = 24,

		.end     = 24,

		.flags   = IORESOURCE_IRQ,

	}

};



struct platform_device mxc_keypad_device = {

	.name = "mxc-keypad",

	.id = -1,

	.num_resources = ARRAY_SIZE(mxc_keypad_resources),

	.resource = mxc_keypad_resources,

};



static struct resource mx25_rtc_resources[] = {

	{

		.start	= MX25_DRYICE_BASE_ADDR,
@@ -98,26 +79,6 @@ struct platform_device mxc_wdt = { 
	.resource = mxc_wdt_resources,

};



static struct resource mx25_kpp_resources[] = {

	{

		.start	= MX25_KPP_BASE_ADDR,

		.end	= MX25_KPP_BASE_ADDR + 0xf,

		.flags	= IORESOURCE_MEM,

	},

	{

		.start	= MX25_INT_KPP,

		.end	= MX25_INT_KPP,

		.flags	= IORESOURCE_IRQ,

	},

};



struct platform_device mx25_kpp_device = {

	.name	= "imx-keypad",

	.id	= -1,

	.num_resources	= ARRAY_SIZE(mx25_kpp_resources),

	.resource	= mx25_kpp_resources,

};



static struct resource mx25_csi_resources[] = {

	{

		.start	= MX25_CSI_BASE_ADDR,

arch/arm/mach-mx25/devices.h

+0 −2
Original line number Diff line number Diff line 
extern struct platform_device mxc_keypad_device;

extern struct platform_device mx25_rtc_device;

extern struct platform_device mx25_fb_device;

extern struct platform_device mxc_wdt;

extern struct platform_device mx25_kpp_device;

extern struct platform_device mx25_csi_device;

arch/arm/mach-mx25/mach-mx25_3ds.c

+2 −2
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ static const uint32_t mx25pdk_keymap[] = { 
	KEY(3, 3, KEY_POWER),

};



static struct matrix_keymap_data mx25pdk_keymap_data = {

static const struct matrix_keymap_data mx25pdk_keymap_data __initdata = {

	.keymap		= mx25pdk_keymap,

	.keymap_size	= ARRAY_SIZE(mx25pdk_keymap),

};
@@ -200,7 +200,7 @@ static void __init mx25pdk_init(void) 


	mx25pdk_fec_reset();

	imx25_add_fec(&mx25_fec_pdata);

	mxc_register_device(&mx25_kpp_device, &mx25pdk_keymap_data);

	imx25_add_imx_keypad(&mx25pdk_keymap_data);



	imx25_add_esdhc(0, NULL);

}