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

Commit 2463ef22 authored by Michael Hennerich's avatar Michael Hennerich Committed by Bryan Wu
Browse files

[Blackfin] arch: replace current blackfin specific pfbutton driver with kernel... 


[Blackfin] arch: replace current blackfin specific pfbutton driver with kernel generic gpio key driver

Signed-off-by: default avatarMichael Hennerich <michael.hennerich@analog.com>
Signed-off-by: default avatarBryan Wu <bryan.wu@analog.com>
parent 6fce6a8d

arch/blackfin/mach-bf533/boards/ezkit.c

+28 −0
Original line number Diff line number Diff line
@@ -256,6 +256,30 @@ static struct platform_device bfin_pata_device = { 
};

#endif



#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)

#include <linux/input.h>

#include <linux/gpio_keys.h>



static struct gpio_keys_button bfin_gpio_keys_table[] = {

	{BTN_0, GPIO_PF7, 1, "gpio-keys: BTN0"},

	{BTN_1, GPIO_PF8, 1, "gpio-keys: BTN1"},

	{BTN_2, GPIO_PF9, 1, "gpio-keys: BTN2"},

	{BTN_3, GPIO_PF10, 1, "gpio-keys: BTN3"},

};



static struct gpio_keys_platform_data bfin_gpio_keys_data = {

	.buttons        = bfin_gpio_keys_table,

	.nbuttons       = ARRAY_SIZE(bfin_gpio_keys_table),

};



static struct platform_device bfin_device_gpiokeys = {

	.name      = "gpio-keys",

	.dev = {

		.platform_data = &bfin_gpio_keys_data,

	},

};

#endif



static struct platform_device *ezkit_devices[] __initdata = {

#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)

	&smc91x_device,
@@ -280,6 +304,10 @@ static struct platform_device *ezkit_devices[] __initdata = { 
#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)

	&bfin_pata_device,

#endif



#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)

	&bfin_device_gpiokeys,

#endif

};



static int __init ezkit_init(void)

arch/blackfin/mach-bf533/boards/stamp.c

+27 −0
Original line number Diff line number Diff line
@@ -373,6 +373,29 @@ static struct platform_device bfin_pata_device = { 
};

#endif



#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)

#include <linux/input.h>

#include <linux/gpio_keys.h>



static struct gpio_keys_button bfin_gpio_keys_table[] = {

	{BTN_0, GPIO_PF5, 1, "gpio-keys: BTN0"},

	{BTN_1, GPIO_PF6, 1, "gpio-keys: BTN1"},

	{BTN_2, GPIO_PF8, 1, "gpio-keys: BTN2"},

};



static struct gpio_keys_platform_data bfin_gpio_keys_data = {

	.buttons        = bfin_gpio_keys_table,

	.nbuttons       = ARRAY_SIZE(bfin_gpio_keys_table),

};



static struct platform_device bfin_device_gpiokeys = {

	.name      = "gpio-keys",

	.dev = {

		.platform_data = &bfin_gpio_keys_data,

	},

};

#endif



static struct platform_device *stamp_devices[] __initdata = {

#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)

	&rtc_device,
@@ -406,6 +429,10 @@ static struct platform_device *stamp_devices[] __initdata = { 
#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)

	&bfin_pata_device,

#endif



#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)

	&bfin_device_gpiokeys,

#endif

};



static int __init stamp_init(void)

arch/blackfin/mach-bf537/boards/stamp.c

+28 −0
Original line number Diff line number Diff line
@@ -103,6 +103,30 @@ void __exit bfin_isp1761_exit(void) 
arch_initcall(bfin_isp1761_init);

#endif



#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)

#include <linux/input.h>

#include <linux/gpio_keys.h>



static struct gpio_keys_button bfin_gpio_keys_table[] = {

	{BTN_0, GPIO_PF2, 1, "gpio-keys: BTN0"},

	{BTN_1, GPIO_PF3, 1, "gpio-keys: BTN1"},

	{BTN_2, GPIO_PF4, 1, "gpio-keys: BTN2"},

