29 Oct, 2010
40 commits
-
* 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: (39 commits)
Revert "namespace: add source file location exceptions"
Coccinelle: Add contextual message
Coccinelle: Fix documentation
Coccinelle: Find doubled arguments to boolean or bit operators.
Coccinelle: Find nested lock+irqsave functions that use the same flags variables.
namespace: add source file location exceptions
scripts/extract-ikconfig: add support for bzip2, lzma and lzo
kbuild: check return value of asprintf()
scripts/namespace.pl: improve to get more correct results
scripts/namespace.pl: some bug fixes
scripts/namespace.pl: update file exclusion list
scripts/namespace.pl: fix wrong source path
Coccinelle: Use the -no_show_diff option for org and report mode
Coccinelle: Add a new mode named 'chain'
Coccinelle: Use new comment format to explain kfree.cocci
Coccinelle: Improve user information with a new kind of comment
Coccinelle: Update documentation
MAINTAINERS: Coccinelle: Update email address
Documentation/kbuild: modules.txt cleanup
Documentation/kbuild: major edit of modules.txt sections 5-8
... -
* 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: (38 commits)
kbuild: convert `arch/tile' to the kconfig mainmenu upgrade
README: cite nconfig
Revert "kconfig: Temporarily disable dependency warnings"
kconfig: Use PATH_MAX instead of 128 for path buffer sizes.
kconfig: Fix realloc usage()
kconfig: Propagate const
kconfig: Don't go out from read config loop when you read new symbol
kconfig: fix menuconfig on debian lenny
kbuild: migrate all arch to the kconfig mainmenu upgrade
kconfig: expand file names
kconfig: use the file's name of sourced file
kconfig: constify file name
kconfig: don't emit warning upon rootmenu's prompt redefinition
kconfig: replace KERNELVERSION usage by the mainmenu's prompt
kconfig: delay gconf window initialization
kconfig: expand by default the rootmenu's prompt
kconfig: add a symbol string expansion helper
kconfig: regen parser
kconfig: implement the `mainmenu' directive
kconfig: allow PACKAGE to be defined on the compiler's command-line
...Fix up trivial conflict in arch/mn10300/Kconfig
-
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (73 commits)
power: Revert "power_supply: Mark twl4030_charger as broken"
mfd: Fix a memory leak when unload mc13xxx-core module
mfd: Fix resource reclaim for max8998
mfd: Remove unneeded ret value checking for max8998 register updates
mfd: Add free max8998->ono irq in max8998_irq_exit()
mfd: Fix resource reclaim in pcf50633_remove()
omap4: pandaboard: fix up mmc card detect logic
mfd: Fix ezx_pcap_probe error path
mfd: Fix off-by-one value range checking for tps6507x
mfd: Remove __devinitdata from tc6393xb_mmc_resources
mfd: Add WM831x SPI support
mfd: Factor out WM831x I2C I/O from the core driver
mfd: Remove DEBUG defines from mc13xxx-core
mfd: Fix jz4740_adc_set_enabled
mfd: Add TPS658621C device ID
mfd: Fix twl-irq function declaration warnings
regulator: max8998 BUCK1/2 voltage change with use of GPIOs
mfd: Voltages and GPIOs platform_data definitions for max8998
regulator: max8998 BUCK1/2 internal voltages and indexes defined
mfd: Support for ICs compliant with max8998
... -
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
watchdog: iTCO_wdt.c: remove extra pci_dev_put()'s from init code
watchdog: add support for Broadcom BCM63xx built-in watchdog
watchdog: f71808e_wdt: add support for the F71889FG
watchdog: MachZ: fix debug macro
watchdog: it8712f_wdt: Add module parameter for alternative reset sources
watchdog: it8712f_wdt: Add comments for config/control register names
watchdog: it87_wdt: Add support for watchdogs with 8b timers
watchdog: it87_wdt: Add support for IT8720F watchdog
watchdog: Use static const char * const where possible
watchdog: iTCO_wdt: Cleanup warning messages
watchdog: iTCO_wdt: TCO Watchdog patch for Intel Patsburg DeviceIDs -
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
ext4: BUG_ON fix: check if page has buffers before calling page_buffers() -
The iTCO_wdt driver erroneously releases the pci_dev, and causes PCI hotremove
to fail because of an incorrect usage count.The probe for this driver does a for_each_pci_dev() which gets a reference for
a pci_dev when iTCO_wdt_init() is successful. The for_each_pci_dev() loop
puts a reference for a pci_dev when iTCO_wdt_init() fails, so the
iTCO_wdt_init() does not need to do any pci_dev_put()'s.The only pci_dev_put() that is required is in the iTCO_wdt_cleanup() function.
Signed-off-by: Prarit Bhargava
Signed-off-by: Wim Van Sebroeck -
The missing definitions are now in.
This reverts commit 23886839a752401aba66517bff8a8b91549279ce.
Signed-off-by: Samuel Ortiz
-
Signed-off-by: Axel Lin
Signed-off-by: Samuel Ortiz -
Properly free irq and unregister max8998->rtc device in
max8998_i2c_probe() error path and max8998_i2c_remove().Signed-off-by: Axel Lin
Signed-off-by: Samuel Ortiz -
i2c_smbus_write_byte_data() returns zero or negative value,
therefore no need to check if ret is greater than zero or not.Signed-off-by: Axel Lin
Signed-off-by: Samuel Ortiz -
Signed-off-by: Axel Lin
Signed-off-by: Samuel Ortiz -
Calling sysfs_remove_group() to remove sysfs entries
and unregister bl_pdev in pcf50633_remove().Signed-off-by: Axel Lin
Acked-by: Harald Welte
Signed-off-by: Samuel Ortiz -
For MMC1 Controller, card detect interrupt source is
twl6030 which is non-gpio. The card detect call back function provides
card present/absent status by reading MMC Control register present
on twl6030. This functionality was introduced in mfd tree on
track to kernel.orgSync pandaboard to the same and make mmc work.
Cc: Tony Lindgren
Cc: Madhusudhan Chikkature
Cc: Adrian Hunter
Cc: Samuel OrtizAcked-by: Kishore Kadiyala
Signed-off-by: Nishanth Menon
Tested-by: Jarkko Nikula
Acked-by: Madhusudhan Chikkature
Acked-by: Tony Lindgren
Signed-off-by: Samuel Ortiz -
return -ENOMEM if create_singlethread_workqueue failed.
Signed-off-by: Axel Lin
Signed-off-by: Samuel Ortiz -
If bytes == (TPS6507X_MAX_REGISTER + 1), we have a buffer overflow when
doing memcpy(&msg[1], src, bytes).Signed-off-by: Axel Lin
Signed-off-by: Samuel Ortiz -
This static struct resource tc6393xb_mmc_resources[] is used in resume function,
therefore the data can not be wiped after init.Also, this causes a section mismatch.
Signed-off-by: Marek Vasut
Acked-by: Ian Molton
Signed-off-by: Samuel Ortiz -
Implement support for controlling WM831x and WM832x devices using SPI.
Signed-off-by: Mark Brown
Signed-off-by: Samuel Ortiz -
In preparation for the addition of SPI support for the WM831x move the I2C
specific code into a separate file with a separate Kconfig option so the
I2C support can be excluded from the build.Also update the 1133-EV1 PMIC module support for SMDK6410 to use the new
symbol.Signed-off-by: Mark Brown
Signed-off-by: Samuel Ortiz -
DEBUG and VERBOSE_DEBUG are not used.
Reported-by: David Jander
Signed-off-by: Samuel Ortiz -
When enabled is false, clear BIT(engine) of JZ_REG_ADC_ENABLE register.
Signed-off-by: Axel Lin
Acked-by: Lars-Peter Clausen
Signed-off-by: Samuel Ortiz -
The interface for this device should be identical to that of the
TPS658521A.Signed-off-by: Andrew Chew
Acked-by: Mike Rapoport
Signed-off-by: Samuel Ortiz -
Fixes following sparse warnings for twl4030 and twl6030 irq files.
drivers/mfd/twl4030-irq.c:783:5: warning: symbol 'twl4030_init_irq' was not
declared. Should it be static?
drivers/mfd/twl4030-irq.c:863:5: warning: symbol 'twl4030_exit_irq' was not
declared. Should it be static?
drivers/mfd/twl4030-irq.c:873:5: warning: symbol 'twl4030_init_chip_irq' was
not declared. Should it be static?drivers/mfd/twl6030-irq.c:226:5: warning: symbol 'twl6030_init_irq' was not
declared. Should it be static?
drivers/mfd/twl6030-irq.c:290:5: warning: symbol 'twl6030_exit_irq' was not
declared. Should it be static?Signed-off-by: G, Manjunath Kondaiah
Cc: linux-arm-kernel@lists.infradead.org
Cc: Tony Lindgren
Cc: Nishanth Menon
Signed-off-by: Samuel Ortiz -
max8998_pmic_probe:
- modified to check if valid pins are defined at platform
data
- maximal voltage values (predefined at platform data) are uploaded to
max8998 devicemax8998_set_voltage_buck:
- BUCK1/2 voltages change between values already defined
- Checks if valid GPIO pins are passed from platform data
- If requested voltage cannot be satisfied from already defined values,
then one of free slots is used
- Predefined maximum voltages (as defined at platform data) are always
availableSigned-off-by: Lukasz Majewski
Signed-off-by: Kyungmin Park
Acked-by: Mark Brown
Acked-by: Liam Girdwood
Signed-off-by: Samuel Ortiz -
Signed-off-by: Lukasz Majewski
Signed-off-by: Kyungmin Park
Acked-by: Mark Brown
Acked-by: Liam Girdwood
Signed-off-by: Samuel Ortiz -
BUCK1/2 internal voltages and indexes defined in the struct max8998_data
max_get_voltage_register now uses index values to chose proper register
More generic BUCK1/2 registers names providedSigned-off-by: Lukasz Majewski
Signed-off-by: Kyungmin Park
Acked-by: Mark Brown
Acked-by: Liam Girdwood
Signed-off-by: Samuel Ortiz -
Signed-off-by: Lukasz Majewski
Signed-off-by: Kyungmin Park
Acked-by: Mark Brown
Acked-by: Liam Girdwood
Signed-off-by: Samuel Ortiz -
Signed-off-by: Lukasz Majewski
Signed-off-by: Kyungmin Park
Acked-by: Mark Brown
Acked-by: Liam Girdwood
Signed-off-by: Samuel Ortiz -
The chip TRM documentation contradicts itself about this bit, page 174
of swcu050e says bit should be 0 for clear-on-read behavior, while
page 487 says it should be 1. Testing shows it should be 1, so set
the .set_cor flag accordingly. This is needed for upcoming BCI
charging driver to function.Signed-off-by: Grazvydas Ignotas
Acked-by: Tony Lindgren
Signed-off-by: Samuel Ortiz -
When the cell data_size is 0, the resulting platform_data pointer will be
set to ZERO_SIZE_PTR. That could be misleading for device drivers running
a NULL check on thei platform_data pointer before dereferencing it.Signed-off-by: Brian Harring
Signed-off-by: Samuel Ortiz -
Now that we have twl4030 charger driver, add back it's platform_data
(which was removed by f7ea2dc59ed46dcd0f1cfaccda02211f4507207b
as unused).Signed-off-by: Grazvydas Ignotas
Acked-by: Tony Lindgren
Signed-off-by: Samuel Ortiz -
The mfd driver for MC13783 recently got support for MC13892 and was
renamed accordingly from mc13783-core to mc13xxx-core. Do the same for
rtc-mc13783.The only relevant change is to use platform id's to tell the platform bus
that this driver is responsible for mc13892-rtc devices, too.Acked-by: Alessandro Zummo
Signed-off-by: Uwe Kleine-König
Signed-off-by: Samuel Ortiz -
Adding card detect callback function and card detect configuration
function for MMC1 Controller on OMAP4.Card detect configuration function does initial configuration of the
MMC Control & PullUp-PullDown registers of Phoenix.For MMC1 Controller, card detect interrupt source is
twl6030 which is non-gpio. The card detect call back function provides
card present/absent status by reading MMC Control register present
on twl6030.Since OMAP4 doesn't use any GPIO line as used in OMAP3 for card detect,
the suspend/resume initialization which was done in omap_hsmmc_gpio_init
previously is moved to the probe thus making it generic for both OMAP3 &
OMAP4.Cc: Tony Lindgren
Cc: Andrew Morton
Cc: Madhusudhan Chikkature
Cc: Adrian Hunter
Signed-off-by: Kishore Kadiyala
Signed-off-by: Samuel Ortiz -
mc13892 is the companion PMIC for Freescale's i.MX51. It's similar enough
to mc13782 to support it in a single driver.This patch introduces enough compatibility cruft to keep all users of the
superseded mc13783 driver unchanged.Signed-off-by: Uwe Kleine-König
Signed-off-by: Samuel Ortiz -
The last user is gone since v2.6.34-rc1~40
Signed-off-by: Uwe Kleine-König
Signed-off-by: Samuel Ortiz -
The regulator driver was converted to get the needed data directly from
platform_data bya10099b (regulator/mc13783: various cleanups)
so regulators and num_regulators can go away. Then apart from the flag
indicating that the adc does a conversion, flags is only a copy of the
flags member of platform_data. This flag isn't needed to be returned by
mc13783_get_flags, so mc13783_get_flags now gets the flags from
platform_data, too and the driver private member is renamed for clearity.Signed-off-by: Uwe Kleine-König
Signed-off-by: Samuel Ortiz -
This is needed for supporting the upcoming VX855 camera and OLPC DCON
drivers, as well as the advanced viafb features on non-OLPC hardware
based on this chip.Based on earlier work by Harald Welte.
Signed-off-by: Daniel Drake
Signed-off-by: Samuel Ortiz -
This device has GPIO, SPI and I2C capabilities.
The hardware can be found in the OLPC XO-1.5 laptop.
Based on earlier work by Harald Welte.
Signed-off-by: Daniel Drake
Signed-off-by: Samuel Ortiz -
The upcoming VIA VX855 MFD driver needs to communicate resources
to subdevices where the resources may be claimed by ACPI.Add a flag to mfd_cell to request that resources are not policed.
Signed-off-by: Daniel Drake
Signed-off-by: Samuel Ortiz -
Remove original 3-second ONKEY event. Detect ONKEY changing event directly.
So both UP and DOWN event of ONKEY in max8925 are monitered.Signed-off-by: Haojian Zhuang
Cc: Dmitry Torokhov
Signed-off-by: Samuel Ortiz -
88pm860x supports auto-blink LED in hardware. It messed with
timer trigger. Now disable the auto-blink function.Signed-off-by: Haojian Zhuang
Cc: Richard Purdie
Signed-off-by: Samuel Ortiz
