diff options
| author | Doug Anderson <dianders@chromium.org> | 2014-04-17 01:12:25 +0200 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2014-04-23 13:23:25 +0200 |
| commit | 7d811771c95ebab358eca8e68b53efe09e3a6a96 (patch) | |
| tree | 0d9bac5ed6bd011c560f8383a9adc203076246a0 /drivers | |
| parent | Linux 3.15-rc2 (diff) | |
| download | linux-7d811771c95ebab358eca8e68b53efe09e3a6a96.tar.xz linux-7d811771c95ebab358eca8e68b53efe09e3a6a96.zip | |
mfd: tps65090: Don't tell child devices we have an IRQ if we don't
If we weren't given an interrupt we shouldn't tell child devices (like
the tps65090 charger) that they have an interrupt. This is needed so
that we can support polling mode in the tps65090 charger driver.
See also (charger: tps65090: Allow charger module to be used when no
irq).
Signed-off-by: Doug Anderson <dianders@chromium.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mfd/tps65090.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/drivers/mfd/tps65090.c b/drivers/mfd/tps65090.c index ba1a25d758c1..c3cddb4c3a1a 100644 --- a/drivers/mfd/tps65090.c +++ b/drivers/mfd/tps65090.c @@ -64,11 +64,16 @@ static struct resource charger_resources[] = { } }; -static const struct mfd_cell tps65090s[] = { - { +enum tps65090_cells { + PMIC = 0, + CHARGER = 1, +}; + +static struct mfd_cell tps65090s[] = { + [PMIC] = { .name = "tps65090-pmic", }, - { + [CHARGER] = { .name = "tps65090-charger", .num_resources = ARRAY_SIZE(charger_resources), .resources = &charger_resources[0], @@ -211,6 +216,9 @@ static int tps65090_i2c_probe(struct i2c_client *client, "IRQ init failed with err: %d\n", ret); return ret; } + } else { + /* Don't tell children they have an IRQ that'll never fire */ + tps65090s[CHARGER].num_resources = 0; } ret = mfd_add_devices(tps65090->dev, -1, tps65090s, |