Doug / smarc-fsl-linux-kernel

Download as
Browse Code »

Commit 72af5a4b9cc9c4527f2967e0283bee632237c26e

Authored by Philip Rakity
Committed by Anton Vorontsov
1 parent 5ba1fa0ae2
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 3 changed files with 0 additions and 31 deletions Side-by-side Diff

drivers/mfd/max8925-core.c
Diff comments   View file @ 72af5a4
... ... @@ -210,21 +210,6 @@
210 210 .mask_reg = MAX8925_CHG_IRQ1_MASK,
211 211 .offs = 1 << 2,
212 212 },
213   - [MAX8925_IRQ_VCHG_USB_OVP] = {
214   - .reg = MAX8925_CHG_IRQ1,
215   - .mask_reg = MAX8925_CHG_IRQ1_MASK,
216   - .offs = 1 << 3,
217   - },
218   - [MAX8925_IRQ_VCHG_USB_F] = {
219   - .reg = MAX8925_CHG_IRQ1,
220   - .mask_reg = MAX8925_CHG_IRQ1_MASK,
221   - .offs = 1 << 4,
222   - },
223   - [MAX8925_IRQ_VCHG_USB_R] = {
224   - .reg = MAX8925_CHG_IRQ1,
225   - .mask_reg = MAX8925_CHG_IRQ1_MASK,
226   - .offs = 1 << 5,
227   - },
228 213 [MAX8925_IRQ_VCHG_THM_OK_R] = {
229 214 .reg = MAX8925_CHG_IRQ2,
230 215 .mask_reg = MAX8925_CHG_IRQ2_MASK,
drivers/power/max8925_power.c
Diff comments   View file @ 72af5a4
... ... @@ -120,16 +120,6 @@
120 120 __set_charger(info, 0);
121 121 dev_dbg(chip->dev, "Adapter removed\n");
122 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 123 case MAX8925_IRQ_VCHG_THM_OK_F:
134 124 /* Battery is not ready yet */
135 125 dev_dbg(chip->dev, "Battery temperature is out of range\n");
... ... @@ -370,9 +360,6 @@
370 360 REQUEST_IRQ(MAX8925_IRQ_VCHG_DC_F, "ac-remove");
371 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 363 if (!info->no_temp_support) {
377 364 REQUEST_IRQ(MAX8925_IRQ_VCHG_THM_OK_R, "batt-temp-in-range");
378 365 REQUEST_IRQ(MAX8925_IRQ_VCHG_THM_OK_F, "batt-temp-out-range");
include/linux/mfd/max8925.h
Diff comments   View file @ 72af5a4
... ... @@ -167,9 +167,6 @@
167 167 MAX8925_IRQ_VCHG_DC_OVP,
168 168 MAX8925_IRQ_VCHG_DC_F,
169 169 MAX8925_IRQ_VCHG_DC_R,
170   - MAX8925_IRQ_VCHG_USB_OVP,
171   - MAX8925_IRQ_VCHG_USB_F,
172   - MAX8925_IRQ_VCHG_USB_R,
173 170 MAX8925_IRQ_VCHG_THM_OK_R,
174 171 MAX8925_IRQ_VCHG_THM_OK_F,
175 172 MAX8925_IRQ_VCHG_SYSLOW_F,