diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-07 13:24:18 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-07 13:24:18 -0400 |
| commit | e5744abb2fa3629aa5a94e21ca1eae32ff2fe00b (patch) | |
| tree | ef90c96390256b073f5255d224aecb2fc1f6ee84 | |
| parent | c29aa153ef0469cddf0146d41ce6494bd76be78b (diff) | |
| parent | 2d28ca731b9bb6262f7711241628c7844b0cf7dc (diff) | |
Merge tag 'mfd-for-linus-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
Pull MFD updates from Lee Jones:
"Changes to existing drivers:
- Use of managed resources - omap, twl4030, ti_am335x_tscadc
- Advanced error handling - omap
- Rework clk management - omap
- Device Tree (re-)work - tc3589x, pm8921, da9055, sec
- IRC management overhaul and !BROKEN - pm8921
- Convert to regmap - ssbi, pm8921
- Use simple power-management ops - ucb1x00
- Include file clean-up - adp5520, cs5535, janz, lpc_ich,
- lpc_sch, max14577, mcp-sa11x0, pcf50633-adc, rc5t583,
rdc321x-southbridge, retu, smsc-ece1099, ti-ssp, ti_am335x_tscadc,
tps65912, vexpress-config, wm8350, ywm8350
- Various bug fixes across the subsystem
- NULL/invalid pointer dereference prevention
- Resource leak mitigation,
- Variable used initialised
- Staticise various containers
- Enforce return value checks
New drivers/supported devices:
- Add support for s2mps14 and s2mpa01 to sec
- Add support for da9063 (v5) to da9063
- Add support for atom-c2000 to gpio-ich
- Add support for come-{mbt10,cbt6,chl6} to kempld
- Add support for da9053 to da9052
- Add support for itco-wdt (v3) and baytrail to lpc_ich
- Add new drivers for tps65218, rtsx_usb, bcm590xx
(Re-)moved drivers:
- twl4030 ==> drivers/iio
- ti-ssp ==> /dev/null"
* tag 'mfd-for-linus-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (103 commits)
mfd: wm5110: Correct default for HEADPHONE_DETECT_1
mfd: arizona: Correct small errors in the DT binding documentation
mfd: arizona: Mark DSP clocking register as volatile
mfd: devicetree: bindings: Add pm8xxx RTC description
mfd: kempld-core: Fix potential hang-up during boot
mfd: sec-core: Fix uninitialized 'regmap_rtc' on S2MPA01
mfd: tps65910: Fix regmap_irq_chip_data leak on mfd_add_devices fail
mfd: tps65910: Fix possible invalid pointer dereference on regmap_add_irq_chip fail
mfd: sec-core: Fix I2C dummy device resource leak on probe failure
mfd: sec-core: Add of_compatible strings for clock MFD cells
mfd: Remove obsolete ti-ssp driver
Documentation: mfd: s2mps11: Describe S5M8767 and S2MPS14 clocks
mfd: bcm590xx: Fix type argument for module device table
mfd: lpc_ich: Add support for Intel Bay Trail SoC
mfd: lpc_ich: Add support for NM10 GPIO
mfd: lpc_ich: Change Avoton to iTCO v3
watchdog: iTCO_wdt: Add support for v3 silicon
mfd: lpc_ich: Add support for iTCO v3
mfd: lpc_ich: Remove lpc_ich_cfg struct use
mfd: lpc_ich: Only configure watchdog or GPIO when present
...
92 files changed, 3958 insertions, 1588 deletions
diff --git a/Documentation/devicetree/bindings/iio/adc/twl4030-madc.txt b/Documentation/devicetree/bindings/iio/adc/twl4030-madc.txt new file mode 100644 index 000000000000..6bdd21404b57 --- /dev/null +++ b/Documentation/devicetree/bindings/iio/adc/twl4030-madc.txt | |||
| @@ -0,0 +1,24 @@ | |||
| 1 | * TWL4030 Monitoring Analog to Digital Converter (MADC) | ||
| 2 | |||
| 3 | The MADC subsystem in the TWL4030 consists of a 10-bit ADC | ||
| 4 | combined with a 16-input analog multiplexer. | ||
| 5 | |||
| 6 | Required properties: | ||
| 7 | - compatible: Should contain "ti,twl4030-madc". | ||
| 8 | - interrupts: IRQ line for the MADC submodule. | ||
| 9 | - #io-channel-cells: Should be set to <1>. | ||
| 10 | |||
| 11 | Optional properties: | ||
| 12 | - ti,system-uses-second-madc-irq: boolean, set if the second madc irq register | ||
| 13 | should be used, which is intended to be used | ||
| 14 | by Co-Processors (e.g. a modem). | ||
| 15 | |||
| 16 | Example: | ||
| 17 | |||
| 18 | &twl { | ||
| 19 | madc { | ||
| 20 | compatible = "ti,twl4030-madc"; | ||
| 21 | interrupts = <3>; | ||
| 22 | #io-channel-cells = <1>; | ||
| 23 | }; | ||
| 24 | }; | ||
diff --git a/Documentation/devicetree/bindings/mfd/arizona.txt b/Documentation/devicetree/bindings/mfd/arizona.txt index 0e295c9d8937..36a0c3d8c726 100644 --- a/Documentation/devicetree/bindings/mfd/arizona.txt +++ b/Documentation/devicetree/bindings/mfd/arizona.txt | |||
| @@ -5,9 +5,10 @@ of analogue I/O. | |||
| 5 | 5 | ||
| 6 | Required properties: | 6 | Required properties: |
| 7 | 7 | ||
| 8 | - compatible : one of the following chip-specific strings: | 8 | - compatible : One of the following chip-specific strings: |
| 9 | "wlf,wm5102" | 9 | "wlf,wm5102" |
| 10 | "wlf,wm5110" | 10 | "wlf,wm5110" |
| 11 | "wlf,wm8997" | ||
| 11 | - reg : I2C slave address when connected using I2C, chip select number when | 12 | - reg : I2C slave address when connected using I2C, chip select number when |
| 12 | using SPI. | 13 | using SPI. |
| 13 | 14 | ||
| @@ -25,8 +26,9 @@ Required properties: | |||
| 25 | - #gpio-cells : Must be 2. The first cell is the pin number and the | 26 | - #gpio-cells : Must be 2. The first cell is the pin number and the |
| 26 | second cell is used to specify optional parameters (currently unused). | 27 | second cell is used to specify optional parameters (currently unused). |
| 27 | 28 | ||
| 28 | - AVDD1-supply, DBVDD1-supply, DBVDD2-supply, DBVDD3-supply, CPVDD-supply, | 29 | - AVDD-supply, DBVDD1-supply, DBVDD2-supply, DBVDD3-supply (wm5102, wm5110), |
