From: David Brownell Date: Thu, 20 Nov 2008 01:28:58 +0000 (-0800) Subject: twl4030 power button irq X-Git-Tag: v2.6.28-omap1~109 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b2ce22723422c30013a23647df0c6e4a9402e2f5;p=linux-2.6-omap-h63xx.git twl4030 power button irq Disable the TWL4030_PWRIRQ_PWRBTN symbol from the system headers; initialization of the power button handler still needs work, so an equivalent symbol is defined in its driver. Power IRQs now properly handle trigger specs from request_irq(); stop goofing with registers reserved to the IRQ infrastructure. Minor cleanup: switch several messages to pr_debug(). Signed-off-by: David Brownell Signed-off-by: Tony Lindgren --- diff --git a/drivers/i2c/chips/twl4030-pwrbutton.c b/drivers/i2c/chips/twl4030-pwrbutton.c index cd4d06e8c96..1d9cb901696 100644 --- a/drivers/i2c/chips/twl4030-pwrbutton.c +++ b/drivers/i2c/chips/twl4030-pwrbutton.c @@ -29,18 +29,16 @@ #include #include -#define PWR_ISR1 0 -#define PWR_IMR1 1 + #define PWR_PWRON_IRQ (1<<0) -#define PWR_EDR1 5 -#define PWR_PWRON_RISING (1<<1) -#define PWR_PWRON_FALLING (1<<0) -#define PWR_PWRON_BOTH (PWR_PWRON_RISING | PWR_PWRON_FALLING) +#define STS_HW_CONDITIONS 0xf -#define PWR_SIH_CTRL 7 -#define STS_HW_CONDITIONS 0xf +/* FIXME have this constant delivered to us as part of the + * twl4030-core setup ... + */ +#define TWL4030_PWRIRQ_PWRBTN (TWL4030_PWR_IRQ_BASE + 0) static struct input_dev *powerbutton_dev; @@ -73,20 +71,19 @@ static irqreturn_t powerbutton_irq(int irq, void *dev_id) static int __init twl4030_pwrbutton_init(void) { int err = 0; - u8 value; /* PWRBTN == PWRON */ - if (request_irq(TWL4030_PWRIRQ_PWRBTN, powerbutton_irq, 0, - "PwrButton", NULL) < 0) { - printk(KERN_ERR "Unable to allocate IRQ for power button\n"); - err = -EBUSY; + err = request_irq(TWL4030_PWRIRQ_PWRBTN, powerbutton_irq, + IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING, + "PwrButton", NULL); + if (err < 0) { + pr_debug("Can't get IRQ for power button: %d\n", err); goto out; } powerbutton_dev = input_allocate_device(); if (!powerbutton_dev) { - printk(KERN_ERR - "Unable to allocate input device for power button\n"); + pr_debug("Can't allocate power button\n"); err = -ENOMEM; goto free_irq_and_out; } @@ -97,26 +94,7 @@ static int __init twl4030_pwrbutton_init(void) err = input_register_device(powerbutton_dev); if (err) { - input_free_device(powerbutton_dev); - goto free_irq_and_out; - } - - /* FIXME just pass IRQF_EDGE_FALLING | IRQF_EDGE_RISING - * to request_irq(), once MODULE_INT supports them... - */ - err = twl4030_i2c_read_u8(TWL4030_MODULE_INT, &value, PWR_EDR1); - if (err) { - printk(KERN_WARNING "I2C error %d while reading TWL4030" - " INT PWR_EDR1 register\n", err); - goto free_input_dev; - } - - err = twl4030_i2c_write_u8(TWL4030_MODULE_INT, - value | PWR_PWRON_BOTH, PWR_EDR1); - - if (err) { - printk(KERN_WARNING "I2C error %d while writing TWL4030" - " INT PWR_EDR1 register\n", err); + pr_debug("Can't register power button: %d\n", err); goto free_input_dev; } @@ -126,7 +104,7 @@ static int __init twl4030_pwrbutton_init(void) free_input_dev: - input_unregister_device(powerbutton_dev); + input_free_device(powerbutton_dev); free_irq_and_out: free_irq(TWL4030_PWRIRQ_PWRBTN, NULL); out: diff --git a/include/linux/i2c/twl4030.h b/include/linux/i2c/twl4030.h index fd123ce150e..f2615857985 100644 --- a/include/linux/i2c/twl4030.h +++ b/include/linux/i2c/twl4030.h @@ -379,7 +379,7 @@ int twl4030_sih_setup(int module); /* #define TWL4030_MODIRQ_USB (TWL4030_IRQ_BASE + 4) */ /* #define TWL4030_MODIRQ_PWR (TWL4030_IRQ_BASE + 5) */ -#define TWL4030_PWRIRQ_PWRBTN (TWL4030_PWR_IRQ_BASE + 0) +/* #define TWL4030_PWRIRQ_PWRBTN (TWL4030_PWR_IRQ_BASE + 0) */ /* #define TWL4030_PWRIRQ_CHG_PRES (TWL4030_PWR_IRQ_BASE + 1) */ /* #define TWL4030_PWRIRQ_USB_PRES (TWL4030_PWR_IRQ_BASE + 2) */ /* #define TWL4030_PWRIRQ_RTC (TWL4030_PWR_IRQ_BASE + 3) */