	{BTN_3, GPIO_PF5, 1, "gpio-keys: BTN3"},

};



static struct gpio_keys_platform_data bfin_gpio_keys_data = {

	.buttons        = bfin_gpio_keys_table,

	.nbuttons       = ARRAY_SIZE(bfin_gpio_keys_table),

};



static struct platform_device bfin_device_gpiokeys = {

	.name      = "gpio-keys",

	.dev = {

		.platform_data = &bfin_gpio_keys_data,

	},

};

#endif



#if defined(CONFIG_BFIN_CFPCMCIA) || defined(CONFIG_BFIN_CFPCMCIA_MODULE)

static struct resource bfin_pcmcia_cf_resources[] = {

	{
@@ -738,6 +762,10 @@ static struct platform_device *stamp_devices[] __initdata = { 
#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)

	&bfin_pata_device,

#endif



#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)

	&bfin_device_gpiokeys,

#endif

};



static int __init stamp_init(void)

arch/blackfin/mach-bf548/boards/ezkit.c

+27 −0
Original line number Diff line number Diff line
@@ -514,6 +514,29 @@ static struct platform_device i2c_bfin_twi1_device = { 
#endif

#endif



#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)

#include <linux/gpio_keys.h>



static struct gpio_keys_button bfin_gpio_keys_table[] = {

	{BTN_0, GPIO_PB8, 1, "gpio-keys: BTN0"},

	{BTN_1, GPIO_PB9, 1, "gpio-keys: BTN1"},

	{BTN_2, GPIO_PB10, 1, "gpio-keys: BTN2"},

	{BTN_3, GPIO_PB11, 1, "gpio-keys: BTN3"},

};



static struct gpio_keys_platform_data bfin_gpio_keys_data = {

	.buttons        = bfin_gpio_keys_table,

	.nbuttons       = ARRAY_SIZE(bfin_gpio_keys_table),

};



static struct platform_device bfin_device_gpiokeys = {

	.name      = "gpio-keys",

	.dev = {

		.platform_data = &bfin_gpio_keys_data,

	},

};

#endif



static struct platform_device *ezkit_devices[] __initdata = {

#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)

	&rtc_device,
@@ -562,6 +585,10 @@ static struct platform_device *ezkit_devices[] __initdata = { 
	&i2c_bfin_twi1_device,

#endif

#endif



#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)

	&bfin_device_gpiokeys,

#endif

};



static int __init stamp_init(void)

arch/blackfin/mach-bf561/boards/ezkit.c

+30 −0
Original line number Diff line number Diff line
@@ -246,6 +246,30 @@ static struct platform_device bfin_pata_device = { 
};

#endif



#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)

#include <linux/input.h>

#include <linux/gpio_keys.h>



static struct gpio_keys_button bfin_gpio_keys_table[] = {

	{BTN_0, GPIO_PF5, 1, "gpio-keys: BTN0"},

	{BTN_1, GPIO_PF6, 1, "gpio-keys: BTN1"},

	{BTN_2, GPIO_PF7, 1, "gpio-keys: BTN2"},

	{BTN_3, GPIO_PF8, 1, "gpio-keys: BTN3"},

};



static struct gpio_keys_platform_data bfin_gpio_keys_data = {

	.buttons        = bfin_gpio_keys_table,

	.nbuttons       = ARRAY_SIZE(bfin_gpio_keys_table),

};



static struct platform_device bfin_device_gpiokeys = {

	.name      = "gpio-keys",

	.dev = {

		.platform_data = &bfin_gpio_keys_data,

	},

};

#endif



static struct platform_device *ezkit_devices[] __initdata = {

#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)

	&smc91x_device,
@@ -258,12 +282,18 @@ static struct platform_device *ezkit_devices[] __initdata = { 
#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)

	&bfin_spi0_device,

#endif



#if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)

	&bfin_uart_device,

#endif



#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)

	&bfin_pata_device,

#endif



#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)

	&bfin_device_gpiokeys,

#endif

};



static int __init ezkit_init(void)