Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'mfd-fixes-3.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-fixes
Pull MFD fixes from Samuel Ortiz:
"This is the first batch of MFD fixes for 3.9.
With this one we have:
- An ab8500 build failure fix.
- An ab8500 device tree parsing fix.
- A fix for twl4030_madc remove routine to work properly (when
built-in).
- A fix for properly registering palmas interrupt handler.
- A fix for omap-usb init routine to actually write into the
hostconfig register.
- A couple of warning fixes for ab8500-gpadc and tps65912"
* tag 'mfd-fixes-3.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-fixes:
mfd: twl4030-madc: Remove __exit_p annotation
mfd: ab8500: Kill "reg" property from binding
mfd: ab8500-gpadc: Complain if we fail to enable vtvout LDO
mfd: wm831x: Don't forward declare enum wm831x_auxadc
mfd: twl4030-audio: Fix argument type for twl4030_audio_disable_resource()
mfd: tps65912: Declare and use tps65912_irq_exit()
mfd: palmas: Provide irq flags through DT/platform data
mfd: Make AB8500_CORE select POWER_SUPPLY to fix build error
mfd: omap-usb-host: Actually update hostconfig
+63
-23
+1
-5
Documentation/devicetree/bindings/mfd/ab8500.txt
+1
-5
Documentation/devicetree/bindings/mfd/ab8500.txt
···
13
13
4 = active high level-sensitive
14
14
8 = active low level-sensitive
15
15
16
-
Optional parent device properties:
17
-
- reg : contains the PRCMU mailbox address for the AB8500 i2c port
18
-
19
16
The AB8500 consists of a large and varied group of sub-devices:
20
17
21
18
Device IRQ Names Supply Names Description
···
83
86
- stericsson,amic2-bias-vamic1 : Analoge Mic wishes to use a non-standard Vamic
84
87
- stericsson,earpeice-cmv : Earpeice voltage (only: 950 | 1100 | 1270 | 1580)
85
88
86
-
ab8500@5 {
89
+
ab8500 {
87
90
compatible = "stericsson,ab8500";
88
-
reg = <5>; /* mailbox 5 is i2c */
89
91
interrupts = <0 40 0x4>;
90
92
interrupt-controller;
91
93
#interrupt-cells = <2>;
+1
-2
arch/arm/boot/dts/dbx5x0.dtsi
+1
-2
arch/arm/boot/dts/dbx5x0.dtsi
+1
-1
arch/arm/boot/dts/href.dtsi
+1
-1
arch/arm/boot/dts/href.dtsi
+1
-1
arch/arm/boot/dts/hrefv60plus.dts
+1
-1
arch/arm/boot/dts/hrefv60plus.dts
+1
-1
arch/arm/boot/dts/snowball.dts
+1
-1
arch/arm/boot/dts/snowball.dts
+1
drivers/mfd/Kconfig
+1
drivers/mfd/Kconfig
+13
-4
drivers/mfd/ab8500-gpadc.c
+13
-4
drivers/mfd/ab8500-gpadc.c
···
594
594
static int ab8500_gpadc_runtime_resume(struct device *dev)
595
595
{
596
596
struct ab8500_gpadc *gpadc = dev_get_drvdata(dev);
597
+
int ret;
597
598
598
-
regulator_enable(gpadc->regu);
599
-
return 0;
599
+
ret = regulator_enable(gpadc->regu);
600
+
if (ret)
601
+
dev_err(dev, "Failed to enable vtvout LDO: %d\n", ret);
602
+
return ret;
600
603
}
601
604
602
605
static int ab8500_gpadc_runtime_idle(struct device *dev)
···
646
643
}
647
644
648
645
/* VTVout LDO used to power up ab8500-GPADC */
649
-
gpadc->regu = regulator_get(&pdev->dev, "vddadc");
646
+
gpadc->regu = devm_regulator_get(&pdev->dev, "vddadc");
650
647
if (IS_ERR(gpadc->regu)) {
651
648
ret = PTR_ERR(gpadc->regu);
652
649
dev_err(gpadc->dev, "failed to get vtvout LDO\n");
···
655
652
656
653
platform_set_drvdata(pdev, gpadc);
657
654
658
-
regulator_enable(gpadc->regu);
655
+
ret = regulator_enable(gpadc->regu);
656
+
if (ret) {
657
+
dev_err(gpadc->dev, "Failed to enable vtvout LDO: %d\n", ret);
658
+
goto fail_enable;
659
+
}
659
660
660
661
pm_runtime_set_autosuspend_delay(gpadc->dev, GPADC_AUDOSUSPEND_DELAY);
661
662
pm_runtime_use_autosuspend(gpadc->dev);
···
670
663
list_add_tail(&gpadc->node, &ab8500_gpadc_list);
671
664
dev_dbg(gpadc->dev, "probe success\n");
672
665
return 0;
666
+
667
+
fail_enable:
673
668
fail_irq:
674
669
free_irq(gpadc->irq, gpadc);
675
670
fail:
+3
-3
drivers/mfd/omap-usb-host.c
+3
-3
drivers/mfd/omap-usb-host.c
···
460
460
461
461
switch (omap->usbhs_rev) {
462
462
case OMAP_USBHS_REV1:
463
-
omap_usbhs_rev1_hostconfig(omap, reg);
463
+
reg = omap_usbhs_rev1_hostconfig(omap, reg);
464
464
break;
465
465
466
466
case OMAP_USBHS_REV2:
467
-
omap_usbhs_rev2_hostconfig(omap, reg);
467
+
reg = omap_usbhs_rev2_hostconfig(omap, reg);
468
468
break;
469
469
470
470
default: /* newer revisions */
471
-
omap_usbhs_rev2_hostconfig(omap, reg);
471
+
reg = omap_usbhs_rev2_hostconfig(omap, reg);
472
472
break;
473
473
}
474
474
+33
-3
drivers/mfd/palmas.c
+33
-3
drivers/mfd/palmas.c
···
257
257
PALMAS_INT1_MASK),
258
258
};
259
259
260
-
static void palmas_dt_to_pdata(struct device_node *node,
260
+
static int palmas_set_pdata_irq_flag(struct i2c_client *i2c,
261
261
struct palmas_platform_data *pdata)
262
262
{
263
+
struct irq_data *irq_data = irq_get_irq_data(i2c->irq);
264
+
if (!irq_data) {
265
+
dev_err(&i2c->dev, "Invalid IRQ: %d\n", i2c->irq);
266
+
return -EINVAL;
267
+
}
268
+
269
+
pdata->irq_flags = irqd_get_trigger_type(irq_data);
270
+
dev_info(&i2c->dev, "Irq flag is 0x%08x\n", pdata->irq_flags);
271
+
return 0;
272
+
}
273
+
274
+
static void palmas_dt_to_pdata(struct i2c_client *i2c,
275
+
struct palmas_platform_data *pdata)
276
+
{
277
+
struct device_node *node = i2c->dev.of_node;
263
278
int ret;
264
279
u32 prop;
265
280
···
298
283
pdata->power_ctrl = PALMAS_POWER_CTRL_NSLEEP_MASK |
299
284
PALMAS_POWER_CTRL_ENABLE1_MASK |
300
285
PALMAS_POWER_CTRL_ENABLE2_MASK;
286
+
if (i2c->irq)
287
+
palmas_set_pdata_irq_flag(i2c, pdata);
301
288
}
302
289
303
290
static int palmas_i2c_probe(struct i2c_client *i2c,
···
321
304
if (!pdata)
322
305
return -ENOMEM;
323
306
324
-
palmas_dt_to_pdata(node, pdata);
307
+
palmas_dt_to_pdata(i2c, pdata);
325
308
}
326
309
327
310
if (!pdata)
···
361
344
}
362
345
}
363
346
347
+
/* Change interrupt line output polarity */
348
+
if (pdata->irq_flags & IRQ_TYPE_LEVEL_HIGH)
349
+
reg = PALMAS_POLARITY_CTRL_INT_POLARITY;
350
+
else
351
+
reg = 0;
352
+
ret = palmas_update_bits(palmas, PALMAS_PU_PD_OD_BASE,
353
+
PALMAS_POLARITY_CTRL, PALMAS_POLARITY_CTRL_INT_POLARITY,
354
+
reg);
355
+
if (ret < 0) {
356
+
dev_err(palmas->dev, "POLARITY_CTRL updat failed: %d\n", ret);
357
+
goto err;
358
+
}
359
+
364
360
/* Change IRQ into clear on read mode for efficiency */
365
361
slave = PALMAS_BASE_TO_SLAVE(PALMAS_INTERRUPT_BASE);
366
362
addr = PALMAS_BASE_TO_REG(PALMAS_INTERRUPT_BASE, PALMAS_INT_CTRL);
···
382
352
regmap_write(palmas->regmap[slave], addr, reg);
383
353
384
354
ret = regmap_add_irq_chip(palmas->regmap[slave], palmas->irq,
385
-
IRQF_ONESHOT | IRQF_TRIGGER_LOW, 0, &palmas_irq_chip,
355
+
IRQF_ONESHOT | pdata->irq_flags, 0, &palmas_irq_chip,
386
356
&palmas->irq_data);
387
357
if (ret < 0)
388
358
goto err;
+1
drivers/mfd/tps65912-core.c
+1
drivers/mfd/tps65912-core.c
+1
-1
drivers/mfd/twl4030-audio.c
+1
-1
drivers/mfd/twl4030-audio.c
···
118
118
* Disable the resource.
119
119
* The function returns with error or the content of the register
120
120
*/
121
-
int twl4030_audio_disable_resource(unsigned id)
121
+
int twl4030_audio_disable_resource(enum twl4030_audio_res id)
122
122
{
123
123
struct twl4030_audio *audio = platform_get_drvdata(twl4030_audio_dev);
124
124
int val;
+1
-1
drivers/mfd/twl4030-madc.c
+1
-1
drivers/mfd/twl4030-madc.c
+1
include/linux/mfd/palmas.h
+1
include/linux/mfd/palmas.h
+1
include/linux/mfd/tps65912.h
+1
include/linux/mfd/tps65912.h
+2
include/linux/mfd/wm831x/auxadc.h
+2
include/linux/mfd/wm831x/auxadc.h
+1
-1
include/linux/mfd/wm831x/core.h
+1
-1
include/linux/mfd/wm831x/core.h
···
20
20
#include <linux/irqdomain.h>
21
21
#include <linux/list.h>
22
22
#include <linux/regmap.h>
23
+
#include <linux/mfd/wm831x/auxadc.h>
23
24
24
25
/*
25
26
* Register values.
···
356
355
};
357
356
358
357
struct wm831x;
359
-
enum wm831x_auxadc;
360
358
361
359
typedef int (*wm831x_auxadc_read_fn)(struct wm831x *wm831x,
362
360
enum wm831x_auxadc input);