The patch titled
i2c: build fixes: tps65010
has been added to the -mm tree. Its filename is
i2c-build-fixes-tps65010.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: i2c: build fixes: tps65010
From: David Brownell <david-b@xxxxxxxxxxx>
The tps65010.c driver in the main tree never got updated with build fixes
since the last batch of I2C driver changes; and the genirq trigger flags
were updated wierdly too.
Signed-off-by: David Brownell <dbrownell@xxxxxxxxxxxxxxxxxxxxx>
Cc: Jean Delvare <khali@xxxxxxxxxxxx>
Cc: Greg KH <greg@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/i2c/chips/tps65010.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff -puN drivers/i2c/chips/tps65010.c~i2c-build-fixes-tps65010 drivers/i2c/chips/tps65010.c
--- a/drivers/i2c/chips/tps65010.c~i2c-build-fixes-tps65010
+++ a/drivers/i2c/chips/tps65010.c
@@ -43,13 +43,12 @@
/*-------------------------------------------------------------------------*/
#define DRIVER_VERSION "2 May 2005"
-#define DRIVER_NAME (tps65010_driver.name)
+#define DRIVER_NAME (tps65010_driver.driver.name)
MODULE_DESCRIPTION("TPS6501x Power Management Driver");
MODULE_LICENSE("GPL");
static unsigned short normal_i2c[] = { 0x48, /* 0x49, */ I2C_CLIENT_END };
-static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
I2C_CLIENT_INSMOD;
@@ -520,15 +519,16 @@ tps65010_probe(struct i2c_adapter *bus,
goto fail1;
}
+ /* IRQ is active low, but some gpio lines can't support that */
+ irqflags = IRQF_SAMPLE_RANDOM;
#ifdef CONFIG_ARM
- irqflags = IRQF_SAMPLE_RANDOM | IRQF_TRIGGER_LOW;
if (machine_is_omap_h2()) {
tps->model = TPS65010;
omap_cfg_reg(W4_GPIO58);
tps->irq = OMAP_GPIO_IRQ(58);
omap_request_gpio(58);
omap_set_gpio_direction(58, 1);
- irqflags |= IRQF_TRIGGER_FALLING;
+ irqflags |= IRQF_TRIGGER_LOW;
}
if (machine_is_omap_osk()) {
tps->model = TPS65010;
@@ -543,8 +543,6 @@ tps65010_probe(struct i2c_adapter *bus,
// FIXME set up this board's IRQ ...
}
-#else
- irqflags = IRQF_SAMPLE_RANDOM;
#endif
if (tps->irq > 0) {
_
Patches currently in -mm which might be from david-b@xxxxxxxxxxx are
origin.patch
i2c-build-fixes-tps65010.patch
git-pcmcia.patch
fix-broken-dubious-driver-suspend-methods.patch
pm-define-pm_event_prethaw.patch
pm-pci-and-ide-handle-pm_event_prethaw.patch
pm-video-drivers-and-pm_event_prethaw.patch
pm-usb-hcds-use-pm_event_prethaw.patch
pm-issue-pm_event_prethaw.patch
net1080-inherent-pad-length.patch
properly-unregister-reboot-notifier-in-case-of-failure-in-ehci-hcd.patch
ide-reprogram-disk-pio-timings-on-resume.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
