1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-28 22:20:18 +02:00

update power button patch

This commit is contained in:
Xiangfu Liu 2009-10-05 23:38:53 +08:00
parent e818ccc989
commit d89fdafa97

View File

@ -11,19 +11,19 @@ index 2c3260f..aa461bd 100644
#define GPIO_AMP_EN JZ_GPIO_PORTD(4) #define GPIO_AMP_EN JZ_GPIO_PORTD(4)
diff --git a/arch/mips/jz4740/platform.c b/arch/mips/jz4740/platform.c diff --git a/arch/mips/jz4740/platform.c b/arch/mips/jz4740/platform.c
index dc7a832..16a0008 100644 index 81cfcb4..9cace99 100644
--- a/arch/mips/jz4740/platform.c --- a/arch/mips/jz4740/platform.c
+++ b/arch/mips/jz4740/platform.c +++ b/arch/mips/jz4740/platform.c
@@ -21,6 +21,8 @@ @@ -21,6 +21,8 @@
#include <linux/spi/spi_gpio.h> #include <linux/spi/spi_gpio.h>
#include <linux/power_supply.h> #include <linux/power_supply.h>
#include <linux/jz4740_batt.h> #include <linux/power/jz4740-battery.h>
+#include <linux/input.h> +#include <linux/input.h>
+#include <linux/gpio_keys.h> +#include <linux/gpio_keys.h>
#include <asm/jzsoc.h> #include <asm/jzsoc.h>
#include <asm/gpio.h> #include <asm/gpio.h>
@@ -492,6 +494,30 @@ static struct platform_device batt_gpio_device = { @@ -513,6 +515,29 @@ static struct platform_device jz_battery_device = {
}, },
}; };
@ -33,7 +33,7 @@ index dc7a832..16a0008 100644
+ .code = KEY_POWER, + .code = KEY_POWER,
+ .gpio = GPIO_WAKEUP_N, + .gpio = GPIO_WAKEUP_N,
+ .active_low = 1, + .active_low = 1,
+ .desc = "power button", + .desc = "Power",
+ }, + },
+}; +};
+ +
@ -46,18 +46,17 @@ index dc7a832..16a0008 100644
+ .name = "gpio-keys", + .name = "gpio-keys",
+ .id = -1, + .id = -1,
+ .dev = { + .dev = {
+ .platform_data = (void *) &qi_lb60_gpio_keys_data, + .platform_data = &qi_lb60_gpio_keys_data,
+ } + }
+}; +};
+
+ +
/* All */ /* All */
static struct platform_device *jz_platform_devices[] __initdata = { static struct platform_device *jz_platform_devices[] __initdata = {
&jz_usb_ohci_device, &jz_usb_ohci_device,
@@ -506,6 +532,7 @@ static struct platform_device *jz_platform_devices[] __initdata = { @@ -528,6 +553,7 @@ static struct platform_device *jz_platform_devices[] __initdata = {
&jz_codec_device,
&jz_rtc_device, &jz_rtc_device,
&batt_gpio_device, &jz_adc_device,
&jz_battery_device,
+ &qi_lb60_gpio_keys, + &qi_lb60_gpio_keys,
}; };