aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Merge branch 'linux-omap-3.0' into android-omap-3.0Erik Gilling2011-11-111-10/+69
| |\ \ \ | | |/ /
| | * | MFD: twl6040-codec: Automatic power on failure checkPeter Ujfalusi2011-11-111-10/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check the following registers after we received the READYINT interrupt (init ready) from twl6040 to be sure that the boot sequence has been really completed: reg 0x05 must be 0x81 <- NCPCTL reg 0x06 must be 0x45 <- LDOCTL reg ox08 must be 0x01 <- LPPLLCTL Try to boot up using the automatic power on, if it still fails revert back to manual power control, and execute the sequence by hand. Change-Id: I91119f38d3258bd485647dc9dc9f901a57f67204 Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: PankajJindal <pankajjindal@ti.com> Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
* | | | Merge branch 'android-omap-3.0' into android-omap-tuna-3.0Dima Zavin2011-11-101-14/+55
|\ \ \ \ | |/ / /
| * | | Merge branch 'linux-omap-3.0' into android-omap-3.0Dima Zavin2011-11-101-14/+55
| |\ \ \ | | |/ /
| | * | MFD: twl6040: Enable/disable external 32kHz clockMisael Lopez Cruz2011-11-101-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow TWL6040 MFD to make explicit use of external 32kHz clock. It's required for Power-On state, and can be disabled during Sleep state. Since external clocks might not be handled through clock framework, it's up to platforms/boards to implement the appropriate method as needed. Change-Id: I027bb51ec6263d8c1b04b6bc50d24077674be255 Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
| | * | MFD: twl6040: Remove unnecessary pdev local variableMisael Lopez Cruz2011-11-101-14/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TWL6040 platform device is used only for error message prints, it can be removed as the twl6040 device pointer can be retrieved from main twl6040 struct. Change-Id: I1fb06020ffb6df2af7884ce3304844c8c52e0dc1 Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
* | | | Merge branch 'android-omap-3.0' into android-omap-tuna-3.0Colin Cross2011-11-032-3/+152
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Conflicts: arch/arm/mach-omap2/dpll3xxx.c Change-Id: Ie53daed5cabbadef73d18969263ff2f7b77b3dc7
| * | | Merge branch 'linux-omap-3.0' into android-omap-3.0Colin Cross2011-11-032-3/+152
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Conflicts: drivers/mmc/host/omap_hsmmc.c Change-Id: I37eac90b9007a8a96fa25788126e2bf2b49255aa
| | * | OMAP4: mfd: twl6030 madc: disable GPADC_IN1 temperature measurement feature ↵Baek.Kyung-Han2011-11-031-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in suspend. To reduce current consumption of twl6030, disable GPADC_IN1 temperature measurement feature in suspend. When system wakeup, enable GPADC_IN1 temperature measurement feature. Change-Id: I53e2d4ce8939bc6356b3fb4158d591f1deb21835
| | * | MFD: TWL6030: Keep all processor group active on I2C error.Ambresh K2011-11-031-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On I2c read error while reading DEV_ON, DEV_ON bits will be wrongly configured leading to MPU shutdown on suspend. Writing 0 to DEV_ON bits has no effect and will eventually keep all the processor group active during suspend. Signed-off-by: Ambresh K <ambresh@ti.com>
| | * | MFD: TWL6030: Configure MOD & CON processor group to OFF.Ambresh K2011-11-031-0/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For PMIC to enter deeper power state, all the processor group needs be to turned off and it can be achieved either through HW & SW. In case of HW, by de-asserting PREQ1/2a/2b/2c/3 pins all the processor group will be turned off. In case of SW, by configuring DEV_ON register, we can selectively disable individual processor group. In most of HW design, only PREQ1 is used to turn Application processor and PREQ2a/2b/2c/3 are not connected. So to achieve low power state, MOD & CON processor group needs to disabled through SW. SW bits gets reset after PMIC exit low power state, so it is necessary to ensure that during every suspend, SW bits are configured accordingly. Change-Id: I3e29086fcc04199601233b45000fb4fa87a063c3 Signed-off-by: Ambresh K <ambresh@ti.com> Signed-off-by: Baek.Kyung-Han <wildtaz.sec@gmail.com>
| | * | MFD: TWL6030: Map system resources.Ambresh K2011-11-031-3/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TWL6030 has Phoenix group system resource & some system configuration that needs to handled in a suitable manner to achieve TWL low power state. Currently patch has only statically defined for DEV_ON, list can be easily extend for other resources too. By default DEV_ON is configured to DEV_GRP_P1, based on board requirement power_data has to be updated in board file. Change-Id: Icb9ab2ccf5b9eea80cb59e6c63968194002960a4 Signed-off-by: Ambresh K <ambresh@ti.com>
* | | | tuna: twl6030 adc: Enable ADC channel 1 for battery temperatureTodd Poynor2011-11-031-1/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I4b14c611e4c27e042508da750216e06a0368178f Signed-off-by: Todd Poynor <toddpoynor@google.com>
* | | | Revert "tuna: twl6030 adc: Enable ADC channel 1 for battery temperature"Dima Zavin2011-10-311-2/+1
| | | | | | | | | | | | | | | | This reverts commit 90614432a0d56d8623a14ff44376ec33fc3f2f61.
* | | | mfd: omap: fix hostconfig incr_align bitVikram Pandita2011-10-281-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Its found on simulation results of EHCI IP, that there are worse OCP accesses generated when ENA_INCR_ALIGN = 1 Looks the bit is not exactly doing what it was designed for. Simulation results for ENA_INCR_ALIGN == 0 show much lesser OCP L3 interconnect requests being generated as opposed to Simulation results for ENA_INCR_ALIGN == 1 So switch ENA_INCR_ALIGN back to 0 Change-Id: Ic832d65a7b3acf2df1a696bf3aeee5d26d706134 Reported-by: John Grossman <johngro@google.com> Signed-off-by: Vikram Pandita <vikram.pandita@ti.com>
* | | | Merge branch 'android-omap-3.0' into android-omap-tuna-3.0Colin Cross2011-10-272-1/+2
|\ \ \ \ | |/ / /
| * | | Merge branch 'linux-omap-3.0' into android-omap-3.0Colin Cross2011-10-272-1/+2
| |\ \ \ | | |/ /
| | * | Merge commit 'v3.0.8' into linux-omap-3.0Colin Cross2011-10-272-1/+2
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: drivers/tty/serial/omap-serial.c drivers/usb/musb/musb_gadget.c sound/soc/omap/omap-mcbsp.c Change-Id: Ic31b7266dda3ac8483f737272874ebf4725b5fe3
| | | * mfd: Make omap-usb-host TLL mode work againAnand Gadiyar2011-10-031-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit e600cffe618ff0da29ae1f8b8d3824ce0e2409fc upstream. This code section seems to have been accidentally copy pasted. It causes incorrect bits to be set up in the TLL_CHANNEL_CONF register and prevents the TLL mode from working correctly. Signed-off-by: Anand Gadiyar <gadiyar@ti.com> Cc: Keshava Munegowda <keshava_mgowda@ti.com> Acked-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | | * mfd: Fix initialisation of tps65910 interruptsJohan Hovold2011-10-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit fa948761e685fb03823b3029e5b6bdb52229d6ce upstream. Fix regression introduced by commit a2974732ca7614aaf0baf9d6dd3ad893d50ce1c5 (TPS65911: Add new irq definitions) which caused irq_num to be incorrectly set for tps65910. Signed-off-by: Johan Hovold <jhovold@gmail.com> Acked-by: Graeme Gregory <gg@slimlogic.co.uk> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | | | mfd: omap: fix hostconfig recommended configurationVikram Pandita2011-10-241-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recommendation is to put ENA_INCR_ALIGN == 1 for UHH_HOSTCONFIG Recommendation is to put APP_START_CLK == 0 if OHCI is not used Fix this configuration Change-Id: Icd2f54dbd7a12dd5e2005d469f01658bfe202bb9 Signed-off-by: Vikram Pandita <vikram.pandita@ti.com>
* | | | Merge branch 'android-omap-3.0' into android-omap-tuna-3.0Colin Cross2011-10-171-4/+6
|\ \ \ \ | |/ / /
| * | | Merge branch 'linux-omap-3.0' into android-omap-3.0Colin Cross2011-10-171-4/+6
| |\ \ \ | | |/ /
| | * | mfd: twl: Add debug info to twl_i2c_read/write errorsMisael Lopez Cruz2011-10-171-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | twl_i2c_read and twl_i2c_write error messages don't give enough information about the error context. Add address, register and message length to the error message in order to provide more debug data. Change-Id: I732e052a690dc2befa388e74b0706aac42f24fd9 Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
* | | | Merge branch 'android-omap-3.0' into android-omap-tuna-3.0Erik Gilling2011-10-131-1/+5
|\ \ \ \ | |/ / /
| * | | Merge branch 'linux-omap-3.0' into android-omap-3.0Erik Gilling2011-10-131-1/+5
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Conflicts: drivers/mfd/twl6030-madc.c Change-Id: I90bdfede31b046c57527297123eefef2e4fab771
| | * | mfd: twl6030 madc: Avoid early conversion timeout on long sleepTodd Poynor2011-10-121-1/+5
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie7555a4859104e9398213e2693fa7edf0609007f Signed-off-by: Todd Poynor <toddpoynor@google.com>
* | | | Merge branch 'android-omap-3.0' into android-omap-tuna-3.0Erik Gilling2011-10-101-0/+4
|\ \ \ \ | |/ / /
| * | | Merge branch 'linux-omap-3.0' into android-omap-3.0Erik Gilling2011-10-101-0/+4
| |\ \ \ | | |/ /
| | * | mfd: twl6030 madc: disable when not in useTodd Poynor2011-10-091-0/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: I611aa1291ffd966d060aa92c80b4472819403858 Signed-off-by: Todd Poynor <toddpoynor@google.com>
* | | | Merge branch 'android-omap-3.0' into android-omap-tuna-3.0Colin Cross2011-10-091-0/+5
|\ \ \ \ | |/ / /
| * | | Merge branch 'linux-omap-3.0' into android-omap-3.0Colin Cross2011-10-091-0/+5
| |\ \ \ | | |/ /
| | * | regulator: TWL6030: add clk32kaudio as regulatorAxel Haslam2011-10-091-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the 32KHz audio clock as a regulator as it it may be used as a clk source for some external chips. By adding it, we can enable and disable it using the regulator framework. Change-Id: Ic7a39600277bd28cac039c1385c68fe712c89875 Signed-off-by: Axel Haslam <axelhaslam@ti.com>
* | | | TEMP: WARN on BAT_VLOW interruptTodd Poynor2011-10-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | to make these more noticeable in logs. Change-Id: I54fa97e2ddd6e7d5a8d7287bb563ada80b2b5ebc Signed-off-by: Todd Poynor <toddpoynor@google.com>
* | | | tuna: mfd: twl6030: Fix voltage reported for VBATMIN_THRESHOLDTodd Poynor2011-10-061-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Iea7b71f854fb9cccf51ad5b6869f0f60f5e16e07 Signed-off-by: Todd Poynor <toddpoynor@google.com>
* | | | tuna: twl6030 adc: Enable ADC channel 1 for battery temperatureTodd Poynor2011-10-051-1/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I0a38d6238bb3f1e17eae32ba94bb24116579db13 Signed-off-by: Todd Poynor <toddpoynor@google.com>
* | | | mfd: twl6030 adc: Fix crash on I2C error at bootTodd Poynor2011-10-051-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Error message dereferences a NULL pointer. Move code to enable CH2 to probe function. Change-Id: I05032a950590c9087e7f9a5cff18928367f6e53d Signed-off-by: Todd Poynor <toddpoynor@google.com>
* | | | Merge branch 'android-omap-3.0' into android-omap-tuna-3.0Iliyan Malchev2011-09-271-0/+1
|\ \ \ \ | |/ / /
| * | | Merge branch 'linux-omap-3.0' into android-omap-3.0Iliyan Malchev2011-09-271-0/+1
| |\ \ \ | | |/ /
| | * | mfd: twl6040: Warn if twl6040_disable is called when inactiveMisael Lopez Cruz2011-09-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Warn if twl6040_disable() API is called when TWL6040 MFD is already disabled. Change-Id: I65321e02b3b8005df9a378733833a2008a319f31 Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
* | | | TEMP: mfd: twl6030: Don't power down on BAT_VLOW interruptTodd Poynor2011-09-271-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | False positives seen, at least on OMAP4430 sample 4. Change-Id: I607cf5f3c7f043bbdec149887fcd72fb20598731 Signed-off-by: Todd Poynor <toddpoynor@google.com>
* | | | Merge branch 'android-omap-3.0' into android-omap-tuna-3.0Colin Cross2011-09-221-4/+15
|\ \ \ \ | |/ / /
| * | | mfd: twl6030: adc driver: add wakelockMarty Fouts2011-09-221-4/+15
| |/ / | | | | | | | | | | | | | | | | | | | | | It is possible for the device to suspend while the adc driver is waiting for a conversion to finish. Add a wakelock to prevent that. Change-Id: I32174b1213e7e6c1ef21fe507bdcafa3618e51f9 Signed-off-by: Marty Fouts <mfouts@sta.samsung.com>
* | | Merge branch 'android-omap-3.0' into android-omap-tuna-3.0Iliyan Malchev2011-09-211-3/+0
|\ \ \ | |/ /
| * | Revert "mfd: twl6030 madc: disable when not in use"Iliyan Malchev2011-09-211-3/+0
| | | | | | | | | | | | This reverts commit 9e1881507906359ad39bcb39aabea35fd64475ac.
* | | Merge branch 'android-omap-3.0' into android-omap-tuna-3.0Iliyan Malchev2011-09-211-0/+3
|\ \ \ | |/ /
| * | mfd: twl6030 madc: disable when not in useTodd Poynor2011-09-211-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | twl6030_madc sets the TOGGLE1 register GPADCS bit to enable GPADC on each conversion. Add code to set the GPADCR bit after the conversion is done. This may save up to 1.4mA while disabled, per the data sheet. Change-Id: I043640ab986be98093442cb62439b24a466c97c3 Signed-off-by: Todd Poynor <toddpoynor@google.com>
* | | Merge branch 'android-omap-3.0' into android-omap-tuna-3.0Iliyan Malchev2011-09-191-1/+7
|\ \ \ | |/ /
| * | mfd: twl6030 madc: Don't timeout conversions early on jiffies updateTodd Poynor2011-09-191-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | 5ms timeout is one jiffy, need to ensure at least 2 jiffies delta to avoid early timeout at trailing end of jiffy and to handle rollover during timeout calculation. Change-Id: I101400219d32f418c556824219772441408dc38a Signed-off-by: Todd Poynor <toddpoynor@google.com>
* | | Merge branch 'android-omap-3.0' into android-omap-tuna-3.0Dima Zavin2011-09-191-24/+7
|\ \ \ | |/ /
generated by cgit v1.1 at 2025-01-27 17:00:37 +0000