aboutsummaryrefslogtreecommitdiff
path: root/include/linux/mfd
AgeCommit message (Collapse)AuthorFilesLines
2013-02-14extcon: max8997: Set default UART/USB path on probeChanwoo Choi1-0/+7
This patch set default H/W line path according to platfomr data. The MAX8997 MUIC device can possibly set UART/USB or UART_AUX /USB_AUX to internal H/W line path of MUIC device. Namely, only one H/W line is used for two operation. For example, if H/W line path of MAX8997 device set UART/USB, micro usb cable is connected to AP(Application Processor) and if H/W line path set UART_AUX/USB_AUX, micro usb cable is connected to CP(Coprocessor). Signed-off-by: Chanwoo Choi <[email protected]> Signed-off-by: Myungjoo Ham <[email protected]>
2013-02-14extcon: max8997: Consolidate duplicate code for checking ADC/CHG cable typeChanwoo Choi2-24/+0
This patch make max8997_muic_get_cable_type() function to remove duplicate code for checking ADC/Charger cable type because almost internal function need to read adc/chg_type value of MUIC register. Also, remove *_detach() function, extcon-max8997 driver treat attach/detach operation of cable in max8997_*_handler() function. Lastly, this patch move defined constant in header file(include/ linux/mfd/max8997.h, max8997-private.h) because defined constant is only used in the 'extcon-max8997.c'. Signed-off-by: Chanwoo Choi <[email protected]> Signed-off-by: Myungjoo Ham <[email protected]>
2013-02-14extcon: max8997: Set default of ADC debounce time during initializationChanwoo Choi1-0/+7
This patch set default of ADC Debounce Time(25ms) during probe step. Also, can possible change ADC Debounce Time according to H/W situation by using max8997_set_adc_debounce_time() Signed-off-by: Chanwoo Choi <[email protected]> Signed-off-by: Myungjoo Ham <[email protected]>
2013-02-14extcon: max8997: Remove duplicate code related to set H/W line pathChanwoo Choi1-1/+18
Signed-off-by: Chanwoo Choi <[email protected]> Signed-off-by: Myungjoo Ham <[email protected]>
2013-02-14extcon: max8997: Move defined constant to header fileChanwoo Choi1-0/+49
This patch move defined constants to header file(max77693-private.h) because of mask/unmask selectively interrupt of MUIC device according to attribute of H/W board. Signed-off-by: Chanwoo Choi <[email protected]> Signed-off-by: Myungjoo Ham <[email protected]>
2013-02-12Merge tag 'for-arm-soc-cleanup' of ↵Olof Johansson2-14/+46
git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/cleanup From Linus Walleij: Two fixes for broken <mach/id.h> cleanup. * tag 'for-arm-soc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson: mfd: db8500-prcmu: update resource passing drivers/db8500-cpufreq: delete dangling include Signed-off-by: Olof Johansson <[email protected]>
2013-02-12mfd: db8500-prcmu: update resource passingLinus Walleij2-14/+46
When trying to get rid of the cross-includes of <mach/id.h> from different drivers, so we can localize ASIC/CPU detection to the mach-ux500 folder, we run into the way the PRCMU handles base addresses and firmware detection. This patch updates the firmware version detection to pass the required information as platform data instead of relying on cpu_is_* macros. Now the PRCMU base address, the secondary TCDM area, the TCPM area and the IRQ are passed as resources instead of being grabbed from <mach/*> files. Incidentally this also removes part of the reliance on <mach/irqs.h>. Further it updates the firmware version detection, since the location of the firmware ID bytes in the designated memory are is now passed from the platform data instead. There is no reason not to include the nice split-off of a struct to hold the firmware information and a separate function to populate it. The patch actually rids the need to use the external db8500_prcmu_early_init call at all, but I'm keepin back that removal as I don't want the patch to be too big. Cc: [email protected] Cc: Michel Jaoen <[email protected]> Cc: Lee Jones <[email protected]> Acked-by: Samuel Ortiz <[email protected]> Acked-by: Loic Pallardy <[email protected]> Acked-by: Fabio Baltieri <[email protected]> Signed-off-by: Linus Walleij <[email protected]>
2013-02-11extcon: arizona: Clear _trig_sts bits after jack detectionCharles Keepax1-0/+8
It is important to clear the wake trigger status bits otherwise DCVDD will be held high independent of the state of the LDOENA line. Signed-off-by: Charles Keepax <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2013-02-11Merge remote-tracking branch 'asoc/topic/arizona' into asoc-nextMark Brown1-0/+9
2013-02-10ARM: ux500: remove irq_base property from platform_dataLee Jones1-1/+0
AB8500 GPIO no longer handles its GPIO IRQs. Instead, the AB8500 core driver has taken back the responsibility. Prior to this happening, the AB8500 GPIO driver provided a set of virtual IRQs which were used as a pass-through. These virtual IRQs had a base of MOP500_AB8500_VIR_GPIO_IRQ_BASE, which was passed though pdata. We don't need to do this anymore, so we're pulling out the property from the structure. Cc: [email protected] Acked-by: Olof Johansson <[email protected]> Signed-off-by: Lee Jones <[email protected]> Signed-off-by: Linus Walleij <[email protected]>
2013-02-09Merge tag 'v3.8-rc6' into next/cleanupOlof Johansson6-35/+93
Linux 3.8-rc6
2013-02-07extcon: arizona: Use regulated mode for microphone supply when detectingMark Brown1-0/+3
When starting microphone detection some headsets should be exposed to the fully regulated microphone bias in order to ensure that they behave in an optimal fashion. Signed-off-by: Mark Brown <[email protected]>
2013-02-07extcon: arizona: Support additional configuration of microphone detectionMark Brown1-0/+6
Allow systems to tune detection rate and debounce suitably for their mechanical parameters. Signed-off-by: Mark Brown <[email protected]>
2013-02-04regulator: add device tree support for s5m8767Amit Daniel Kachhap1-4/+7
This device tree support is added for PMIC block of S5m8767 multi function driver. The usage detail is added in the device tree documentation section. This change is tested on exynos5250 based arndale platform by regulator voltage set/get API's. Reviewed-by: Thomas Abraham <[email protected]> Signed-off-by: Amit Daniel Kachhap <[email protected]> Tested-by: Sachin Kamat <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2013-02-04mfd: ab8500-debugfs: Add interrupt debugBengt Jonsson1-0/+2
This patch adds an entry in debugfs to check number of interrupts from the AB. Signed-off-by: Lee Jones <[email protected]> Signed-off-by: Bengt Jonsson <[email protected]> Reviewed-by: Rabin VINCENT <[email protected]>
2013-02-04mfd: ab8500-core: Allow the possibility to dump all AB8500 registersMian Yousaf Kaukab1-0/+6
Implement an API so that a user may dump all AB8500 registers via debugfs file access. Signed-off-by: Lee Jones <[email protected]> Signed-off-by: Mian Yousaf Kaukab <[email protected]> Reviewed-by: Linus WALLEIJ <[email protected]> Reviewed-by: Jonas ABERG <[email protected]>
2013-02-04mfd: abx500-core: Provide an API to dump all ABx500 registersMian Yousaf Kaukab1-0/+2
Some drivers can detect subsystem failures e.g. shared memory driver can detect modem sub system failures. It would be helpful in analyzing these failures if AB register dump is available at that point. This patch adds the API for the drivers to dump AB registers in the kernel log. Signed-off-by: Lee Jones <[email protected]> Signed-off-by: Mian Yousaf Kaukab <[email protected]> Reviewed-by: Linus WALLEIJ <[email protected]> Reviewed-by: Jonas ABERG <[email protected]>
2013-02-04mfd: ab8500-sysctrl: Provide configuration for SysClkReqRfClkBuf registersKennet Wallden2-0/+7
Add the possibility to pass configuration settings for SysCl1kReqRfClkBuf to SysClk8ReqRfClkBuf via platform data. Signed-off-by: Lee Jones <[email protected]> Signed-off-by: Kennet Wallden <[email protected]> Reviewed-by: Karl-Johan PERNTZ <[email protected]> Reviewed-by: Bengt JONSSON <[email protected]>
2013-02-04mfd: ab8500-sysctrl: Provide a platform specific pm_power_off() call-backLee Jones1-0/+2
The kernel allows us to specify a function call-back which will be invoked when a system power-off request has been received. Here we provide one which is to be used when shutting down AB8500 based platforms. Signed-off-by: Lee Jones <[email protected]>
2013-01-30pinctrl: add abx500 pinctrl driver corePatrice Chotard2-3/+14
This adds the AB8500 core driver, which will be utilized by the follow-on drivers for different ABx500 variants. Sselect the driver from the DBX500_SOC, as this chip is powering and clocking that SoC. Cc: Samuel Ortiz <[email protected]> Signed-off-by: Patrice Chotard <[email protected]> Signed-off-by: Linus Walleij <[email protected]>
2013-01-30mfd: ab8500: update header file and version detectionLinus Walleij1-55/+222
This updates the AB8500 register map with defines for a few new chip variants and adds version detection helpers to handle the different variants. Acked-by: Samuel Ortiz <[email protected]> Signed-off-by: Linus Walleij <[email protected]>
2013-01-29ARM: ux500: de-globalize <mach/id.h>Linus Walleij1-2/+0
This removes the file <mach/id.h> from the global kernel include scope, making it a pure mach-ux500 detail. All ASIC specifics needed by drivers shall henceforth be passed from either platform data or the device tree. Cc: Rafael J. Wysocki <[email protected]> Acked-by: Samuel Ortiz <[email protected]> Signed-off-by: Linus Walleij <[email protected]>
2013-01-29mfd: prcmu: delete pin control helpersLinus Walleij2-85/+0
These static inlines are duplicating the task now done by the Nomadik pinctrl drivers, so delete them from the prcmu static inlines, also delete the register definitions as these should only be known by the pinctrl driver. Cc: Loic Pallardy <[email protected]> Cc: Patrice Chotard <[email protected]> Cc: Michel Jaouen <[email protected]> Acked-by: Samuel Ortiz <[email protected]> Signed-off-by: Linus Walleij <[email protected]>
2013-01-27mfd: da9052/53 lockup fixAshish Jangam2-4/+65
An issue has been reported where the PMIC either locks up or fails to respond following a system Reset. This could result in a second write in which the bus writes the current content of the write buffer to address of the last I2C access. The failure case is where this unwanted write transfers incorrect data to a critical register. This patch fixes this issue to by following any read or write with a dummy read to a safe register address. A safe register address is one where the contents will not affect the operation of the system. Signed-off-by: Ashish Jangam <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2013-01-27mfd: rtsx: Add clock divider hookWei WANG2-0/+4
Add callback function conv_clk_and_div_n to convert between SSC clock and its divider N. For rtl8411, the formula to calculate SSC clock divider N is different with the other card reader models. Signed-off-by: Wei WANG <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2013-01-27mfd: rtsx: Add output voltage switch hookWei WANG1-4/+20
Different card reader has different method to switch output voltage, add this callback to let the card reader implement its individual switch function. This is needed as rtl8411 has a specific switch output voltage procedure. Signed-off-by: Wei WANG <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2013-01-23ab8500-bm: Remove individual [charger|btemp|fg|chargalg] pdata structuresLee Jones2-22/+3
None of the aforementioned components have their own dedicated platform data structures anymore. Instead they have all been merged into one big Battery Management container. Let's remove them and place all the nice newly added attributes into the core container. Signed-off-by: Lee Jones <[email protected]>
2013-01-23ab8500-charger: Do not touch VBUSOVV bitsJonas Aaberg1-0/+19
Do not touch the VBUSOVV in USBCHTRL2 when running on AB8505. Signed-off-by: Jonas Aaberg <[email protected]> Signed-off-by: Lee Jones <[email protected]> Reviewed-by: Marcus COOPER <[email protected]> Tested-by: Mian Yousaf KAUKAB <[email protected]>
2013-01-23pm2301: Update watchdog for pm2xxx supportLoic Pallardy1-0/+3
AB and PMxxx doesn't have same watchdog refresh period. Add watchdog to refresh period parameters in x500 charger structure, this should kick watchdog every 30sec. The AC charging should also kick both pm2xxx and the AB charger watchdog. Signed-off-by: Rajkumar Kasirajan <[email protected]> Signed-off-by: Loic Pallardy <[email protected]> Signed-off-by: Lee Jones <[email protected]> Reviewed-by: Michel JAOUEN <[email protected]> Reviewed-by: Marcus COOPER <[email protected]> Reviewed-by: Jonas ABERG <[email protected]> Tested-by: Michel JAOUEN <[email protected]> Tested-by: Jonas ABERG <[email protected]>
2013-01-23ab8500-btemp: Adaptation to AB8505 and AB9540 platformsMichel JAOUEN1-0/+2
Add AB9540 and AB8505 support to ABx500 BTEMP driver. Signed-off-by: Rajkumar Kasirajan <[email protected]> Signed-off-by: Lee Jones <[email protected]> Reviewed-by: Michel JAOUEN <[email protected]> Reviewed-by: Marcus COOPER <[email protected]> Reviewed-by: Jonas ABERG <[email protected]> Tested-by: Michel JAOUEN <[email protected]> Tested-by: Jonas ABERG <[email protected]>
2013-01-23pm2301: Provide u9540 support for the pm2301 chargerMichel JAOUEN2-0/+4
AC charger driver for the DB9540 based platforms. Signed-off-by: Rajkumar Kasirajan <[email protected]> Signed-off-by: Loic Pallardy <[email protected]> Signed-off-by: Lee Jones <[email protected]> Reviewed-by: Michel JAOUEN <[email protected]> Tested-by: Michel JAOUEN <[email protected]>
2013-01-22mfd: Fix compile errors and warnings when !CONFIG_AB8500_BMLee Jones2-27/+4
drivers/mfd/ab8500-core.c:1015:21: error: ‘ab8500_bm_data’ undeclared here include/linux/mfd/abx500/ab8500-bm.h:445:13: warning: ‘ab8500_fg_reinit’ defined but not used include/linux/mfd/abx500/ab8500-bm.h:448:13: warning: ‘ab8500_charger_usb_state_changed’ defined but not used include/linux/mfd/abx500/ab8500-bm.h:451:29: warning: ‘ab8500_btemp_get’ defined but not used include/linux/mfd/abx500/ab8500-bm.h:455:12: warning: ‘ab8500_btemp_get_batctrl_temp’ defined but not used include/linux/mfd/abx500/ab8500-bm.h:463:12: warning: ‘ab8500_fg_inst_curr_blocking’ defined but not used include/linux/mfd/abx500/ab8500-bm.h:442:12: warning: ‘ab8500_fg_inst_curr_done’ defined but not used include/linux/mfd/abx500/ab8500-bm.h:447:26: warning: ‘ab8500_fg_get’ defined but not used Signed-off-by: Lee Jones <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2013-01-21ASoC: arizona: Allow number of channels clocked to be restrictedMark Brown1-0/+9
Place a cap on the number of channels clocks are generated for. This is intended for use with systems which have the WM5102 master an I2S bus with multiple data lines. Signed-off-by: Mark Brown <[email protected]>
2013-01-15ab8500_bm: Adds support for Car/Travel AdaptersHakan Berg1-0/+1
The Travel and Carkit adapter should be handled directly by the charger driver. Signed-off-by: Lee Jones <[email protected]> Signed-off-by: Marcus Cooper <[email protected]> Reviewed-by: Jonas ABERG <[email protected]> Signed-off-by: Anton Vorontsov <[email protected]>
2013-01-15ab8500_btemp: Ignore false btemp low interruptHakan Berg1-0/+5
Ignore the low btemp interrupts for ab8500 3.0 and 3.3 Signed-off-by: Lee Jones <[email protected]> Signed-off-by: Hakan Berg <[email protected]> Reviewed-by: Jonas ABERG <[email protected]> Tested-by: Marcus COOPER <[email protected]> Signed-off-by: Anton Vorontsov <[email protected]>
2013-01-15ab8500_bm: Recharge condition not optimal for batteryMarcus Cooper2-2/+6
Today the battery recharge is determined with a voltage threshold. This voltage threshold is only valid when the battery is relaxed. In charging algorithm the voltage read is the loaded battery voltage and no compensation is done to get the relaxed voltage. When maintenance charging is not selected, this makes the recharging condition to almost immediately activate when there is a discharge present on the battery. Depending on which vendor the battery comes from this behavior can wear out the battery much faster than normal. The fuelgauge driver is responsible to monitor the actual battery capacity and is able to estimate the remaining capacity. It is better to use the remaining capacity as a limit to determine when battery should be recharged. Signed-off-by: Lee Jones <[email protected]> Signed-off-by: Marcus Cooper <[email protected]> Reviewed-by: Hakan BERG <[email protected]> Reviewed-by: Jonas ABERG <[email protected]> Signed-off-by: Anton Vorontsov <[email protected]>
2013-01-15ab8500_bm: Skip first CCEOC irq for instant currentJohan Bjornstedt1-0/+7
When enabling the CCEOC irq we might get false interrupt from ab8500-driver due to the latched value will be saved and interpreted as an IRQ when enabled Signed-off-by: Lee Jones <[email protected]> Signed-off-by: Johan Bjornstedt <[email protected]> Signed-off-by: Henrik Solver <[email protected]> Reviewed-by: Karl KOMIEROWSKI <[email protected]> Signed-off-by: Anton Vorontsov <[email protected]>
2013-01-15mfd: wm5102: Add microphone clamp control registersMark Brown1-0/+8
Signed-off-by: Mark Brown <[email protected]> Signed-off-by: Chanwoo Choi <[email protected]> Signed-off-by: Myungjoo Ham <[email protected]>
2013-01-15extcon: arizona: Support direct microphone measurement via HPDETMark Brown1-0/+3
With some GPIO control it is possible to detect microphones in a wider range of configurations by directly measuring the microphone impedance when the HPDET method cannot distinguish between the behaviour of the two grounds. Allow a GPIO to be provided in platform data and use it to implement this behaviour. Signed-off-by: Mark Brown <[email protected]> Signed-off-by: Chanwoo Choi <[email protected]> Signed-off-by: Myungjoo Ham <[email protected]>
2013-01-15extcon: arizona: Support HPDET based accessory identificationMark Brown1-0/+3
The accessory detection functionality in Arizona devices is flexible and supports several system designs in addition to the default one implemented by the existing driver. One such design uses the HPDET feature to determine what kind of accessory is present by comparing measurements taken with the two headphone grounds available on the device, implement that if selected by platform data. Signed-off-by: Mark Brown <[email protected]> Signed-off-by: Chanwoo Choi <[email protected]> Signed-off-by: Myungjoo Ham <[email protected]>
2013-01-15extcon: arizona: Enable basic headphone identificationMark Brown1-0/+12
Use the headphone detection to identify if the accessory is a headphone or line load. There are two different revisions of the IP with different register layouts, support both. Signed-off-by: Mark Brown <[email protected]> Signed-off-by: Chanwoo Choi <[email protected]> Signed-off-by: Myungjoo Ham <[email protected]>
2013-01-15extcon: arizona: Support use of GPIO5 as an input to jack detectionMark Brown1-0/+3
Some system designs provide an input on GPIO5 which in conjunction with the jack detection feature indicates the presence of an accessory. Support such systems, using the microphone clamp feature to minimise wakeups of the processor. Signed-off-by: Mark Brown <[email protected]> Signed-off-by: Chanwoo Choi <[email protected]> Signed-off-by: Myungjoo Ham <[email protected]>
2013-01-15extcon: arizona: Use microphone clamp function if availableMark Brown2-1/+31
Newer Arizona devices include a microphone clamp function which is tied to jack detect. Activate this feature when present in order to ensure best performance of the subsystem. Signed-off-by: Mark Brown <[email protected]> Signed-off-by: Chanwoo Choi <[email protected]> Signed-off-by: Myungjoo Ham <[email protected]>
2013-01-15extcon: arizona: Allow configuration of MICBIAS rise timeMark Brown1-0/+3
Allow configuration of the rise time for MICBIAS via platform data, the delay required depends on things like the external component selection. Signed-off-by: Mark Brown <[email protected]> Signed-off-by: Chanwoo Choi <[email protected]> Acked-by: MyungJoo Ham <[email protected]>
2013-01-15extcon: max77693: Set default uart/usb path by using platform dataChanwoo Choi1-0/+7
This patch determine default uart/usb path by using platform data. The MAX77693 MUIC device can possibliy set USB/UART/AUDIO/USB_AUX /UART_AUX to internal h/w path of MUIC device. So, drvier should determine default uart/usb path. Signed-off-by: Chanwoo Choi <[email protected]> Signed-off-by: Myungjoo Ham <[email protected]>
2013-01-15extcon: max77693: Check the state/type of cable after boot completedChanwoo Choi1-0/+2
This patch check the state/type of cable after completing the initialization of platform and notify platform of cable state/type through extcon. If extcon provider driver notify the state/type of cable before completing platform boot, this uevent is unused and ignored. Signed-off-by: Chanwoo Choi <[email protected]> Signed-off-by: Myungjoo Ham <[email protected]>
2013-01-15extcon: max77693: Remove duplicate code by making functionChanwoo Choi1-0/+86
This patch make max77693-muic_get_cable_type() function to remove duplicate code because almost internal function need to read adc/adc1k/adclow/chg_type value of MUIC register. Also, this patch add description of internal function move field constant of muic device from extcon-max77693 driver to max77693 header file because of it is needed for masking some interrupt through platform data. Signed-off-by: Chanwoo Choi <[email protected]> Signed-off-by: Myungjoo Ham <[email protected]>
2013-01-05Merge branch 'for-anton' of git://git.linaro.org/people/ljones/linux-3.0-ux500Anton Vorontsov1-3/+3
2012-12-16Merge tag 'mfd-3.8-1' of ↵Linus Torvalds17-77/+1421
git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6 Pull MFS update from Samuel Ortiz: "This is the MFD patch set for the 3.8 merge window. We have several new drivers, most of the time coming with their sub devices drivers: - Austria Microsystem's AS3711 - Nano River's viperboard - TI's TPS80031, AM335x TS/ADC, - Realtek's MMC/memstick card reader - Nokia's retu We also got some notable cleanups and improvements: - tps6586x got converted to IRQ domains. - tps65910 and tps65090 moved to the regmap IRQ API. - STMPE is now Device Tree aware. - A general twl6040 and twl-core cleanup, with moves to the regmap I/O and IRQ APIs and a conversion to the recently added PWM framework. - sta2x11 gained regmap support. Then the rest is mostly tiny cleanups and fixes, among which we have Mark's wm5xxx and wm8xxx patchset." Far amount of annoying but largely trivial conflicts. Many due to __devinit/exit removal, others due to one or two of the new drivers also having come in through another tree. * tag 'mfd-3.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (119 commits) mfd: tps6507x: Convert to devm_kzalloc mfd: stmpe: Update DT support for stmpe driver mfd: wm5102: Add readback of DSP status 3 register mfd: arizona: Log if we fail to create the primary IRQ domain mfd: tps80031: MFD_TPS80031 needs to select REGMAP_IRQ mfd: tps80031: Add terminating entry for tps80031_id_table mfd: sta2x11: Fix potential NULL pointer dereference in __sta2x11_mfd_mask() mfd: wm5102: Add tuning for revision B mfd: arizona: Defer patch initialistation until after first device boot mfd: tps65910: Fix wrong ack_base register mfd: tps65910: Remove unused data mfd: stmpe: Get rid of irq_invert_polarity mfd: ab8500-core: Fix invalid free of devm_ allocated data mfd: wm5102: Mark DSP memory regions as volatile mfd: wm5102: Correct default for LDO1_CONTROL_2 mfd: arizona: Register haptics devices mfd: wm8994: Make current device behaviour the default mfd: tps65090: MFD_TPS65090 needs to select REGMAP_IRQ mfd: Fix stmpe.c build when OF is not enabled mfd: jz4740-adc: Use devm_kzalloc ...
2012-12-13Merge tag 'for-v3.8-merged' of git://git.infradead.org/battery-2.6Linus Torvalds2-30/+12
Pull battery subsystem updates from Anton Vorontsov: "Highlights: - Two new drivers from Pali Rohár and N900 hackers: rx51_battery and bq2415x_charger. The drivers are a part of a solution to replace the proprietary Nokia BME stack - Power supply core now registers devices with a thermal cooling subsystem, so we can now automatically throttle charging. Thanks to Ramakrishna Pallala! - Device tree support for ab8500 and max8925_power drivers - Random fixups and enhancements for a bunch of drivers." * tag 'for-v3.8-merged' of git://git.infradead.org/battery-2.6: (22 commits) max8925_power: Add support for device-tree initialization ab8500: Add devicetree support for chargalg ab8500: Add devicetree support for charger ab8500: Add devicetree support for btemp ab8500: Add devicetree support for fuelgauge twl4030_charger: Change TWL4030_MODULE_* ids to TWL_MODULE_* jz4740-battery: Use devm_request_and_ioremap jz4740-battery: Use devm_kzalloc bq27x00_battery: Fixup nominal available capacity reporting bq2415x_charger: Fix style issues bq2415x_charger: Add Kconfig/Makefile entries power_supply: Add bq2415x charger driver power_supply: Add new Nokia RX-51 (N900) power supply battery driver max17042_battery: Fix missing verify_model_lock() return value check ds2782_battery: Fix signedness bug in ds278x_read_reg16() lp8788-charger: Fix ADC channel names lp8788-charger: Fix wrong ADC conversion lp8788-charger: Use consumer device name on setting IIO channels power_supply: Register power supply for thermal cooling device power_supply: Add support for CHARGE_CONTROL_* attributes ...