linux/drivers/regulator
Linus Torvalds 34800598b2 ARM: driver specific updates
These are all specific to some driver. They are typically the platform
 side of a change in the drivers directory, such as adding a new driver
 or extending the interface to the platform. In cases where there is no
 maintainer for the driver, or the maintainer prefers to have the
 platform changes in the same branch as the driver changes, the patches
 to the drivers are included as well.
 
 A much smaller set of driver updates that depend on other branches
 getting merged first will be sent later.
 
 The new export of tegra_chip_uid conflicts with other changes in fuse.c.
 In rtc-sa1100.c, the global removal of IRQF_DISABLED conflicts with
 the cleanup of the interrupt handling of that driver.
 
 Signed-off-by: Arnd Bergmann <arnd@arndb.de>
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIVAwUAT24/Y2CrR//JCVInAQLUdw//V4pKPuKempSe1kuD2MJfqldHwEVOlAUt
 of1IhLPAp8tpCscPDQ0yTy3ixquINg4jVnaDLL+E0quVbhLu6hlS2TYNKDEaVAAc
 cPUtVEUdja7Cfu4+bXX2vcWM/UyI6Ax7bsUUcwu4wFnEsjA6qOSu/jYY4jXDguHq
 ODGQSaSz0XQkfVBsWOlO8W/ejb0T3y+Ro3M/Vz5qJsMnZBR8R/i9aUYDFGiZ1GTn
 3APHB7ALz6SS5/9SJS65PH16poBexcea5gyb3gnR1yt30kRmMTOAWrLC+JdyqFaO
 7LHXW514+D1QbWV2gwNCWhQSLbgp9PWq/FXJtq4StW7tgNbDbj1d1Dc1GX+fvk2M
 bBih1yWoIVx6CZWFBQ7gsbqVHUZ/sW2fo76yb8K5dVPXx0fL5lEkv5Xwk3gxbqt5
 lPE8+z+jiL5D+8RK1DZQu1PfxzaMwDZkJkVoGLCcdyM7FvnX3LIYf2bqbcp+zrQL
 lz9aht9C1k12R7feOX8emlluNd3eaKv/6jLrOasUP5wrJDam5hesSD5mLeTlAdxZ
 U8XJe4L24dFv15/yrMCzcyes5EmB3aS3nfb9TsSfq22IOKo2PCQLCnL6Z/rfM+1p
 mGu7BqdBnx3/8NkHdUrttMWjuPNh77MfPM6RO/E+TaBLHtwvKoLWJAHAYQNmt2xH
 IbGcyorBD5s=
 =pQ3X
 -----END PGP SIGNATURE-----

Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull "ARM: driver specific updates" from Arnd Bergmann:
 "These are all specific to some driver.  They are typically the
  platform side of a change in the drivers directory, such as adding a
  new driver or extending the interface to the platform.  In cases where
  there is no maintainer for the driver, or the maintainer prefers to
  have the platform changes in the same branch as the driver changes,
  the patches to the drivers are included as well.

  A much smaller set of driver updates that depend on other branches
  getting merged first will be sent later.

  The new export of tegra_chip_uid conflicts with other changes in
  fuse.c.  In rtc-sa1100.c, the global removal of IRQF_DISABLED
  conflicts with the cleanup of the interrupt handling of that driver.

  Signed-off-by: Arnd Bergmann <arnd@arndb.de>"

Fixed up aforementioned trivial conflicts.

* tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (94 commits)
  ARM: SAMSUNG: change the name from s3c-sdhci to exynos4-sdhci
  mmc: sdhci-s3c: add platform data for the second capability
  ARM: SAMSUNG: support the second capability for samsung-soc
  ARM: EXYNOS: add support DMA for EXYNOS4X12 SoC
  ARM: EXYNOS: Add apb_pclk clkdev entry for mdma1
  ARM: EXYNOS: Enable MDMA driver
  regulator: Remove bq24022 regulator driver
  rtc: sa1100: add OF support
  pxa: magician/hx4700: Convert to gpio-regulator from bq24022
  ARM: OMAP3+: SmartReflex: fix error handling
  ARM: OMAP3+: SmartReflex: fix the use of debugfs_create_* API
  ARM: OMAP3+: SmartReflex: micro-optimization for sanity check
  ARM: OMAP3+: SmartReflex: misc cleanups
  ARM: OMAP3+: SmartReflex: move late_initcall() closer to its argument
  ARM: OMAP3+: SmartReflex: add missing platform_set_drvdata()
  ARM: OMAP3+: hwmod: add SmartReflex IRQs
  ARM: OMAP3+: SmartReflex: clear ERRCONFIG_VPBOUNDINTST only on a need
  ARM: OMAP3+: SmartReflex: Fix status masking in ERRCONFIG register
  ARM: OMAP3+: SmartReflex: Add a shutdown hook
  ARM: OMAP3+: SmartReflex Class3: disable errorgen before disable VP
  ...

Conflicts:
	arch/arm/mach-tegra/Makefile
	arch/arm/mach-tegra/fuse.c
	drivers/rtc/rtc-sa1100.c
