From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 4 May 2013 20:45:17 +0000 (-0700)
Subject: Merge tag 'mmc-updates-for-3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.10-rc1~96
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=173192958d06b8d1eb44f56d74373052ad6a9a60;p=platform%2Fkernel%2Flinux-3.10.git

Merge tag 'mmc-updates-for-3.10-rc1' of git://git./linux/kernel/git/cjb/mmc

Pull MMC update from Chris Ball:
 "MMC highlights for 3.10:

  Core:
   - Introduce MMC_CAP2_NO_PRESCAN_POWERUP to allow skipping
     mmc_power_up() at boot/initialization time if it's already
     happened, for performance (faster boot time) reasons.
   - Fix a bit width test failure that resulted in old eMMC cards being
     put into 1-bit mode when 4-bit mode was available.
   - Expose fwrev/hwrev for MMCv4 parts.
   - Improve card removal logic in the case where the card's removed
     slowly; we were missing card removal events if the card retained
     contact with the slot pads for long enough to reply to a CMD13
     while being removed.

  Drivers:
   - davinci_mmc: Support using PIO instead of DMA.
   - dw_mmc: Add support for Exynos4412.
   - mxcmmc: DT support, use slot-gpio API.
   - mxs-mmc: Add broken-cd/cd-inverted/non-removable DT property
     support.
   - sdhci-sirf: New sdhci-pltfm driver for CSR SiRF SoCs:
       SiRFprimaII: unicore ARM Cortex-A9
       SiRFatlas6: unicore ARM Cortex-A9
       SiRFmarco: dual core ARM Cortex-A9 SMP
   - sdhci-tegra: Add support for Tegra114 platforms, use
     mmc_of_parse()"

* tag 'mmc-updates-for-3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (66 commits)
  mmc: sdhci-tegra: fix MODULE_DEVICE_TABLE
  mmc: core: fix init controller performance regression, updated patch
  mmc: mxcmmc: enable DMA support on mpc512x
  mmc: mxcmmc: constify mxcmci_devtype
  mmc: mxcmmc: use slot-gpio API for write-protect detection
  mmc: mxcmmc: add mpc512x SDHC support
  mmc: mxcmmc: fix race conditions for host->req and host->data access
  mmc: mxcmmc: DT support
  mmc: dw_mmc: let device core setup the default pin configuration
  mmc: mxs-mmc: add broken-cd property
  mmc: mxs-mmc: add non-removable property
  mmc: mxs-mmc: add cd-inverted property
  mmc: core: call pm_runtime_put_noidle in pm_runtime_get_sync failed case
  mmc: mxcmmc: Fix bug when card is present during boot
  mmc: core: fix performance regression initializing MMC host controllers
  Revert "mmc: core: wait while adding MMC host to ensure root mounts successfully"
  mmc: atmel-mci: pio hang on block errors
  mmc: core: Fix bit width test failing on old eMMC cards
  mmc: dw_mmc: Use pr_info instead of printk
  mmc: dw_mmc: Check return value of regulator_enable
  ...
---

173192958d06b8d1eb44f56d74373052ad6a9a60
diff --cc drivers/mmc/host/davinci_mmc.c
index f8a96d6,4fdc159..3946a0e
--- a/drivers/mmc/host/davinci_mmc.c
+++ b/drivers/mmc/host/davinci_mmc.c
@@@ -1482,24 -1408,11 +1484,13 @@@ static struct platform_driver davinci_m
  		.name	= "davinci_mmc",
  		.owner	= THIS_MODULE,
  		.pm	= davinci_mmcsd_pm_ops,
 +		.of_match_table = of_match_ptr(davinci_mmc_dt_ids),
  	},
  	.remove		= __exit_p(davinci_mmcsd_remove),
 +	.id_table	= davinci_mmc_devtype,
  };
  
- static int __init davinci_mmcsd_init(void)
- {
- 	return platform_driver_probe(&davinci_mmcsd_driver,
- 				     davinci_mmcsd_probe);
- }
- module_init(davinci_mmcsd_init);
- 
- static void __exit davinci_mmcsd_exit(void)
- {
- 	platform_driver_unregister(&davinci_mmcsd_driver);
- }
- module_exit(davinci_mmcsd_exit);
+ module_platform_driver_probe(davinci_mmcsd_driver, davinci_mmcsd_probe);
  
  MODULE_AUTHOR("Texas Instruments India");
  MODULE_LICENSE("GPL");