summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'imx-cleanup' of git://git.pengutronix.de/git/ukl/linux-2.6 ↵Sascha Hauer2011-08-038003-515754/+623673
|\ | | | | | | into imx-cleanup
| * ARM: mxc: drop now unused function mxc_register_deviceUwe Kleine-König2011-08-012-15/+0
| | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| * ARM: imx/armadillo5x0: dynamically allocate physmap-flash deviceUwe Kleine-König2011-08-011-11/+7
| | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| * ARM: imx/mx1ads: dynamically allocate physmap-flash deviceUwe Kleine-König2011-08-011-10/+5
| | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| * ARM: mx5: dynamically allocate high speed i2c (imx-i2c actually)Uwe Kleine-König2011-08-016-42/+11
| | | | | | | | | | | | This removes the last device from devices.c. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| * ARM: mx5: dynamically allocate fsl-usb2-udc devicesUwe Kleine-König2011-08-018-35/+18
| | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| * ARM: mx5: dynamically allocate mxc-ehci devicesUwe Kleine-König2011-08-0112-97/+57
| | | | | | | | | | | | | | Additionally make the usb related defines consistent with the other imx SoCs. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| * ARM: mx5: remove unused #includes of devices.hUwe Kleine-König2011-08-014-4/+0
| | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| * ARM: mx5: fix remaining inconsistent names for irqsUwe Kleine-König2011-08-014-91/+91
| | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| * Merge branch 'for-next' of ↵Linus Torvalds2011-07-3144-452/+4118
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6 * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (46 commits) mfd: Fix mismatch in twl4030 mutex lock-unlock mfd: twl6030-pwm.c needs MODULE_LICENSE mfd: Fix the omap-usb-host clock API usage on usbhs_disable() mfd: Acknowledge WM8994 IRQs before reporting mfd: Acknowlege all WM831x IRQs before we handle them mfd: Avoid two assignments if failures happen in tps65910_i2c_probe regulator: Storing tps65912 error codes in u8 mfd: Don't leak init_data in tps65910_i2c_probe regulator: aat2870: Add AAT2870 regulator driver backlight: Add AAT2870 backlight driver mfd: Add AAT2870 mfd driver mfd: Remove dead code from max8997-irq mfd: Move TPS55910 Kconfig option mfd: Fix missing stmpe kerneldoc mfd: Fix off-by-one value range checking for tps65912_i2c_write mfd: Add devices for WM831x clocking module mfd: Remove comp{1,2}_threshold sysfs entries in tps65911_comparator_remove mfd: Don't ask about the TPS65912 core driver in Kconfig mfd: Fix off by one in WM831x IRQ code mfd: Add tps65921 support from twl-core ...
| | * mfd: Fix mismatch in twl4030 mutex lock-unlockSanjeev Premi2011-07-311-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A mutex is locked on entry into twl4030_madc_conversion(). Immediate return on some error conditions leaves the mutex locked. This patch ensures that mutex is always unlocked before leaving the function. Signed-off-by: Sanjeev Premi <premi@ti.com> Cc: Keerthy <j-keerthy@ti.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
| | * mfd: twl6030-pwm.c needs MODULE_LICENSERandy Dunlap2011-07-311-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | twl6030_pwm: module license 'unspecified' taints kernel. Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> Acked-by: Hemanth V <hemanthv@ti.com> Acked-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
| | * mfd: Fix the omap-usb-host clock API usage on usbhs_disable()Keshava Munegowda2011-07-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | usbhs_disable function was invoking clk_enable() instead of clk_disable(), thus only increasing the clock usage counter and preventing this particular clock from being ever turned off. Because of this, the power domain of omap4 the USB Host subsystem would never reach lower power states.This patch calls clk_disable() in usbhs_disable function Signed-off-by: Keshava Munegowda <keshava_mgowda@ti.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
| | * mfd: Acknowledge WM8994 IRQs before reportingMark Brown2011-07-311-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | This ensures we never have a window where we've handled an interrupt but not told the hardware about it. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
| | * mfd: Acknowlege all WM831x IRQs before we handle themMark Brown2011-07-311-17/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure that we never have a window where we've handled an interrupt (and therefore need to be notified of new events) but haven't yet told the interrupt controller that this is the case (so any new events will be discarded). Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
| | * mfd: Avoid two assignments if failures happen in tps65910_i2c_probeJesper Juhl2011-07-311-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In drivers/mfd/tps65910.c:tps65910_i2c_probe() there's potential for a tiny optimization. We assign to init_data->irq and init_data->irq_base long before we need them, and there are two potential exits from the function before they are needed. Moving the assignments below these two potential exits means we completely avoid doing them in these two (failure) cases. Signed-off-by: Jesper Juhl <jj@chaosbits.net> Acked-by: Graeme Gregory <gg@slimlogic.co.uk> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
| | * regulator: Storing tps65912 error codes in u8Dan Carpenter2011-07-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | get_ctrl_reg() returns -EINVAL so the error handling won't work here if reg is a u8. Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
| | * mfd: Don't leak init_data in tps65910_i2c_probeJesper Juhl2011-07-311-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | There are a couple of situations where we leak init_data in drivers/mfd/tps65910.c:tps65910_i2c_probe() - this patch should take care of them. Signed-off-by: Jesper Juhl <jj@chaosbits.net> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
| | * regulator: aat2870: Add AAT2870 regulator driverJin Park2011-07-313-0/+240
| | | | | | | | | | | | | | | | | | | | | | | | Add regulator driver for AnalogicTech AAT2870. Signed-off-by: Jin Park <jinyoungp@nvidia.com> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
| | * backlight: Add AAT2870 backlight driverJin Park2011-07-313-0/+254
| | | | | | | | | | | | | | | | | | | | | Add backlight driver for AnalogicTech AAT2870. Signed-off-by: Jin Park <jinyoungp@nvidia.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
| | * mfd: Add AAT2870 mfd driverJin Park2011-07-314-0/+727
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add mfd core driver for AnalogicTech AAT2870. The AAT2870 is communication through I2C and contains backlight and regulator components. Signed-off-by: Jin Park <jinyoungp@nvidia.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
| | * mfd: Remove dead code from max8997-irqJesper Juhl2011-07-311-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We either hit one of the case's or the default in the switch statement in get_i2c(), so the 'return ERR_PTR(-EINVAL);' at the end of the function is just dead code - remove it. Signed-off-by: Jesper Juhl <jj@chaosbits.net> Acked-by: MyungJoo Ham <myungjoo.ham@samsung.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
| | * mfd: Move TPS55910 Kconfig optionLinus Walleij2011-07-312-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | Having another TPS chip at the end of the Kconfig when all it's relatives are grouped together in their own section seems totally counter-intuitive. Move it, also in the Makefile. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
| | * mfd: Fix missing stmpe kerneldocOm Prakash2011-07-313-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generating kerneldoc for STMPE result in warnings, so fix this by adding missing documentation. Signed-off-by: Om Prakash <omprakash.pal@stericsson.com> Reviewed-by: Rabin Vincent <rabin.vincent@stericsson.com> Reviewed-by: Jonas Aberg <jonas.aberg@stericsson.com> Reviewed-by: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
| | * mfd: Fix off-by-one value range checking for tps65912_i2c_writeAxel Lin2011-07-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | If bytes == (TPS6591X_MAX_REGISTER + 1), we have a buffer overflow when doing memcpy(&msg[1], src, bytes). Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
| | * mfd: Add devices for WM831x clocking moduleMark Brown2011-07-311-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | With the new generic clk API that should appear at some point we should be able to support the clocking sensibly in Linux. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
| | * mfd: Remove comp{1,2}_threshold sysfs entries in tps65911_comparator_removeAxel Lin2011-07-311-0/+2
| | | | | | | | | | | | | | | Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
| | * mfd: Don't ask about the TPS65912 core driver in KconfigMark Brown2011-07-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The user has to select the I2C and SPI drivers individually and they select the core driver for the device so there's no point in presenting the user with an option for the core driver. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
| | * mfd: Fix off by one in WM831x IRQ codeDimitris Papastamos2011-07-311-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | The GPIO IRQs aren't the first IRQs defined, we need to subtract the base for the GPIOs as well to use them for array indexes. Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
| | * mfd: Add tps65921 support from twl-coreOleg Drokin2011-07-311-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Very similar to TPS65920 List of differences: http://www.ti.com/litv/pdf/swcu066b Signed-off-by: Oleg Drokin <green@linuxhacker.ru> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
| | * mfd: Add WM831x clock control register definitionsMark Brown2011-07-311-0/+101
| | | | | | | | | | | | | | | Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
| | * mfd: Ensure value written by wm831x_set_bits() is within the maskMark Brown2011-07-311-1/+1
| | | | | | | | | | | | | | | | | | | | | Purely for defensiveness. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
| | * mfd: Implement tps65910 IRQ cleanupMark Brown2011-07-312-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tps65910_irq_exit() cleanup function was generating a warning from sparse due to the lack of a prototype. This wasn't causing GCC warnings as the driver wasn't cleaning up its IRQs on exit at all so there was no use of an unprototyped function. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
| | * mfd: Add tunnelcreek watchdog to lpc_sch devicesAlexander Stein2011-07-311-1/+48
| | | | | | | | | | | | | | | | | | | | | Tunnel Creek has an additional watchdog core. Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
| | * mfd: Clean-up ab8500 register fileLinus Walleij2011-07-311-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a previously undefined test register and removed a number of double-defined accessory detect registers (they are already defined higher up in the file. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
| | * mfd: Update ab8500 subdevice listLinus Walleij2011-07-311-49/+166
| | | | | | | | | | | | | | | | | | | | | | | | | | | This synchronize the subdevice entries for the AB8500 MFD driver with the latest development of subdrivers for things like battery charging and temperature monitoring. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
| | * mfd: ab8500-core MFD devices marked as initdataRobert Rosengren2011-07-311-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Internal MFD device structs are marked as __devinitdata since the kernel will allocate memory for the same when calling mfd_add_devices. Signed-off-by: Robert Rosengren <robert.rosengren@stericsson.com> Reviewed-by: Mattias Wallin <mattias.wallin@stericsson.com> Reviewed-by: Johan Palsson <johan.palsson@stericsson.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
| | * tps65912: add regulator driverMargarita Olaya2011-07-313-0/+807
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tps65912 consist of 4 DCDCs and 10 LDOs. The output voltages can be configured by the SPI or I2C interface, they are meant to supply power to the main processor and other components. Signed-off-by: Margarita Olaya Cabrera <magi@slimlogic.co.uk> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@ti.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
| | * tps65912: gpio: add gpio driverMargarita Olaya2011-07-314-0/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TPS65912 has five GPIOs that can be configured for different purposes. Signed-off-by: Margarita Olaya Cabrera <magi@slimlogic.co.uk> Acked-by: Grant Likely <grant.likely@secretlab.ca> Acked-by: Liam Girdwood <lrg@ti.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
| | * tps65912: irq: add interrupt controllerMargarita Olaya2011-07-314-1/+243
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This module controls the interrupt handling for the tps65912. The interrupt sources can be the following: - GPIO - PWRON signal - PWRHOLD signal - Temperature detection Signed-off-by: Margarita Olaya Cabrera <magi@slimlogic.co.uk> Acked-by: Samuel Ortiz <sameo@linux.intel.com> Acked-by: Liam Girdwood <lrg@ti.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
| | * mfd: tps65912: Add new mfd deviceMargarita Olaya2011-07-316-0/+792
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tps65912 chip is a power management IC. It contains the following components: - Regulators - GPIO controller The core driver is registered as a platform driver, it provides communication through I2C and SPI interfaces. Signed-off-by: Margarita Olaya Cabrera <magi@slimlogic.co.uk> Acked-by: Samuel Ortiz <sameo@linux.intel.com> Acked-by: Liam Girdwood <lrg@ti.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
| | * mfd: Use kstrtoul_from_user in ab8500Peter Huewe2011-07-311-30/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch replaces the code for getting an unsigned long from a userspace buffer by a simple call to kstroul_from_user. This makes it easier to read and less error prone. Signed-off-by: Peter Huewe <peterhuewe@gmx.de> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
| | * mfd: Use kstrtoul_from_user in ab3550Peter Huewe2011-07-311-30/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch replaces the code for getting an unsigned long from a userspace buffer by a simple call to kstroul_from_user. This makes it easier to read and less error prone. Signed-off-by: Peter Huewe <peterhuewe@gmx.de> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
| | * mfd: Use generic irq chip for jz4740-adcLars-Peter Clausen2011-07-312-63/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | Use the generic irq chip framework for implementing the irq chip for the jz4740-adc driver. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Cc: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
| | * mfd: Fix error handling if BUG() isn't enabled in WM8994Mark Brown2011-07-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Even if we would've BUG()ed we should still tidy up after ourselves if that isn't enabled in the kernel config. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
| | * mfd: Fix WM8994 IRQ register cache restore on resumeMark Brown2011-07-311-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the byte swap was factored out into the per-register I/O functions the register restore for the IRQ mask cache (which we use and store in CPU native format for the interrupt handler) was not updated to do a byte swap when it uses the bulk I/O. Fix this by writing the cache out one register at a time. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
| | * mfd: Support multiple active WM831x AUXADC conversionsMark Brown2011-07-312-79/+188
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The WM831x AUXADC hardware can schedule multiple conversions at once, allowing higher performance when more than one source is in use as we can have the hardware start new conversions without having to wait for a register write. Take advantage of this in the interrupt driven case, maintaining a list of callers that are waiting for AUXADC conversions and completing them all simultaneously. The external interface of the AUXADC is not changed so there will be limited use of the feature immediately. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
| | * mfd: Restructure wm8994-core device revision handlingMark Brown2011-07-311-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | Switch on the device type before revision since anything we do here will be device as well as revision specific. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
| | * mfd: Allocate wm835x irq descs dynamicallySascha Hauer2011-07-311-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows boards to leave the irq_base field unitialized and prevents them having to reserve irqs in the platform. pdata can be optional for irq support now. Without pdata the driver allocates some free irq range. With pdata and irq_base > 0 the driver allocates exactly the specified irq. Without pdata the irq defaults to IRQF_TRIGGER_LOW. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
| | * mfd: Refactor wm831x AUXADC handling into a separate fileMark Brown2011-07-313-166/+201
| | | | | | | | | | | | | | | | | | | | | | | | | | | In preparation for some additional work on the wm831x AUXADC code move the support into a separate file. This is a simple code motion patch, there should be no functional changes. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
OpenPOWER on IntegriCloud