diff options
| author | Philip Rakity <prakity@marvell.com> | 2011-11-25 23:11:06 +0400 |
|---|---|---|
| committer | Anton Vorontsov <cbouatmailru@gmail.com> | 2011-11-25 23:24:45 +0400 |
| commit | 72af5a4b9cc9c4527f2967e0283bee632237c26e (patch) | |
| tree | f355e9bfd3421d68f1befdb237df6979c1d5196e /drivers/power | |
| parent | 5ba1fa0ae288e93179d54e3c59b2241eb1709f0c (diff) | |
| download | linux-stable-72af5a4b9cc9c4527f2967e0283bee632237c26e.tar.gz linux-stable-72af5a4b9cc9c4527f2967e0283bee632237c26e.tar.bz2 linux-stable-72af5a4b9cc9c4527f2967e0283bee632237c26e.zip | |
max8925_power: Remove support for irq bits that do not exist
The max8925 cannot return usb status. The bits
[MAX8925_IRQ_VCHG_USB_OVP] = {
.reg = MAX8925_CHG_IRQ1,
.mask_reg = MAX8925_CHG_IRQ1_MASK,
.offs = 1 << 3,
},
[MAX8925_IRQ_VCHG_USB_F] = {
.reg = MAX8925_CHG_IRQ1,
.mask_reg = MAX8925_CHG_IRQ1_MASK,
.offs = 1 << 4,
},
[MAX8925_IRQ_VCHG_USB_R] = {
.reg = MAX8925_CHG_IRQ1,
.mask_reg = MAX8925_CHG_IRQ1_MASK,
.offs = 1 << 5,
},
do not exist in the irq register.
Signed-off-by: Philip Rakity <prakity@marvell.com>
Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/max8925_power.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/drivers/power/max8925_power.c b/drivers/power/max8925_power.c index be2d563cb315..cbc7a0b6da52 100644 --- a/drivers/power/max8925_power.c +++ b/drivers/power/max8925_power.c @@ -120,16 +120,6 @@ static irqreturn_t max8925_charger_handler(int irq, void *data) __set_charger(info, 0); dev_dbg(chip->dev, "Adapter removed\n"); break; - case MAX8925_IRQ_VCHG_USB_R: - info->usb_online = 1; - __set_charger(info, 1); - dev_dbg(chip->dev, "USB inserted\n"); - break; - case MAX8925_IRQ_VCHG_USB_F: - info->usb_online = 0; - __set_charger(info, 0); - dev_dbg(chip->dev, "USB removed\n"); - break; case MAX8925_IRQ_VCHG_THM_OK_F: /* Battery is not ready yet */ dev_dbg(chip->dev, "Battery temperature is out of range\n"); @@ -370,9 +360,6 @@ static __devinit int max8925_init_charger(struct max8925_chip *chip, REQUEST_IRQ(MAX8925_IRQ_VCHG_DC_F, "ac-remove"); REQUEST_IRQ(MAX8925_IRQ_VCHG_DC_R, "ac-insert"); } - REQUEST_IRQ(MAX8925_IRQ_VCHG_USB_OVP, "usb-ovp"); - REQUEST_IRQ(MAX8925_IRQ_VCHG_USB_F, "usb-remove"); - REQUEST_IRQ(MAX8925_IRQ_VCHG_USB_R, "usb-insert"); if (!info->no_temp_support) { REQUEST_IRQ(MAX8925_IRQ_VCHG_THM_OK_R, "batt-temp-in-range"); REQUEST_IRQ(MAX8925_IRQ_VCHG_THM_OK_F, "batt-temp-out-range"); |