Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8c91da5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (53 commits)
  mmc: dw_mmc: support mmc power control with regulator
  mmc: dw_mmc: fix suspend/resume operation
  mmc: dw_mmc: add quirks for unreliable card detect, and capabilities
  mmc: tmio: fix address in kunmap_atomic() calls
  mmc: core: reset card voltage after power off
  mmc: core: export function mmc_do_release_host()
  mmc: sdio: remember new card RCA when redetecting card
  mmc: dw_mmc: Remove set-but-unused variable.
  mmc: sdhci-esdhc-imx: add card detect on custom GPIO for mx25/35
  mmc: sdhci-esdhc: broken card detection is not a default quirk
  mmc: sdhci-esdhc-imx: add write protect on custom GPIO on mx25/35
  mmc: msm_sdcc: remove needless cache flush after dma_unmap_sg()
  mmc: sh_mmcif: support aggressive clock gating
  mmc: check if mmc cards < 2GB do sector addressing
  mmc: core: comment on why sdio_reset is done at init time
  mmc: dw_mmc: support DDR mode
  mmc: via-sdmmc: Remove set-but-unused variable.
  mmc: cb710: Return err value in cb710_wait_while_busy()
  mmc: sdhci-pci: Remove set-but-unused variable.
  mmc: mxs-mmc: add mmc host driver for i.MX23/28
  ...
parents 26b95cac c07946a3

Documentation/ABI/testing/sysfs-devices-mmc

0 → 100644
+21 −0
Original line number Diff line number Diff line 
What:		/sys/devices/.../mmc_host/mmcX/mmcX:XXXX/enhanced_area_offset

Date:		January 2011

Contact:	Chuanxiao Dong <chuanxiao.dong@intel.com>

Description:

		Enhanced area is a new feature defined in eMMC4.4 standard.

		eMMC4.4 or later card can support such feature. This kind of

		area can help to improve the card performance. If the feature

		is enabled, this attribute will indicate the start address of

		enhanced data area. If not, this attribute will be -EINVAL.

		Unit Byte. Format decimal.



What:		/sys/devices/.../mmc_host/mmcX/mmcX:XXXX/enhanced_area_size

Date:		January 2011

Contact:	Chuanxiao Dong <chuanxiao.dong@intel.com>

Description:

		Enhanced area is a new feature defined in eMMC4.4 standard.

		eMMC4.4 or later card can support such feature. This kind of

		area can help to improve the card performance. If the feature

		is enabled, this attribute will indicate the size of enhanced

		data area. If not, this attribute will be -EINVAL.

		Unit KByte. Format decimal.

arch/arm/mach-mxs/include/mach/mmc.h

0 → 100644
+18 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2011 Freescale Semiconductor, Inc. All Rights Reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#ifndef __MACH_MXS_MMC_H__

#define __MACH_MXS_MMC_H__



struct mxs_mmc_platform_data {

	int wp_gpio;	/* write protect pin */

	unsigned int flags;

#define SLOTF_4_BIT_CAPABLE	(1 << 0)

#define SLOTF_8_BIT_CAPABLE	(1 << 1)

};

#endif /* __MACH_MXS_MMC_H__ */

arch/arm/plat-mxc/include/mach/esdhc.h

+11 −1
Original line number Diff line number Diff line
@@ -10,7 +10,17 @@ 
#ifndef __ASM_ARCH_IMX_ESDHC_H

#define __ASM_ARCH_IMX_ESDHC_H



/**

 * struct esdhc_platform_data - optional platform data for esdhc on i.MX

 *

 * strongly recommended for i.MX25/35, not needed for other variants

 *

 * @wp_gpio:	gpio for write_protect (-EINVAL if unused)

 * @cd_gpio:	gpio for card_detect interrupt (-EINVAL if unused)

 */



struct esdhc_platform_data {

	unsigned int wp_gpio;	/* write protect pin */

	unsigned int wp_gpio;

	unsigned int cd_gpio;

};

#endif /* __ASM_ARCH_IMX_ESDHC_H */

drivers/mmc/card/Kconfig

+1 −2
Original line number Diff line number Diff line
@@ -58,12 +58,11 @@ config SDIO_UART 


config MMC_TEST

	tristate "MMC host test driver"

	default n

	help

	  Development driver that performs a series of reads and writes

	  to a memory card in order to expose certain well known bugs

	  in host controllers. The tests are executed by writing to the

	  "test" file in sysfs under each card. Note that whatever is

	  "test" file in debugfs under each card. Note that whatever is

	  on your card will be overwritten by these tests.



	  This driver is only of interest to those developing or

drivers/mmc/card/block.c

+1 −0
Original line number Diff line number Diff line
@@ -621,6 +621,7 @@ static struct mmc_blk_data *mmc_blk_alloc(struct mmc_card *card) 
	md->disk->private_data = md;

	md->disk->queue = md->queue.queue;

	md->disk->driverfs_dev = &card->dev;

	set_disk_ro(md->disk, md->read_only);



	/*

	 * As discussed on lkml, GENHD_FL_REMOVABLE should: