summaryrefslogtreecommitdiff
path: root/include/linux/mfd
AgeCommit message (Collapse)Author
2011-07-22USB:Enable GPIO configuration at connectSakethram Bommisetti
GPIO alternate configuration is set when the USB is connected and reset at USB disconnect. Change-Id: I07d9c2ed5028879ecff309aa9e4ac25deac148f5 Signed-off-by: Sakethram Bommisetti <sakethram.bommisetti@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/27203 Reviewed-by: QATOOLS Reviewed-by: Praveena NADAHALLY <praveen.nadahally@stericsson.com> Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
2011-07-22mfd: ab5500 - maintain proper ordering of the deviceidArun Murthy
ab5500 core driver appends device deviceid to the device name and hence the order should be maintained in defining the deviceid Ex: sound/soc/ux500/u5500.c: .codec_name = "ab5500-codec.9", Since 2 new devices chargalg and btemp were added prior to codec audio stopped working. ST-Ericsson Linux next: Not Tested ST-Ericsson ID: WP256401 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Id44e60a16d2c2b7181edd8fb553c3220788d6326 Signed-off-by: Arun Murthy <arun.murthy@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/25788 Reviewed-by: QATEST Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
2011-07-22power: abx500-chargalg: charging algorithmArun Murthy
A generic charging algorithm for all abx500 varants. It is a high level algorithm and hence doesn't include any low level or hardware interaction. Each of the abx500 charging drivers will implement low level hardware interaction function and provide inputs to this generic charging algorithm to monitor and implement the charging functionality. ST-Ericsson Linux next: Not Tested ST-Ericsson ID: WP256401 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I8634160b2e67132ae68a09fda7a9fd9d36dd23d2 Signed-off-by: Arun Murthy <arun.murthy@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/23150 Reviewed-by: QATEST Reviewed-by: Johan PALSSON <johan.palsson@stericsson.com> Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
2011-07-22power: ab5500-charger: ab5500 usb charger driverArun Murthy
Adds a power supply class for usb, used to charge the battery. It includes enabling/disabling of usb charging and monitoring the usb. ST-Ericsson Linux next: Not Tested ST-Ericsson ID: WP256401 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I4fa42b3dbe82103ad49293b784243dc0edb61558 Signed-off-by: Arun Murthy <arun.murthy@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/23149 Reviewed-by: QATEST Reviewed-by: Johan PALSSON <johan.palsson@stericsson.com> Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
2011-07-22mfd: ab5500 - update with battery driver related stuffArun Murthy
Add charger, fuel gauge, battery temperature as clients of ab5500. Update the registers access privilege to each of the above mentioned and also the interrupts being used. ST-Ericsson Linux next: Not Tested ST-Ericsson ID: WP256401 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Ied7a7bc876459c3b96a62cda1ce29354f70c8573 Signed-off-by: Arun Murthy <arun.murthy@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/23148 Reviewed-by: QATEST Reviewed-by: Karl KOMIEROWSKI <karl.komierowski@stericsson.com> Reviewed-by: Johan PALSSON <johan.palsson@stericsson.com> Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
2011-07-22power: remove charger from ab8500 structMattias Wallin
The pointer to the charger from the ab8500 struct is no longer needed. ST-Ericsson ID: 256401 ST-Ericsson FOSS-OUT ID: Trivial ST-Ericsson Linux next: NA Signed-off-by: Mattias Wallin <mattias.wallin@stericsson.com> Change-Id: Iec4d4fb69c54366f96283ab1e676a874637550f0 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24710 Reviewed-by: Johan PALSSON <johan.palsson@stericsson.com> Reviewed-by: QATOOLS Reviewed-by: QATEST Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-07-22ux500: align u5500 PRCMU & CPUFREQ management with u8500 (multiple commits ↵Philippe Langlais
in one) Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org> Merge of following commits too: u5500: add support for sysclk basic sysclk support added in PRCMU driver and clock framework driver updated. Signed-off-by: Shreshtha Kumar Sahu <shreshthakumar.sahu@stericsson.com> U5500: Support for ESRAM12 EPOD in PRCMU driver Signed-off-by: Vijaya Kumar Kilari <vijay.kilari@stericsson.com> ux500: regulator: handle different base offset of ePOD ID 5500 ePOD ids are offseted for some reason in the PRCMU driver. Adjust the ids to index the local arrays to avoid memory corruption. Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com> ux500: pm: support PRCMU status check on 5500 This also removes unused 8500v1 code. Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com> arm: ux500: prcmu_ac_wake_req workaround This patch adds a check in prcmu_ac_wake_req that the modem is awake (in terms of the value in the PRCM_MOD_AWAKE_STATUS register) after the AC_WAKE_ACK has been received from the PRCMU FW. If the check fails, a retry is made. This seems to be necessary, since the modem can generate an AC_WAKE_ACK, and then still go to sleep. Signed-off-by: Mattias Nilsson <mattias.i.nilsson@stericsson.com> U5500: Add support for PRCMU Mailbox0 Add PRCMU mailbox 0 support for irq wakeup enable and disable Signed-off-by: Vijaya Kumar K <vijay.kilari@stericsson.com> U5500: Add support for power state transition PRCMU driver is updated to provide API for system power state transition Signed-off-by: Vijaya Kumar K <vijay.kilari@stericsson.com> ARM: ux500: prcmu: Add A9 watchdog interface Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com> U5500 : ab5500 core interrupt hander update AB5500 interrupts will be now handled by PRCMU and then routed to AB5500 core driver.AB5500 irq handler will no more read the latch registers to find the interrupt reason.Instead PRCMU will read the latch registers and provide the values to core driver. Signed-off-by: Bibek Basu <bibek.basu@stericsson.com> ARM: ux500: prcmu-dbg: Tiny code clean-up Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com> u5500: add mailbox1 and related function support Add cpufreq-db5500.c file for db5500 CPUfreq support. PRCMU mailbox1 and related functions' support is added. List of functions implemented: - prcmu_get/set_arm_opp - read_mailbox_1 Signed-off-by: Shreshtha Kumar Sahu <shreshthakumar.sahu@stericsson.com> Fix for PRCMU u5500: PRCMU IRQ should be NO_SUSPEND As on 8500. Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com> ARM: u5500: PRCMU reset API Added API for rebooting the board and for getting the last reboot code. Signed-off-by: Pawel Szyszuk <pawel.szyszuk@stericsson.com>
2011-07-22mach-ux500: Fix PRCMU support on U5500 platforms for 3.0Philippe Langlais
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
2011-07-22ux500: fix PRCMU boot problem, use new MFD driver & code cleanupPhilippe Langlais
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
2011-07-22mfd: prcmu-updates: Fix for merge from 35 merge with original commitsRobert Marklund
Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
2011-07-22mfd: ab8500_gpadc: Raw ADC value converted twiceKalle Komierowski
A bug made the raw ADC value converted to voltage entity twice. Renamed some gpadc function arguments to clarify use. ST-Ericsson ID: 344073 ST-Ericsson Linux next: Tested by ELINWAL ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I53465c2e65c001c23d13929b4bdb59700eb7cf18 Signed-off-by: Kalle Komierowski <kalle.komierowski@gmail.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24552 Tested-by: Karl KOMIEROWSKI <karl.komierowski@stericsson.com> Reviewed-by: Mattias WALLIN <mattias.wallin@stericsson.com> Reviewed-by: John BECKETT <john.beckett@stericsson.com> Reviewed-by: QATEST
2011-07-22AB8500: Export all AB8500 ADCs as debugfs nodesJohn Beckett
ST-Ericsson ID: 326039 ST-Ericsson FOSS-OUT ID: Trivial ST-Ericsson Linux next: NA Change-Id: I30ca4ef74046397d4b498b7cf5673a153a2f62e1 Signed-off-by: John Beckett <john.beckett@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/23456 Reviewed-by: Mattias WALLIN <mattias.wallin@stericsson.com>
2011-07-22ab8500-gpio: Allow initial configuration of GPIO registersChris Kimber
Allows the setting of the initial GPIO direction & pullup registers. ST-Ericsson Linux next: Ported & patch created ST-Ericsson ID: 334609 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I676ed8129a96a2fe41865117e4c864edc09d01ce Signed-off-by: Chris Kimber <chris.kimber@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/23339 Reviewed-by: Andrew LYNN <andrew.lynn@stericsson.com>
2011-07-22AB5500: AB5500 Analog to Digital conversion driverVijaya Kumar Kilari
AB5500 GPADC driver for battery/usb voltage, current and temperature measurement ST-Ericsson ID: WP332221 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Ia841694711cbba168e7e705a5a2bc78c6e3db8dc Signed-off-by: Vijaya Kumar Kilari <vijay.kilari@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/21775 Reviewed-by: Arun MURTHY <arun.murthy@stericsson.com> Tested-by: Arun MURTHY <arun.murthy@stericsson.com> Reviewed-by: Johan PALSSON <johan.palsson@stericsson.com> Reviewed-by: QATEST Reviewed-by: Linus WALLEIJ <linus.walleij@stericsson.com> Fix to merge with 4e75305 "AB5500: AB5500 Analog to Digital conversion driver"
2011-07-22kernel-doc: fix kernel-doc warningsom prakash
fix the potential kernel-doc warnings ST-Ericsson Linux next: - ST-Ericsson ID: 327425 ST-Ericsson FOSS-OUT ID: Trivial Signed-off-by: om prakash <omprakash.pal@stericsson.com> Change-Id: Ibaa302ddbaa8e223b81bd047fceaf7c3b97af491 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/23345 Reviewed-by: Rabin VINCENT <rabin.vincent@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Reviewed-by: QATEST Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
2011-07-22u5500: support RTC_CLK1/2Rabin Vincent
ST-Ericsson Linux next: - ST-Ericsson ID: WP257121 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I5feb1dea92e5cc5d4ce57120cfbd320fc54629af Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/22993 Reviewed-by: Bibek BASU <bibek.basu@stericsson.com> Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com> Fix to merge with 335a4a "u5500: support RTC_CLK1/2"
2011-07-22mfd: abx500: Move ab5500 includeRobert Marklund
Move the content of linux/mfd/abx500/ab5500.h to the mainline header linux/mfd/abx500.h Also change the clients of this file. ST-Ericsson Linux next: OK ST-Ericsson ID: 342253 ST-Ericsson FOSS-OUT ID: Trivial Signed-off-by: Robert Marklund <robert.marklund@stericsson.com> Change-Id: I30f7e2978d7bb00408597fdbdce8e7b6fdca397f Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24725 Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
2011-07-22U5500 : Update of ab5500 plaftorm data structurePhilippe Langlais
Bring back AB5500 initial data setting structure in petra platform data.Required by CG2900 chip driver ST-Ericsson Linux next: NA ST-Ericsson ID: 257121 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I7626d10611a32ea18619e47f21ed7a53016592be Signed-off-by: Bibek Basu <bibek.basu@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/22763 Reviewed-by: Lukasz RYMANOWSKI <lukasz.rymanowski@stericsson.com> Reviewed-by: QATOOLS Reviewed-by: QATEST Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com> Conflicts: drivers/mfd/ab5500-core.c
2011-07-22ab5500: provide a driver for power offRabin Vincent
ST-Ericsson Linux next: - ST-Ericsson ID: WP257121 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I3fcc5c9f1d88c433edc3698da739ecdd11e51711 Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/22352 Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
2011-07-22ab5500: placeholder to pass devices platform dataPhilippe Langlais
Added placeholder in struct ab5500_platform_data to add platform data of ab5500 devices. Change-Id: I020cbcfd344d19c7f4268638ebf147e7080b127d Signed-off-by: Shreshtha Kumar Sahu <shreshthakumar.sahu@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/21907 Reviewed-by: Mattias WALLIN <mattias.wallin@stericsson.com> Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
2011-07-22abx500: provide simpler function namesRabin Vincent
There are no non-interruptible versions of these functions, and all of them operate on registers, so provide shorter names to make subdrivers more readable while sticking to the 80-column line length limit. ST-Ericsson Linux next: - ST-Ericsson ID: WP257121 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I98dc8152e3e8064edb95ba5679277ed8c229b537 Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/21816 Reviewed-by: QATEST Reviewed-by: Mattias WALLIN <mattias.wallin@stericsson.com>
2011-07-22input/mfd: AB5500 ONSWa supportRabin Vincent
ST-Ericsson Linux next: - ST-Ericsson ID: WP257121 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I19122bc76c83545ffa15e6997320eacf58b8c0f6 Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/21180 Reviewed-by: Vijaya Kumar K-1 <vijay.kilari@stericsson.com> Reviewed-by: QATEST Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
2011-07-22U5500 : AB5500 Core driver updatePhilippe Langlais
AB5500 core driver is updated for cut1.0. It includes code clean up. ST-Ericsson Linux next: - ST-Ericsson ID: WP257121 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I1f61561836acc12cdd970cb9f4d7e79ab3901e95 Signed-off-by: Bibek Basu <bibek.basu@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/20844 Reviewed-by: Vijaya Kumar K-1 <vijay.kilari@stericsson.com> Reviewed-by: QATEST Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com> Conflicts: arch/arm/mach-ux500/board-u5500.c drivers/mfd/ab5500-core.c
2011-07-22regulator: add AB5500 supportPhilippe Langlais
ST-Ericsson Linux next: - ST-Ericsson ID: WP257121 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I91faae392552b8d0e993e1935115b63db9e7e268 Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/20654 Reviewed-by: Bengt JONSSON <bengt.g.jonsson@stericsson.com> Conflicts: drivers/regulator/Kconfig drivers/regulator/Makefile
2011-07-22power: ab8500_bm: Removal of maintenance chargingKalle Komierowski
This patch makes it possible to remove the maintenance A and B charging states and replaces them with a state that restarts the charging when the battery voltage level dropped below a certain level. The maintenance charging can now be turned of by setting a flag in the board configuration. ST-Ericsson Linux Next: - ST-Ericsson ID: CR333019 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Ie5e8ab20a3b57a1028d544371b10ffbb1fd77660 Signed-off-by: Kalle Komierowski <kalle.komierowski@gmail.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/19916 Reviewed-by: Johan GARDSMARK <johan.gardsmark@stericsson.com> Reviewed-by: Johan PALSSON <johan.palsson@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Tested-by: Karl KOMIEROWSKI <karl.komierowski@stericsson.com>
2011-07-22regulator Added regulator for sysclkreq and connected BT and WLANPhilippe Langlais
ST-Ericsson Linux next: - ST-Ericsson ID: ER 324615 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I616eda9d8e292c05dd8094d8085f5b488ee90396 Signed-off-by: Bengt Jonsson <bengt.g.jonsson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/19533 Reviewed-by: Par-Gunnar HJALMDAHL <par-gunnar.p.hjalmdahl@stericsson.com> Reviewed-by: Yvan FILLION <yvan.fillion@stericsson.com> Tested-by: Yvan FILLION <yvan.fillion@stericsson.com> Reviewed-by: Henrik CARLING <henrik.carling@stericsson.com> Conflicts: arch/arm/mach-ux500/board-mop500-regulators.c arch/arm/mach-ux500/board-mop500.c arch/arm/mach-ux500/virt-regulator-u8500.c drivers/regulator/ab8500.c include/linux/mfd/ab8500/ab8500-gpio.h Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
2011-07-22power: ab8500_bm: Lower current when charger voltage dropsJohan Palsson
The charger current optimization loop has been corrected for when the VBUS voltage collapses ST-Ericsson Linux next: - ST-Ericsson ID: ER328139 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Ie997402e3c0b868212ad59fe242f393ba0721007 Signed-off-by: Johan Palsson <johan.palsson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/18415 Reviewed-by: Karl KOMIEROWSKI <karl.komierowski@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-07-22power: ab8500_fg: Adding internal fuel gauge offset calibrationKalle Komierowski
This calibration is to compensate for the offset in the fuel gauge ST-Ericsson ID: ER327880 Change-Id: Ibf7e37ea65c4e8da334dcd554da71d442f3cdcb7 Signed-off-by: Kalle Komierowski <kalle.komierowski@gmail.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/17815 Reviewed-by: Johan PALSSON <johan.palsson@stericsson.com> Tested-by: Karl KOMIEROWSKI <karl.komierowski@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-07-22accdet: Workaround for AB8500 gpio (now use AB8500 offset)Philippe Langlais
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
2011-07-22Input: Add AB8500 AV Acc. Detection as platform drvPhilippe Langlais
Adds AV Accessory detection driver functionality as a platform driver. Driver allows detection of basic AV-Accessory connected to 3.5mm AV-Connector. Supported accessories include headphone, headset, video and carkit. Driver controls the audio-in/video-out switch based on the detected accessory type and notifies about button presses from basic headsets (No ECI Support). Accessory status and button presses are reported as standard input events, if AB8500 ASoC Machine driver is configured. For accessory properties reporting, ALSA JACK definitions (SND_JACK_*) are used to report the features supported by the attached accessory. Button presses are reported with KEY_MEDIA keycode. Depends on: http://gerrit.lud.stericsson.com/gerrit/16910 for GPIO framework update. ST-Ericsson ID: ER 275366 Signed-off-by: Rahul Venkatram <rahul.venkatram@stericsson.com> Change-Id: Ie1c68120fc718710ecac2d3dafe4f3e7b1a53ac1 Signed-off-by: Rahul Venkatram <rahul.venkatram@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/16256 Reviewed-by: Mattias WALLIN <mattias.wallin@stericsson.com> Conflicts: arch/arm/mach-ux500/board-mop500-regulators.c arch/arm/mach-ux500/board-mop500.c sound/soc/ux500/ux500_ab8500.c
2011-07-22power: ab8500_bm: Allow USB charger voltage to collapseJohan Palsson
When the requested USB charger current is more than the charger can deliver, the output voltage will drop and AB8500 will detect it as a not-ok charger. In this case we will try to lower the current and try charging again ST-Ericsson Linux next: - ST-Ericsson ID: ER327042 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I620663643d08b214b38a7498d891f30e3e4342ca Signed-off-by: Johan Palsson <johan.palsson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/17544 Reviewed-by: Karl KOMIEROWSKI <karl.komierowski@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-07-22power: ab8500_bm: Use maximum charger current according to charger configurationJohan Palsson
During configuration of the charger, a maximum charger current is set. The requested charger current will never be more than this. ST-Ericsson Linux next: - ST-Ericsson ID: WP324204 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I00e71ec126ff5f13fe1e1581020456d6609c788d Signed-off-by: Johan Palsson <johan.palsson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/17417 Reviewed-by: Karl KOMIEROWSKI <karl.komierowski@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-07-22power: ab8500-bm: update usb state change interface to otg notifierMian Yousaf Kaukab
Remove usb_state_changed() exported function. Replace it with otg notifier call. This makes static_di redundant so it is removed. Moreover, there is no need to protect usb_state.usb_changed with usb_lock. So usb_lock is removed as well. Usb state is fabricated based on the reported mA. State is not as accurate as reading it directly from the usb controller. This should not matter as battery- manager driver should care more about mA than the state anyway. Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com>
2011-07-22ux500: Fix warningsPhilippe Langlais
Signed-off-by: Philippe Langlais <philippe.langlais@stericsson.com>
2011-07-22mach-ux500: align with .35 & -next kernlPhilippe Langlais
Signed-off-by: Philippe Langlais <philippe.langlais@stericsson.com>
2011-07-22abx500: big merge from GLK 2.6.35Philippe Langlais
Signed-off-by: Philippe Langlais <philippe.langlais@stericsson.com>
2011-07-22AB8500 GPIO : Fix & clean duplicate definePhilippe Langlais
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
2011-07-21Revert "Merge remote-tracking branch 'arm-soc/for-next' into linaro-3.0"Nicolas Pitre
This reverts commit c7e0c8535d73f8c5bf760926a2bd71c9840cf2ef, reversing changes made to dfee09c8acf18e84fe197bb5d821d1e4e02d020f. John Stultz reports that Panda doesn't boot anymore and 'git bisect' indicated the merge commit itself as the culprit. The resulting kernel log is: [ 1.734802] OMAP DSS rev 4.0 [ 1.740417] omap_hwmod: dss_core: _wait_target_disable failed [ 1.746429] omap_device: omapdss_dss.-1: new worst case deactivate latency 01 [ 1.755035] omapdss DISPC error: can't get dss_clk [ 1.760101] omapdss_dispc: probe of omapdss_dispc failed with error -2 [ 1.767333] omapdss HDMI error: can't get hdmi_clk [ 1.772399] omapdss_hdmi: probe of omapdss_hdmi failed with error -2 [ 1.780273] ------------[ cut here ]------------ [ 1.785125] WARNING: at drivers/video/omap2/dss/dispc.c:553dispc_runtime_ge) [ 1.793640] Modules linked in: [ 1.796905] ---[ end trace 6fcb132ac310d004 ]--- [ 1.801757] Unable to handle kernel NULL pointer dereference at virtualaddr0 [...] Revert it so a later version of the arm-soc merge result can be used instead.
2011-07-17Merge branch 'next/devel-2' into for-nextArnd Bergmann
2011-07-08w1: ds1wm: add a reset recovery parameterJean-François Dagenais
This fixes a regression in 3.0 reported by Paul Parsons regarding the removal of the msleep(1) in the ds1wm_reset() function: : The linux-3.0-rc4 DS1WM 1-wire driver is logging "bus error, retrying" : error messages on an HP iPAQ hx4700 PDA (XScale-PXA270): : : <snip> : Driver for 1-wire Dallas network protocol. : DS1WM w1 busmaster driver - (c) 2004 Szabolcs Gyurko : 1-Wire driver for the DS2760 battery monitor chip - (c) 2004-2005, Szabolcs Gyurko : ds1wm ds1wm: pass: 1 bus error, retrying : ds1wm ds1wm: pass: 2 bus error, retrying : ds1wm ds1wm: pass: 3 bus error, retrying : ds1wm ds1wm: pass: 4 bus error, retrying : ds1wm ds1wm: pass: 5 bus error, retrying : ... : : The visible result is that the battery charging LED is erratic; sometimes : it works, mostly it doesn't. : : The linux-2.6.39 DS1WM 1-wire driver worked OK. I haven't tried 3.0-rc1, : 3.0-rc2, or 3.0-rc3. This sleep should not be required on normal circuitry provided the pull-ups on the bus are correctly adapted to the slaves. Unfortunately, this is not always the case. The sleep is restored but as a parameter to the probe function in the pdata. [akpm@linux-foundation.org: coding-style fixes] Reported-by: Paul Parsons <lost.distance@yahoo.com> Tested-by: Paul Parsons <lost.distance@yahoo.com> Signed-off-by: Jean-François Dagenais <dagenaisj@sonatest.com> Cc: Evgeniy Polyakov <johnpol@2ka.mipt.ru> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-07-07MFD: twl6040: Remove enum for PLL trackingPeter Ujfalusi
There is no need to have two different types for tracking the selected PLL. Use only the defines, when dealing with the PLLs. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Acked-by: Samuel Ortiz <sameo@linux.intel.com>
2011-07-07MFD: twl6040: Remove wrapper for threaded irq requestPeter Ujfalusi
Remove the twl6040_request_irq/free_irq inline functions, and use direct calls instead in the core driver to register the threaded irq. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Reviewed-by: Felipe Balbi <balbi@ti.com> Acked-by: Samuel Ortiz <sameo@linux.intel.com>
2011-07-04mfd: twl6040: Add initial supportMisael Lopez Cruz
TWL6040 IC provides analog high-end audio codec functions for handset applications. It contains several audio analog inputs and outputs as well as vibrator support. It's connected to the host processor via PDM interface for audio data communication. The audio modules are controlled by internal registers that can be accessed by I2C and PDM interface. TWL6040 MFD will be registered as a child of TWL-CORE, and will have two children of its own: twl6040-codec and twl6040-vibra. This driver is based on TWL4030 and WM8350 MFD drivers. Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Acked-by: Samuel Ortiz <sameo@linux.intel.com>
2011-07-04MFD: twl4030-codec -> twl4030-audio: Rename the driverPeter Ujfalusi
Rename the driver, and header file from twl4030-codec to twl4030-audio. To avoid breakage change depending drivers at the same time. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> CC: Misael Lopez Cruz <misael.lopez@ti.com> Acked-by: Samuel Ortiz <sameo@linux.intel.com>
2011-05-27TPS65911: Comparator: Add comparator driverJorge Eduardo Candelaria
This driver adds functionality to the tps65911 chip driver. Two of the comparators are configurable by software and measures VCCS voltage to detect high or low voltage scenarios. Signed-off-by: Jorge Eduardo Candelaria <jedu@slimlogic.co.uk> Acked-by: Samuel Ortiz <sameo@linux.intel.com> Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
2011-05-27TPS65911: Add support for added GPIO linesJorge Eduardo Candelaria
GPIO 1 to 8 are added for TPS65911 chip version. The gpio driver now handles more than one gpio lines. Subsequent versions of the chip family can add new GPIO lines with minimal driver changes. Signed-off-by: Jorge Eduardo Candelaria <jedu@slimlogic.co.uk> Acked-by: Grant Likely <grant.likely@secretlab.ca> Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
2011-05-27TPS65911: Add new irq definitionsJorge Eduardo Candelaria
TPS65911 adds new interrupt sources, as well as two new registers to handle them, one for interrupt status and one for interrupt masking. The added irqs are: -VMBCH2 - Low and High threshold -GPIO1-8 - Rising and falling edge detection -WTCHDG - Watchdog interrupt -PWRDN - PWRDN reset interrupt The code should handle these new registers only when the chip version is TPS65911. Signed-off-by: Jorge Eduardo Candelaria <jedu@slimlogic.co.uk> Acked-by: Samuel Ortiz <sameo@linux.intel.com> Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
2011-05-27regulator: tps65911: Add new chip versionJorge Eduardo Candelaria
The tps65911 chip introduces new features, including changes in the regulator module. - VDD1 and VDD2 remain unchanged. - VDD3 is now named VDDCTRL and has a wider voltage range. - LDOs are now named LDO1...8 and voltage ranges are sequential, making LDOs easier to handle. Signed-off-by: Jorge Eduardo Candelaria <jedu@slimlogic.co.uk> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
2011-05-27MFD: TPS65910: Add support for TPS65911 deviceJorge Eduardo Candelaria
The TPS65911 is the next generation of the TPS65910 family of PMIC chips. It adds a few features: - Watchdog Timer - PWM & LED generators - Comparators for system control status It also adds a set of Interrupts and GPIOs, among other things. The driver exports a function to identify between different versions of the tps65910 family, allowing other modules to identify the capabilities of the current chip. Signed-off-by: Jorge Eduardo Candelaria <jedu@slimlogic.co.uk> Acked-by: Samuel Ortiz <sameo@linux.intel.com> Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
2011-05-27regulator: Remove ↵Axel Lin
MAX8997_REG_BUCK1DVS/MAX8997_REG_BUCK2DVS/MAX8997_REG_BUCK5DVS macros In current implementation, the original macro implementation assumes the caller pass the parameter starting from 1 (to match the register names in datasheet). Thus we have unneeded plus one then minus one operations when using MAX8997_REG_BUCK1DVS/MAX8997_REG_BUCK2DVS/MAX8997_REG_BUCK5DVS macros. This patch removes these macros to avoid unneeded plus one then minus one operations without reducing readability. Signed-off-by: Axel Lin <axel.lin@gmail.com> Acked-by: Kyungmin Park <kyungmin.park@samsung.com> Acked-by: MyungJoo Ham <myungjoo.ham@samsung.com> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-09 19:23:27 +0000