diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-09 11:39:39 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-09 11:39:39 -0400 |
| commit | 97e18dc007546fce8e99098480b921a02ebb3037 (patch) | |
| tree | f38c022d034e0172e83f6972983577f790f24dac /drivers/regulator/Makefile | |
| parent | 042f7b7cbd1e531278a09c449563165ba1f07673 (diff) | |
| parent | c67480173f72e883235dd0ad09d90156c8f87600 (diff) | |
Merge tag 'mmc-updates-for-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc
Pull MMC updates from Chris Ball:
"MMC highlights for 3.15:
Core:
- CONFIG_MMC_UNSAFE_RESUME=y is now default behavior
- DT bindings for SDHCI UHS, eMMC HS200, high-speed DDR, at 1.8/1.2V
- Add GPIO descriptor based slot-gpio card detect API
Drivers:
- dw_mmc: Refactor SOCFPGA support as a variant inside dw_mmc-pltfm.c
- mmci: Support HW busy detection on ux500
- omap: Support MMC_ERASE
- omap_hsmmc: Support MMC_PM_KEEP_POWER, MMC_PM_WAKE_SDIO_IRQ, (a)cmd23
- rtsx: Support pre-req/post-req async
- sdhci: Add support for Realtek RTS5250 controllers
- sdhci-acpi: Add support for 80860F16, fix 80860F14/SDIO card detect
- sdhci-msm: Add new driver for Qualcomm SDHCI chipset support
- sdhci-pxav3: Add support for Marvell Armada 380 and 385 SoCs"
* tag 'mmc-updates-for-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (102 commits)
mmc: sdhci-acpi: Intel SDIO has broken card detect
mmc: sdhci-pxav3: add support for the Armada 38x SDHCI controller
mmc: sdhci-msm: Add platform_execute_tuning implementation
mmc: sdhci-msm: Initial support for Qualcomm chipsets
mmc: sdhci-msm: Qualcomm SDHCI binding documentation
sdhci: only reprogram retuning timer when flag is set
mmc: rename ARCH_BCM to ARCH_BCM_MOBILE
mmc: sdhci: Allow for irq being shared
mmc: sdhci-acpi: Add device id 80860F16
mmc: sdhci-acpi: Fix broken card detect for ACPI HID 80860F14
mmc: slot-gpio: Add GPIO descriptor based CD GPIO API
mmc: slot-gpio: Split out CD IRQ request into a separate function
mmc: slot-gpio: Record GPIO descriptors instead of GPIO numbers
Revert "dts: socfpga: Add support for SD/MMC on the SOCFPGA platform"
mmc: sdhci-spear: use generic card detection gpio support
mmc: sdhci-spear: remove support for power gpio
mmc: sdhci-spear: simplify resource handling
mmc: sdhci-spear: fix platform_data usage
mmc: sdhci-spear: fix error handling paths for DT
mmc: sdhci-bcm-kona: fix build errors when built-in
...
Diffstat (limited to 'drivers/regulator/Makefile')
| -rw-r--r-- | drivers/regulator/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile index f0fe0c50b59c..12ef277a48b4 100644 --- a/drivers/regulator/Makefile +++ b/drivers/regulator/Makefile | |||
| @@ -55,6 +55,7 @@ obj-$(CONFIG_REGULATOR_MC13XXX_CORE) += mc13xxx-regulator-core.o | |||
| 55 | obj-$(CONFIG_REGULATOR_PALMAS) += palmas-regulator.o | 55 | obj-$(CONFIG_REGULATOR_PALMAS) += palmas-regulator.o |
| 56 | obj-$(CONFIG_REGULATOR_PFUZE100) += pfuze100-regulator.o | 56 | obj-$(CONFIG_REGULATOR_PFUZE100) += pfuze100-regulator.o |
| 57 | obj-$(CONFIG_REGULATOR_TPS51632) += tps51632-regulator.o | 57 | obj-$(CONFIG_REGULATOR_TPS51632) += tps51632-regulator.o |
| 58 | obj-$(CONFIG_REGULATOR_PBIAS) += pbias-regulator.o | ||
| 58 | obj-$(CONFIG_REGULATOR_PCAP) += pcap-regulator.o | 59 | obj-$(CONFIG_REGULATOR_PCAP) += pcap-regulator.o |
| 59 | obj-$(CONFIG_REGULATOR_PCF50633) += pcf50633-regulator.o | 60 | obj-$(CONFIG_REGULATOR_PCF50633) += pcf50633-regulator.o |
| 60 | obj-$(CONFIG_REGULATOR_RC5T583) += rc5t583-regulator.o | 61 | obj-$(CONFIG_REGULATOR_RC5T583) += rc5t583-regulator.o |