aboutsummaryrefslogtreecommitdiff
path: root/drivers/mfd
AgeCommit message (Collapse)Author
2010-07-03Merge branch 'glamo-2.6.34' into om-gta02-2.6.34om-gta02-2.6.34Lars-Peter Clausen
2010-07-03glamo-core: use debugfs instead of sysfs for the 'regs' nodeThibaut Girka
Use debugfs, which is better-suited than sysfs for the 'regs' node. Also change the expected format from decimal to hexadecimal numbers.
2010-07-03glamo-core: get rid of unused glamo_reg_{read, write}_batchThibaut Girka
2010-07-03glamo-core: initialize engine states as disabledThibaut Girka
This should fix random init failures such as white screen on boot.
2010-07-03glamo-core: fix registers in init scriptThibaut Girka
2010-07-03glamo-core: only disable non-disabled engines on suspendThibaut Girka
2010-06-23Merge branch 'glamo-2.6.34' into om-gta02-2.6.34Lars-Peter Clausen
Conflicts: drivers/gpio/Makefile
2010-06-23Fix crash when reading Glamo registers via sysfsThomas White
glamo-core didn't ioremap() some areas, so don't try to read them. Signed-off-by: Thomas White <taw@bitwiz.org.uk>
2010-06-23glamo: Move subdrivers to appropriate directoriesThibaut Girka
Instead of staying in drivers/mfd/glamo, the glamo subdrivers have been moved to the appropriate directories. Additionally, config options were renamed as follows: * MFD_GLAMO stays the same * MFD_GLAMO_MCI becomes MMC_GLAMO * MFD_GLAMO_GPIO becomes GPIO_GLAMO * MFD_GLAMO_FB becomes FB_GLAMO
2010-06-23glamo-fb: unmap/free everything mapped/allocatedThibaut Girka
2010-06-23glamo: style/indentation fixesThibaut Girka
2010-06-23glamo-core: drop unused attribute irq_works (forgot to commit header file)Thibaut Girka
2010-06-19Merge branch 'glamo-2.6.34' into om-gta02-2.6.34Lars-Peter Clausen
2010-06-19glamo-core: drop unused attribute irq_worksThibaut Girka
2010-06-19glamo: fix two bitmask issuesThibaut Girka
2010-06-19glamo-mci: eliminate some duplicated code in glamo_mci_read_workerThibaut Girka
2010-06-19glamo-mci: Make the read_worker work in its own threadThibaut Girka
2010-06-19glamo: fixed some style/indentation issuesThibaut Girka
2010-06-19glamo-mci: free irq after removing host, not beforeThibaut Girka
2010-06-19glamo-mci: safer probeThibaut Girka
Calls mmc_host_disable instead of mmc_host_lazy_disable if an error occurs, thus avoiding to schedule a delayed work that would end up using free'd objects.
2010-06-19glamo-mci: Make use of mmc_host_enable/disable instead of custom timer.Thibaut Girka
A custom timer was used to suspend the mmc host when idle. MMC core now provides a generic way to do that.
2010-06-10Merge branch 'glamo-2.6.34' into om-gta02-2.6.34Lars-Peter Clausen
2010-06-10glamo-mci: drop unused IRQ polling codeThibaut Girka
host->irq_works is always true, so, the IRQ polling function in glamo-mci.c never gets called. Furthermore, according to Lars, it was only here for very early prototypes of the glamo chip. So, there should be no issue in dropping it.
2010-06-09Merge branch 'glamo-2.6.34' into om-gta02-2.6.34Lars-Peter Clausen
2010-06-09glamo-mci: Use threaded irqsThibaut Girka
2010-06-08Merge branch 'pcf50633-2.6.34' into om-gta02-2.6.34Lars-Peter Clausen
2010-06-08pcf50633: Fix typoLars-Peter Clausen
2010-06-08Merge branch 'pcf50633-2.6.34' into om-gta02-2.6.34Lars-Peter Clausen
2010-06-08MFD: PCF50633: Use dev_pm_ops instead of legacy i2c suspend/resume callbacksLars-Peter Clausen
Right now in 2.6.34 the legacy powermanagement callbacks are broken, so we work around it by switching to dev_pm_ops.
2010-06-08MFD: pcf50633: Use mfd cells to register child devicesLars-Peter Clausen
This patch changes the pcf50633 core code to use mfd cells to register child devices instead of calling platform_device_{alloc,add} for each child. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
2010-06-06Merge branch 'glamo-2.6.34' into om-gta02-2.6.34Lars-Peter Clausen
2010-06-06glamo: Add MODULE_ALIAS for the glamo-fb and glamo-mci driverLars-Peter Clausen
This allows the modules to be auto-loaded by udev. Patch from ThibG.
2010-05-18Merge branches 'wm8753-2.6.34', 'pcf50633-2.6.34', 'jbt6k74-2.6.34', ↵Lars-Peter Clausen
'glamo-2.6.34', 'om-misc-2.6.34' and 'om-s3c-2.6.34' into om-gta02-2.6.34
2010-05-18Add glamo driver.Lars-Peter Clausen
2010-05-17pcf50633: Move irq related functions to it's own file.Lars-Peter Clausen
This reduces the code clutter a bit and will ease an the migration to genirq.
2010-05-17pcf50633: Use threaded irqLars-Peter Clausen
Use a threaded irq instead of normal irq and a workqueue.
2010-05-17pcf50633: Move pcf50633-gpio driver to the gpio drivers folderLars-Peter Clausen
2010-05-17pcf50633-gpio: Add gpiolib support.Lars-Peter Clausen
2010-05-17backlight/mfd: Add pcf50633 backlight driverLars-Peter Clausen
This patch adds a backlight driver controling the pcf50633 led converter. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
2010-05-17MFD: pcf50633-adc: Fix potential race pcf50633_adc_sync_readLars-Peter Clausen
Currently it's not guaranteed that request struct is not already freed when reading from it. Fix this by moving synced request related fields from the pcf50633_adc_request struct to its own struct and store it on the functions stack. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
2010-05-17MFD: pcf50633: Fix bitfield logic in interrupt handlerLars-Peter Clausen
Those constants are alreay bitfields.
2010-05-13mfd: Clean up after WM83xx AUXADC interrupt if it arrives lateMark Brown
In certain circumstances, especially under heavy load, the AUXADC completion interrupt may be detected after we've timed out waiting for it. That conversion would still succeed but the next conversion will see the completion that was signalled by the interrupt for the previous conversion and therefore not wait for the AUXADC conversion to run, causing it to report failure. Provide a simple, non-invasive cleanup by using try_wait_for_completion() to ensure that the completion is not signalled before we wait. Since the AUXADC is run within a mutex we know there can only have been at most one AUXADC interrupt outstanding. A more involved change should follow for the next merge window. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
2010-03-30include cleanup: Update gfp.h and slab.h includes to prepare for breaking ↵Tejun Heo
implicit slab.h inclusion from percpu.h percpu.h is included by sched.h and module.h and thus ends up being included when building most .c files. percpu.h includes slab.h which in turn includes gfp.h making everything defined by the two files universally available and complicating inclusion dependencies. percpu.h -> slab.h dependency is about to be removed. Prepare for this change by updating users of gfp and slab facilities include those headers directly instead of assuming availability. As this conversion needs to touch large number of source files, the following script is used as the basis of conversion. http://userweb.kernel.org/~tj/misc/slabh-sweep.py The script does the followings. * Scan files for gfp and slab usages and update includes such that only the necessary includes are there. ie. if only gfp is used, gfp.h, if slab is used, slab.h. * When the script inserts a new include, it looks at the include blocks and try to put the new include such that its order conforms to its surrounding. It's put in the include block which contains core kernel includes, in the same order that the rest are ordered - alphabetical, Christmas tree, rev-Xmas-tree or at the end if there doesn't seem to be any matching order. * If the script can't find a place to put a new include (mostly because the file doesn't have fitting include block), it prints out an error message indicating which .h file needs to be added to the file. The conversion was done in the following steps. 1. The initial automatic conversion of all .c files updated slightly over 4000 files, deleting around 700 includes and adding ~480 gfp.h and ~3000 slab.h inclusions. The script emitted errors for ~400 files. 2. Each error was manually checked. Some didn't need the inclusion, some needed manual addition while adding it to implementation .h or embedding .c file was more appropriate for others. This step added inclusions to around 150 files. 3. The script was run again and the output was compared to the edits from #2 to make sure no file was left behind. 4. Several build tests were done and a couple of problems were fixed. e.g. lib/decompress_*.c used malloc/free() wrappers around slab APIs requiring slab.h to be added manually. 5. The script was run on all .h files but without automatically editing them as sprinkling gfp.h and slab.h inclusions around .h files could easily lead to inclusion dependency hell. Most gfp.h inclusion directives were ignored as stuff from gfp.h was usually wildly available and often used in preprocessor macros. Each slab.h inclusion directive was examined and added manually as necessary. 6. percpu.h was updated not to include slab.h. 7. Build test were done on the following configurations and failures were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my distributed build env didn't work with gcov compiles) and a few more options had to be turned off depending on archs to make things build (like ipr on powerpc/64 which failed due to missing writeq). * x86 and x86_64 UP and SMP allmodconfig and a custom test config. * powerpc and powerpc64 SMP allmodconfig * sparc and sparc64 SMP allmodconfig * ia64 SMP allmodconfig * s390 SMP allmodconfig * alpha SMP allmodconfig * um on x86_64 SMP allmodconfig 8. percpu.h modifications were reverted so that it could be applied as a separate patch and serve as bisection point. Given the fact that I had only a couple of failures from tests on step 6, I'm fairly confident about the coverage of this conversion patch. If there is a breakage, it's likely to be something in one of the arch headers which should be easily discoverable easily on most builds of the specific arch. Signed-off-by: Tejun Heo <tj@kernel.org> Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-12Merge branch 'for-linus' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: mfd: Several MFD drivers should depend on GENERIC_HARDIRQS mfd: Fix sm501 requested region size
2010-03-12mfd: Several MFD drivers should depend on GENERIC_HARDIRQSGeert Uytterhoeven
commit 5fb4d38b19d95a5f980f0a10adba798f5b92128c ("mfd: Move WM831x to generic IRQ") didn't take into account that genirq support depends on GENERIC_HARDIRQS. Additionally, 2.6.34-rc1 added: - commit 2afa62ea76027b00e472ddb672191e6e15425b43 ("mfd: Use genirq in 88pm860x"). - commit 760e4518788df6762700e6bb9dd8692379f11168 ("mfd: Convert WM8350 to genirq"). - commit 1f1cf8f98cf6588365efeaab8e7e7758aaa77f6e ("mfd: Update irq handler in max8925") Make all of them depend on GENERIC_HARDIRQS to avoid compile errors on architectures that don't support genirq yet. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
2010-03-12mfd: Fix sm501 requested region sizeSamuel Ortiz
We should only request for the MFD used region, not the whole thing. Signed-off-by: Samuel Ortiz <sameo@linux.intel.com> Tested-by: Paul Mundt <lethal@linux-sh.org> Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
2010-03-08Merge branch 'for-next' into for-linusJiri Kosina
Conflicts: Documentation/filesystems/proc.txt arch/arm/mach-u300/include/mach/debug-macro.S drivers/net/qlge/qlge_ethtool.c drivers/net/qlge/qlge_main.c drivers/net/typhoon.c
2010-03-07mfd: Fix ucb1x00 build failure for collie_defconfigPeter Huewe
This patch fixes a build failure[1], by adding the missing semaphore.h include References: [1] http://kisskb.ellerman.id.au/kisskb/buildresult/2234322/ Signed-off-by: Peter Huewe <peterhuewe@gmx.de> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
2010-03-07mfd: Use completion interrupt for WM831x AUXADCMark Brown
Use the completion interrupt generated by the device rather than polling for conversions to complete. As a backup we still check the status of the AUXADC if we don't get a completion, mostly for systems that don't have the WM831x interrupt infrastructure hooked up. Also reduce the timeout for completion of conversions to 5ms from the previous 10ms, the lower timeout should be sufficient. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
2010-03-07mfd: Use completion interrupt for WM835x AUXADCMark Brown
Use the completion interrupt generated by the device rather than polling for conversions to complete. As a backup we still check the state of the AUXADC if we don't get a completion, mostly for systems that don't have the WM8350 interrupt infrastructure hooked up. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>