2012-03-27 16:41:24 -07:00
..
88pm8607.c regulator: fix the ldo configure according to 88pm860x spec 2012-02-24 14:56:32 +00:00
Kconfig Merge tag 'regulator-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into next/drivers 2012-03-24 11:29:58 +00:00
Makefile Merge tag 'regulator-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into next/drivers 2012-03-24 11:29:58 +00:00
aat2870-regulator.c regulator: Add a pointer to aat2870_data in struct aat2870_regulator 2012-03-11 20:48:48 +00:00
ab3100.c regulator: pass additional of_node to regulator_register() 2011-11-23 18:47:04 +00:00
ab8500.c regulator: Convert ab8499 to use get_voltage_sel() 2012-03-11 20:48:43 +00:00
ad5398.c regulator: ad5398: Use DIV_ROUND_UP macro to calculate selector 2012-03-11 20:48:49 +00:00
anatop-regulator.c regulator: Add Anatop regulator driver 2012-03-14 12:37:35 +00:00
core.c regulator: Updates for 3.4 2012-03-21 10:34:56 -07:00
da903x.c regulator: da903x: Use DIV_ROUND_UP macro to calculate selector 2012-03-11 20:48:52 +00:00
da9052-regulator.c regulator: da9052: Ensure the selected voltage falls within the specified range 2012-03-11 20:39:10 +00:00
db8500-prcmu.c regulators/db8500: split off shared dbx500 code 2012-01-20 12:01:29 +00:00
dbx500-prcmu.c regulators/db8500: split off shared dbx500 code 2012-01-20 12:01:29 +00:00
dbx500-prcmu.h regulators/db8500: split off shared dbx500 code 2012-01-20 12:01:29 +00:00
dummy.c regulator: pass additional of_node to regulator_register() 2011-11-23 18:47:04 +00:00
dummy.h regulator: fix build when CONFIG_REGULATOR_DUMMY=n 2010-10-28 22:40:32 +01:00
fixed-helper.c regulator: provide a helper for registering a fixed regulator 2012-03-03 16:32:47 +00:00
fixed.c regulator fixed: Do not report enumaratable voltages if there are none 2012-03-11 20:48:51 +00:00
gpio-regulator.c regulator: Fix compile break due to missing arguments to regulator_register 2011-11-24 10:47:56 +00:00
isl6271a-regulator.c regulator: Simplify the code to get selector in isl6271a_set_voltage 2012-03-11 20:48:47 +00:00
lp3971.c regulator: pass additional of_node to regulator_register() 2011-11-23 18:47:04 +00:00
lp3972.c regulator: pass additional of_node to regulator_register() 2011-11-23 18:47:04 +00:00
max1586.c regulator: max1586: Use DIV_ROUND_UP macro to calculate selector 2012-03-11 20:48:49 +00:00
max8649.c Merge remote-tracking branch 'regulator/topic/stub' into regulator-next 2012-03-18 21:38:20 +00:00
max8660.c regulator: max8660: Use DIV_ROUND_UP macro to calculate selector 2012-03-11 20:48:50 +00:00
max8925-regulator.c regulator: max8925: Use DIV_ROUND_UP macro 2012-03-13 23:19:40 +00:00
max8952.c regulator: pass additional of_node to regulator_register() 2011-11-23 18:47:04 +00:00
max8997.c regulator: Kill max8997_get_rid function 2012-03-11 20:48:46 +00:00
max8998.c regulator: Silence error message in max8998_pmic_probe 2012-03-11 20:48:54 +00:00
mc13xxx-regulator-core.c regulator: Fix mc13xxx regulator modular build (again) 2012-02-09 22:57:46 +00:00
mc13xxx.h regulator: mc13892: add device tree probe support 2011-12-22 11:10:45 +00:00
mc13783-regulator.c regulator: mc13783: bail out without platform data 2012-03-11 20:48:44 +00:00
mc13892-regulator.c regulator: mc13892: Convert to devm_kzalloc() 2011-12-30 02:06:29 +00:00
of_regulator.c regulator: Set apply_uV only when min and max voltages are defined 2012-01-26 11:01:21 +00:00
pcap-regulator.c regulator: pass additional of_node to regulator_register() 2011-11-23 18:47:04 +00:00
pcf50633-regulator.c regulator: Fix n_voltage settings for pcf50633 regulator 2012-03-11 20:48:45 +00:00
s5m8767.c regulator: Make s5m8767_get_voltage_register always return correct register 2012-03-14 14:10:41 +00:00
tps6105x-regulator.c regulator: pass additional of_node to regulator_register() 2011-11-23 18:47:04 +00:00
tps6507x-regulator.c regulator: Convert tps6507x to set_voltage_sel 2012-03-14 14:13:17 +00:00
tps6524x-regulator.c regulator: Updates for 3.4 2012-03-21 10:34:56 -07:00
tps6586x-regulator.c regulator: tps6586x: fix typo in debug message 2012-03-11 20:49:29 +00:00
tps62360-regulator.c regulator: tps62360: Remove pointless test for unsigned less than zero 2012-03-11 20:48:40 +00:00
tps65023-regulator.c regulator: Remove redundant regmap_update_bits call for TPS65023_REG_CON_CTRL2 2012-02-06 16:38:18 +00:00
tps65217-regulator.c regulator: Merge tps65217_pmic_ldo234_ops and tps65217_pmic_dcdc_ops to tps65217_pmic_ops 2012-03-12 10:50:46 +00:00
tps65910-regulator.c Merge tag 'regulator-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into next/drivers 2012-03-24 11:29:58 +00:00
tps65912-regulator.c regulator: Simplify implementation of tps65912_get_voltage_dcdc 2012-03-14 12:37:23 +00:00
twl-regulator.c regulator: twl-regulator: Add fixed LDO for V1V8, V2V1 supply 2012-03-11 20:09:18 +00:00
userspace-consumer.c regulator: Convert virtual and userspace regulator consumer drivers to use module_platform_driver() 2011-11-28 11:49:13 +00:00
virtual.c regulator: Convert virtual and userspace regulator consumer drivers to use module_platform_driver() 2011-11-28 11:49:13 +00:00
wm831x-dcdc.c regulator: Convert wm831x regulator drivers to devm_kzalloc() 2011-12-20 11:29:05 +00:00
wm831x-isink.c regulator: Convert wm831x regulator drivers to devm_kzalloc() 2011-12-20 11:29:05 +00:00
wm831x-ldo.c regulator: Convert wm831x regulator drivers to devm_kzalloc() 2011-12-20 11:29:05 +00:00
wm8350-regulator.c regulator: Use DIV_ROUND_CLOSEST in wm8350_isink_get_current 2012-03-12 10:48:18 +00:00
wm8400-regulator.c regulator: wm8400: Use DIV_ROUND_UP macro to calculate selector 2012-03-11 20:48:51 +00:00
wm8994-regulator.c regulator: wm8994: Convert to devm_kzalloc() 2012-03-11 20:48:41 +00:00