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

Commit 5309498a authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Sascha Hauer
Browse files

ARM: imx: use imx_add_gpio_keys to register "gpio-keys" devices 



LAKML-Reference: 1302207841-12450-1-git-send-email-u.kleine-koenig@pengutronix.de
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent 9c97f662

arch/arm/mach-imx/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ choice 


config MACH_EUKREA_MBIMXSD25_BASEBOARD

	bool "Eukrea MBIMXSD development board"

	select IMX_HAVE_PLATFORM_GPIO_KEYS

	select IMX_HAVE_PLATFORM_IMX_SSI

	help

	  This adds board specific devices that can be found on Eukrea's
@@ -254,6 +255,7 @@ config MACH_MX27_3DS 
config MACH_IMX27_VISSTRIM_M10

	bool "Vista Silicon i.MX27 Visstrim_m10"

	select SOC_IMX27

	select IMX_HAVE_PLATFORM_GPIO_KEYS

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_SSI

	select IMX_HAVE_PLATFORM_IMX_UART

arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c

+3 −12
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
#include <linux/gpio.h>

#include <linux/leds.h>

#include <linux/platform_device.h>

#include <linux/gpio_keys.h>

#include <linux/input.h>

#include <video/platform_lcd.h>
@@ -208,23 +207,14 @@ static struct gpio_keys_button eukrea_mbimxsd_gpio_buttons[] = { 
	},

};



static struct gpio_keys_platform_data eukrea_mbimxsd_button_data = {

static const struct gpio_keys_platform_data

		eukrea_mbimxsd_button_data __initconst = {

	.buttons	= eukrea_mbimxsd_gpio_buttons,

	.nbuttons	= ARRAY_SIZE(eukrea_mbimxsd_gpio_buttons),

};



static struct platform_device eukrea_mbimxsd_button_device = {

	.name		= "gpio-keys",

	.id		= -1,

	.num_resources	= 0,

	.dev		= {

		.platform_data	= &eukrea_mbimxsd_button_data,

	}

};



static struct platform_device *platform_devices[] __initdata = {

	&eukrea_mbimxsd_leds_gpio,

	&eukrea_mbimxsd_button_device,

	&eukrea_mbimxsd_lcd_powerdev,

};
@@ -299,4 +289,5 @@ void __init eukrea_mbimxsd25_baseboard_init(void) 
				ARRAY_SIZE(eukrea_mbimxsd_i2c_devices));



	platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));

	imx_add_gpio_keys(&eukrea_mbimxsd_button_data);

}

arch/arm/mach-imx/mach-imx27_visstrim_m10.c

+3 −11
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#include <linux/mtd/physmap.h>

#include <linux/i2c.h>

#include <linux/i2c/pca953x.h>

#include <linux/gpio_keys.h>

#include <linux/input.h>

#include <linux/gpio.h>

#include <linux/delay.h>
@@ -130,19 +129,12 @@ static struct gpio_keys_button visstrim_gpio_keys[] = { 
	}

};



static struct gpio_keys_platform_data visstrim_gpio_keys_platform_data = {

static const struct gpio_keys_platform_data

		visstrim_gpio_keys_platform_data __initconst = {

	.buttons	= visstrim_gpio_keys,

	.nbuttons	= ARRAY_SIZE(visstrim_gpio_keys),

};



static struct platform_device visstrim_gpio_keys_device = {

	.name	= "gpio-keys",

	.id	= -1,

	.dev	= {

		.platform_data	= &visstrim_gpio_keys_platform_data,

	},

};



/* Visstrim_SM10 has a microSD slot connected to sdhc1 */

static int visstrim_m10_sdhc1_init(struct device *dev,

		irq_handler_t detect_irq, void *data)
@@ -186,7 +178,6 @@ static struct platform_device visstrim_m10_nor_mtd_device = { 
};



static struct platform_device *platform_devices[] __initdata = {

	&visstrim_gpio_keys_device,

	&visstrim_m10_nor_mtd_device,

};
@@ -255,6 +246,7 @@ static void __init visstrim_m10_board_init(void) 
	imx27_add_mxc_mmc(0, &visstrim_m10_sdhc_pdata);

	imx27_add_mxc_ehci_otg(&visstrim_m10_usbotg_pdata);

	imx27_add_fec(NULL);

	imx_add_gpio_keys(&visstrim_gpio_keys_platform_data);

	platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));

}

arch/arm/mach-mx3/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ config MACH_PCM037 
config MACH_PCM037_EET

	bool "Support pcm037 EET board extensions"

	depends on MACH_PCM037

	select IMX_HAVE_PLATFORM_GPIO_KEYS

	select IMX_HAVE_PLATFORM_SPI_IMX

	help

	  Add support for PCM037 EET baseboard extensions. If you are using the
@@ -168,6 +169,7 @@ config MACH_PCM043 
config MACH_ARMADILLO5X0

	bool "Support Atmark Armadillo-500 Development Base Board"

	select SOC_IMX31

	select IMX_HAVE_PLATFORM_GPIO_KEYS

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MXC_EHCI
@@ -233,6 +235,7 @@ choice 


config MACH_EUKREA_MBIMXSD35_BASEBOARD

	bool "Eukrea MBIMXSD development board"

	select IMX_HAVE_PLATFORM_GPIO_KEYS

	select IMX_HAVE_PLATFORM_IMX_SSI

	help

	  This adds board specific devices that can be found on Eukrea's
@@ -244,6 +247,7 @@ config MACH_VPR200 
	bool "Support VPR200 platform"

	select SOC_IMX35

	select IMX_HAVE_PLATFORM_FSL_USB2_UDC

	select IMX_HAVE_PLATFORM_GPIO_KEYS

	select IMX_HAVE_PLATFORM_IMX2_WDT

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_IMX_I2C

arch/arm/mach-mx3/eukrea_mbimxsd-baseboard.c

+3 −12
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <linux/interrupt.h>

#include <linux/leds.h>

#include <linux/platform_device.h>

#include <linux/gpio_keys.h>

#include <linux/input.h>

#include <video/platform_lcd.h>

#include <linux/i2c.h>
@@ -223,23 +222,14 @@ static struct gpio_keys_button eukrea_mbimxsd_gpio_buttons[] = { 
	},

};



static struct gpio_keys_platform_data eukrea_mbimxsd_button_data = {

static const struct gpio_keys_platform_data

		eukrea_mbimxsd_button_data __initconst = {

	.buttons	= eukrea_mbimxsd_gpio_buttons,

	.nbuttons	= ARRAY_SIZE(eukrea_mbimxsd_gpio_buttons),

};



static struct platform_device eukrea_mbimxsd_button_device = {

	.name		= "gpio-keys",

	.id		= -1,

	.num_resources	= 0,

	.dev		= {

		.platform_data	= &eukrea_mbimxsd_button_data,

	}

};



static struct platform_device *platform_devices[] __initdata = {

	&eukrea_mbimxsd_leds_gpio,

	&eukrea_mbimxsd_button_device,

	&eukrea_mbimxsd_lcd_powerdev,

};
@@ -315,4 +305,5 @@ void __init eukrea_mbimxsd35_baseboard_init(void) 
				ARRAY_SIZE(eukrea_mbimxsd_i2c_devices));



	platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));

	imx_add_gpio_keys(&eukrea_mbimxsd_button_data);

}