Commit 4b8be38c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mmc-merge-for-3.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc 

MMC highlights for 3.3:

Core:
 * Support for the HS200 high-speed eMMC mode.
 * Support SDIO 3.0 Ultra High Speed cards.
 * Kill pending block requests immediately if card is removed.
 * Enable the eMMC feature for locking boot partitions read-only
   until next power on, exposed via sysfs.

Drivers:
 * Runtime PM support for Intel Medfield SDIO.
 * Suspend/resume support for sdhci-spear.
 * sh-mmcif now processes requests asynchronously.

* tag 'mmc-merge-for-3.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (58 commits)
  mmc: fix a deadlock between system suspend and MMC block IO
  mmc: sdhci: restore the enabled dma when do reset all
  mmc: dw_mmc: miscaculated the fifo-depth with wrong bit operation
  mmc: host: Adds support for eMMC 4.5 HS200 mode
  mmc: core: HS200 mode support for eMMC 4.5
  mmc: dw_mmc: fixed wrong bit operation for SDMMC_GET_FCNT()
  mmc: core: Separate the timeout value for cache-ctrl
  mmc: sdhci-spear: Fix compilation error
  mmc: sdhci: Deal with failure case in sdhci_suspend_host
  mmc: dw_mmc: Clear the DDR mode for non-DDR
  mmc: sd: Fix SDR12 timing regression
  mmc: sdhci: Fix tuning timer incorrect setting when suspending host
  mmc: core: Add option to prevent eMMC sleep command
  mmc: omap_hsmmc: use threaded irq handler for card-detect.
  mmc: sdhci-pci: enable runtime PM for Medfield SDIO
  mmc: sdhci: Always pass clock request value zero to set_clock host op
  mmc: sdhci-pci: remove SDHCI_QUIRK2_OWN_CARD_DETECTION
  mmc: sdhci-pci: get gpio numbers from platform data
  mmc: sdhci-pci: add platform data
  mmc: sdhci: prevent card detection activity for non-removable cards
  ...
parents 5df1b274 0db13fc2

Documentation/mmc/mmc-dev-attrs.txt

+10 −0
Original line number Diff line number Diff line
@@ -64,3 +64,13 @@ Note on Erase Size and Preferred Erase Size: 
	size specified by the card.



	"preferred_erase_size" is in bytes.



SD/MMC/SDIO Clock Gating Attribute

==================================



Read and write access is provided to following attribute.

This attribute appears only if CONFIG_MMC_CLKGATE is enabled.



	clkgate_delay	Tune the clock gating delay with desired value in milliseconds.



echo <desired delay> > /sys/class/mmc_host/mmcX/clkgate_delay

Documentation/mmc/mmc-dev-parts.txt

+13 −0
Original line number Diff line number Diff line
@@ -25,3 +25,16 @@ echo 0 > /sys/block/mmcblkXbootY/force_ro 
To re-enable read-only access:



echo 1 > /sys/block/mmcblkXbootY/force_ro



The boot partitions can also be locked read only until the next power on,

with:



echo 1 > /sys/block/mmcblkXbootY/ro_lock_until_next_power_on



This is a feature of the card and not of the kernel. If the card does

not support boot partition locking, the file will not exist. If the

feature has been disabled on the card, the file will be read-only.



The boot partitions can also be locked permanently, but this feature is

not accessible through sysfs in order to avoid accidental or malicious

bricking.

arch/arm/plat-samsung/include/plat/sdhci.h

+1 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ enum clk_types { 
struct s3c_sdhci_platdata {

	unsigned int	max_width;

	unsigned int	host_caps;

	unsigned int	pm_caps;

	enum cd_types	cd_type;

	enum clk_types	clk_type;

arch/arm/plat-samsung/platformdata.c

+2 −0
Original line number Diff line number Diff line
@@ -53,6 +53,8 @@ void s3c_sdhci_set_platdata(struct s3c_sdhci_platdata *pd, 
		set->cfg_gpio = pd->cfg_gpio;

	if (pd->host_caps)

		set->host_caps |= pd->host_caps;

	if (pd->pm_caps)

		set->pm_caps |= pd->pm_caps;

	if (pd->clk_type)

		set->clk_type = pd->clk_type;

}

drivers/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ obj-$(CONFIG_EISA) += eisa/ 
obj-y				+= lguest/

obj-$(CONFIG_CPU_FREQ)		+= cpufreq/

obj-$(CONFIG_CPU_IDLE)		+= cpuidle/

obj-$(CONFIG_MMC)		+= mmc/

obj-y				+= mmc/

obj-$(CONFIG_MEMSTICK)		+= memstick/

obj-y				+= leds/

obj-$(CONFIG_INFINIBAND)	+= infiniband/

CRA Git | Maintained and supported by SUSTech CRA and CCSE