shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-10 12:57:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

rk29: usb detect plug in/out both

Browse Source
This commit is contained in:
黄涛
2011-04-13 15:09:58 +08:00
parent 6278e9b394
commit eee62cb9f1
5 changed files with 39 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-rk29/board-rk29-ddr3sdk.c
View File

@@ -1855,7 +1855,7 @@ static void __init machine_rk29_board_init(void)
rk29sdk_init_wifi_mem();
#endif
board_usb_detect_init(RK29_PIN0_PA0, IRQF_TRIGGER_FALLING);
board_usb_detect_init(RK29_PIN0_PA0);
}
static void __init machine_rk29_fixup(struct machine_desc *desc, struct tag *tags,

2
arch/arm/mach-rk29/board-rk29-fih.c
View File

@@ -2292,7 +2292,7 @@ static void __init machine_rk29_board_init(void)
rk29sdk_init_wifi_mem();
#endif
board_usb_detect_init(RK29_PIN0_PA0, IRQF_TRIGGER_FALLING);
board_usb_detect_init(RK29_PIN0_PA0);
}
static void __init machine_rk29_fixup(struct machine_desc *desc, struct tag *tags,

2
arch/arm/mach-rk29/board-rk29sdk.c
View File

@@ -1879,7 +1879,7 @@ static void __init machine_rk29_board_init(void)
rk29sdk_init_wifi_mem();
#endif
board_usb_detect_init(RK29_PIN0_PA0, IRQF_TRIGGER_FALLING);
board_usb_detect_init(RK29_PIN0_PA0);
}
static void __init machine_rk29_fixup(struct machine_desc *desc, struct tag *tags,

4
arch/arm/mach-rk29/include/mach/board.h
View File

@@ -252,9 +252,9 @@ enum periph_pll{
/* for USB detection */
#ifdef CONFIG_USB_GADGET
int board_usb_detect_init(unsigned gpio, unsigned long flags);
int board_usb_detect_init(unsigned gpio);
#else
static int inline board_usb_detect_init(unsigned gpio, unsigned long flags) { return 0; }
static int inline board_usb_detect_init(unsigned gpio) { return 0; }
#endif
/* for wakeup Android */

42
arch/arm/mach-rk29/usb_detect.c
View File

@@ -4,26 +4,45 @@
#include <linux/gpio.h>
#include <mach/board.h>
static void do_wakeup(struct work_struct *work)
static irqreturn_t usb_detect_irq_handler(int irq, void *dev_id);
static int detect_gpio = INVALID_GPIO;
static void usb_detect_do_wakeup(struct work_struct *work)
{
int ret;
int irq = gpio_to_irq(detect_gpio);
unsigned long flags;
rk28_send_wakeup_key();
free_irq(irq, NULL);
flags = gpio_get_value(detect_gpio) ? IRQF_TRIGGER_FALLING : IRQF_TRIGGER_RISING;
ret = request_irq(irq, usb_detect_irq_handler, flags, "usb_detect", NULL);
if (ret < 0) {
pr_err("%s: request_irq(%d) failed\n", __func__, irq);
}
}
static DECLARE_DELAYED_WORK(wakeup_work, do_wakeup);
static DECLARE_DELAYED_WORK(wakeup_work, usb_detect_do_wakeup);
static bool wakelock_inited;
static struct wake_lock usb_wakelock;
static irqreturn_t detect_irq_handler(int irq, void *dev_id)
static irqreturn_t usb_detect_irq_handler(int irq, void *dev_id)
{
wake_lock_timeout(&usb_wakelock, 10 * HZ);
wake_lock_timeout(&usb_wakelock, 10 * HZ);
schedule_delayed_work(&wakeup_work, HZ / 10);
return IRQ_HANDLED;
return IRQ_HANDLED;
}
int board_usb_detect_init(unsigned gpio, unsigned long flags)
int board_usb_detect_init(unsigned gpio)
{
int ret;
int irq = gpio_to_irq(gpio);
unsigned long flags;
if (detect_gpio != INVALID_GPIO) {
pr_err("only support call %s once\n", __func__);
return -EINVAL;
}
ret = gpio_request(gpio, "usb_detect");
if (ret < 0) {
@@ -31,14 +50,21 @@ int board_usb_detect_init(unsigned gpio, unsigned long flags)
return ret;
}
if (!wakelock_inited)
if (!wakelock_inited) {
wake_lock_init(&usb_wakelock, WAKE_LOCK_SUSPEND, "usb_detect");
wakelock_inited = true;
}
gpio_direction_input(gpio);
ret = request_irq(irq, detect_irq_handler, flags, "usb_detect", NULL);
detect_gpio = gpio;
flags = gpio_get_value(gpio) ? IRQF_TRIGGER_FALLING : IRQF_TRIGGER_RISING;
ret = request_irq(irq, usb_detect_irq_handler, flags, "usb_detect", NULL);
if (ret < 0) {
pr_err("%s: request_irq(%d) failed\n", __func__, irq);
gpio_free(gpio);
detect_gpio = INVALID_GPIO;
return ret;
}
enable_irq_wake(irq);