diff options
author | Philip Rakity <prakity@marvell.com> | 2011-11-25 14:11:06 -0500 |
---|---|---|
committer | Anton Vorontsov <cbouatmailru@gmail.com> | 2011-11-25 14:24:45 -0500 |
commit | 72af5a4b9cc9c4527f2967e0283bee632237c26e (patch) | |
tree | f355e9bfd3421d68f1befdb237df6979c1d5196e /drivers/power/max8925_power.c | |
parent | 5ba1fa0ae288e93179d54e3c59b2241eb1709f0c (diff) |
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/max8925_power.c')
-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) | |||
120 | __set_charger(info, 0); | 120 | __set_charger(info, 0); |
121 | dev_dbg(chip->dev, "Adapter removed\n"); | 121 | dev_dbg(chip->dev, "Adapter removed\n"); |
122 | break; | 122 | break; |
123 | case MAX8925_IRQ_VCHG_USB_R: | ||
124 | info->usb_online = 1; | ||
125 | __set_charger(info, 1); | ||
126 | dev_dbg(chip->dev, "USB inserted\n"); | ||
127 | break; | ||
128 | case MAX8925_IRQ_VCHG_USB_F: | ||
129 | info->usb_online = 0; | ||
130 | __set_charger(info, 0); | ||
131 | dev_dbg(chip->dev, "USB removed\n"); | ||
132 | break; | ||
133 | case MAX8925_IRQ_VCHG_THM_OK_F: | 123 | case MAX8925_IRQ_VCHG_THM_OK_F: |
134 | /* Battery is not ready yet */ | 124 | /* Battery is not ready yet */ |
135 | dev_dbg(chip->dev, "Battery temperature is out of range\n"); | 125 | 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, | |||
370 | REQUEST_IRQ(MAX8925_IRQ_VCHG_DC_F, "ac-remove"); | 360 | REQUEST_IRQ(MAX8925_IRQ_VCHG_DC_F, "ac-remove"); |
371 | REQUEST_IRQ(MAX8925_IRQ_VCHG_DC_R, "ac-insert"); | 361 | REQUEST_IRQ(MAX8925_IRQ_VCHG_DC_R, "ac-insert"); |
372 | } | 362 | } |
373 | REQUEST_IRQ(MAX8925_IRQ_VCHG_USB_OVP, "usb-ovp"); | ||
374 | REQUEST_IRQ(MAX8925_IRQ_VCHG_USB_F, "usb-remove"); | ||
375 | REQUEST_IRQ(MAX8925_IRQ_VCHG_USB_R, "usb-insert"); | ||
376 | if (!info->no_temp_support) { | 363 | if (!info->no_temp_support) { |
377 | REQUEST_IRQ(MAX8925_IRQ_VCHG_THM_OK_R, "batt-temp-in-range"); | 364 | REQUEST_IRQ(MAX8925_IRQ_VCHG_THM_OK_R, "batt-temp-in-range"); |
378 | REQUEST_IRQ(MAX8925_IRQ_VCHG_THM_OK_F, "batt-temp-out-range"); | 365 | REQUEST_IRQ(MAX8925_IRQ_VCHG_THM_OK_F, "batt-temp-out-range"); |