diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-10 14:10:27 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-10 14:10:27 -0400 |
commit | 3aa78e0cb5c9b8b4ed2a617bb1e1542bfb508379 (patch) | |
tree | a446e1f8a81f63933423ef11ea7d31cc918b30f6 /arch/arm/mach-s5pv210 | |
parent | dc5ef1f56968c67e81ad1c81ab7dce678f480285 (diff) | |
parent | 25f311fa58c18c19ae1348336265ccb8368638f0 (diff) |
Merge tag 'mfd-3.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next
Pull MFD update from Samuel Ortiz:
"For the 3.11 merge we only have one new MFD driver for the Kontron
PLD.
But we also have:
- Support for the TPS659038 PMIC from the palmas driver.
- Intel's Coleto Creek and Avoton SoCs support from the lpc_ich
driver.
- RTL8411B support from the rtsx driver.
- More DT support for the Arizona, max8998, twl4030-power and the
ti_am335x_tsadc drivers.
- The SSBI driver move under MFD.
- A conversion to the devm_* API for most of the MFD drivers.
- The twl4030-power got split from twl-core into its own module.
- A major ti_am335x_adc cleanup, leading to a proper DT support.
- Our regular arizona and wm* updates and cleanups from the Wolfson
folks.
- A better error handling and initialization, and a regulator
subdevice addition for the 88pm80x driver.
- A bulk platform_set_drvdata() call removal that's no longer need
since commit 0998d0631001 ("device-core: Ensure drvdata = NULL when
no driver is bound")
* tag 'mfd-3.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next: (102 commits)
mfd: sec: Provide max_register to regmap
mfd: wm8994: Remove duplicate check for active JACKDET
MAINTAINERS: Add include directory to MFD file patterns
mfd: sec: Remove fields not used since regmap conversion
watchdog: Kontron PLD watchdog timer driver
mfd: max8998: Add support for Device Tree
regulator: max8998: Use arrays for specifying voltages in platform data
mfd: max8998: Add irq domain support
regulator: palmas: Add TPS659038 support
mfd: Kontron PLD mfd driver
mfd: palmas: Add TPS659038 PMIC support
mfd: palmas: Add SMPS10_BOOST feature
mfd: palmas: Check if irq is valid
mfd: lpc_ich: iTCO_wdt patch for Intel Coleto Creek DeviceIDs
mfd: twl-core: Change TWL6025 references to TWL6032
mfd: davinci_voicecodec: Fix build breakage
mfd: vexpress: Make the driver optional for arm and arm64
mfd: htc-egpio: Use devm_ioremap_nocache() instead of ioremap_nocache()
mfd: davinci_voicecodec: Convert to use devm_* APIs
mfd: twl4030-power: Fix relocking on error
...
Diffstat (limited to 'arch/arm/mach-s5pv210')
-rw-r--r-- | arch/arm/mach-s5pv210/mach-aquila.c | 8 | ||||
-rw-r--r-- | arch/arm/mach-s5pv210/mach-goni.c | 8 |
2 files changed, 4 insertions, 12 deletions
diff --git a/arch/arm/mach-s5pv210/mach-aquila.c b/arch/arm/mach-s5pv210/mach-aquila.c index ed2b85485b9d..ad40ab0f5dbd 100644 --- a/arch/arm/mach-s5pv210/mach-aquila.c +++ b/arch/arm/mach-s5pv210/mach-aquila.c | |||
@@ -377,12 +377,8 @@ static struct max8998_platform_data aquila_max8998_pdata = { | |||
377 | .buck1_set1 = S5PV210_GPH0(3), | 377 | .buck1_set1 = S5PV210_GPH0(3), |
378 | .buck1_set2 = S5PV210_GPH0(4), | 378 | .buck1_set2 = S5PV210_GPH0(4), |
379 | .buck2_set3 = S5PV210_GPH0(5), | 379 | .buck2_set3 = S5PV210_GPH0(5), |
380 | .buck1_voltage1 = 1200000, | 380 | .buck1_voltage = { 1200000, 1200000, 1200000, 1200000 }, |
381 | .buck1_voltage2 = 1200000, | 381 | .buck2_voltage = { 1200000, 1200000 }, |
382 | .buck1_voltage3 = 1200000, | ||
383 | .buck1_voltage4 = 1200000, | ||
384 | .buck2_voltage1 = 1200000, | ||
385 | .buck2_voltage2 = 1200000, | ||
386 | }; | 382 | }; |
387 | #endif | 383 | #endif |
388 | 384 | ||
diff --git a/arch/arm/mach-s5pv210/mach-goni.c b/arch/arm/mach-s5pv210/mach-goni.c index 30b24ad84f49..e5cd9fbf19e9 100644 --- a/arch/arm/mach-s5pv210/mach-goni.c +++ b/arch/arm/mach-s5pv210/mach-goni.c | |||
@@ -580,12 +580,8 @@ static struct max8998_platform_data goni_max8998_pdata = { | |||
580 | .buck1_set1 = S5PV210_GPH0(3), | 580 | .buck1_set1 = S5PV210_GPH0(3), |
581 | .buck1_set2 = S5PV210_GPH0(4), | 581 | .buck1_set2 = S5PV210_GPH0(4), |
582 | .buck2_set3 = S5PV210_GPH0(5), | 582 | .buck2_set3 = S5PV210_GPH0(5), |
583 | .buck1_voltage1 = 1200000, | 583 | .buck1_voltage = { 1200000, 1200000, 1200000, 1200000 }, |
584 | .buck1_voltage2 = 1200000, | 584 | .buck2_voltage = { 1200000, 1200000 }, |
585 | .buck1_voltage3 = 1200000, | ||
586 | .buck1_voltage4 = 1200000, | ||
587 | .buck2_voltage1 = 1200000, | ||
588 | .buck2_voltage2 = 1200000, | ||
589 | }; | 585 | }; |
590 | #endif | 586 | #endif |
591 | 587 | ||