github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 14:42:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

rk: usb_detect: mark board_usb_detect_init as __init, use irq_set_irq_type support both edge trigger

Browse Source
This commit is contained in:
黄涛 2012-08-21 09:36:17 +08:00
parent 62669068b8
commit ebfe38927f
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/plat-rk/include/plat/board.h
View File

@ -190,7 +190,7 @@ int board_boot_mode(void);
/* for USB detection */
#ifdef CONFIG_USB_GADGET
int board_usb_detect_init(unsigned gpio);
int __init board_usb_detect_init(unsigned gpio);
#else
static int inline board_usb_detect_init(unsigned gpio) { return 0; }
#endif

12
arch/arm/plat-rk/usb_detect.c
View File

@ -1,6 +1,7 @@
#include <linux/wakelock.h>
#include <linux/workqueue.h>
#include <linux/interrupt.h>
#include <linux/irq.h>
#include <linux/gpio.h>
#include <mach/board.h>
@ -13,14 +14,13 @@ static void usb_detect_do_wakeup(struct work_struct *work)
{
int ret;
int irq = gpio_to_irq(detect_gpio);
unsigned long flags;
unsigned int type;
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);
type = gpio_get_value(detect_gpio) ? IRQ_TYPE_EDGE_FALLING : IRQ_TYPE_EDGE_RISING;
ret = irq_set_irq_type(irq, type);
if (ret < 0) {
pr_err("%s: request_irq(%d) failed\n", __func__, irq);
pr_err("%s: irq_set_irq_type(%d, %d) failed\n", __func__, irq, type);
}
}
@ -35,7 +35,7 @@ static irqreturn_t usb_detect_irq_handler(int irq, void *dev_id)
return IRQ_HANDLED;
}
int board_usb_detect_init(unsigned gpio)
int __init board_usb_detect_init(unsigned gpio)
{
int ret;
int irq = gpio_to_irq(gpio);