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

Commit 5f1a4dd0 authored Nov 14, 2012 by Lee Jones Committed by Chris Ball Dec 06, 2012

mmc: Standardise capability type



There are discrepancies with regards to how MMC capabilities
are carried throughout the subsystem. Let's standardise them
to eliminate any confusion.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Chris Ball <cjb@laptop.org>

parent d6ed91af

drivers/mmc/core/mmc.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -239,7 +239,7 @@ static void mmc_select_card_type(struct mmc_card *card)
	{		{
	struct mmc_host *host = card->host;		struct mmc_host *host = card->host;
	u8 card_type = card->ext_csd.raw_card_type & EXT_CSD_CARD_TYPE_MASK;		u8 card_type = card->ext_csd.raw_card_type & EXT_CSD_CARD_TYPE_MASK;
	unsigned int caps = host->caps, caps2 = host->caps2;		u32 caps = host->caps, caps2 = host->caps2;
	unsigned int hs_max_dtr = 0;		unsigned int hs_max_dtr = 0;

	if (card_type & EXT_CSD_CARD_TYPE_26)		if (card_type & EXT_CSD_CARD_TYPE_26)

include/linux/mmc/dw_mmc.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -229,8 +229,8 @@ struct dw_mci_board {
	u32 quirks; /* Workaround / Quirk flags */		u32 quirks; /* Workaround / Quirk flags */
	unsigned int bus_hz; /* Clock speed at the cclk_in pad */		unsigned int bus_hz; /* Clock speed at the cclk_in pad */

	unsigned int caps; /* Capabilities */		u32 caps; /* Capabilities */
	unsigned int caps2; /* More capabilities */		u32 caps2; /* More capabilities */
	/*		/*
	* Override fifo depth. If 0, autodetect it from the FIFOTH register,		* Override fifo depth. If 0, autodetect it from the FIFOTH register,
	* but note that this may not be reliable after a bootloader has used		* but note that this may not be reliable after a bootloader has used

include/linux/mmc/host.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -211,7 +211,7 @@ struct mmc_host {
	#define MMC_VDD_34_35 0x00400000 /* VDD voltage 3.4 ~ 3.5 */		#define MMC_VDD_34_35 0x00400000 /* VDD voltage 3.4 ~ 3.5 */
	#define MMC_VDD_35_36 0x00800000 /* VDD voltage 3.5 ~ 3.6 */		#define MMC_VDD_35_36 0x00800000 /* VDD voltage 3.5 ~ 3.6 */

	unsigned long caps; /* Host capabilities */		u32 caps; /* Host capabilities */

	#define MMC_CAP_4_BIT_DATA (1 << 0) /* Can the host do 4 bit transfers */		#define MMC_CAP_4_BIT_DATA (1 << 0) /* Can the host do 4 bit transfers */
	#define MMC_CAP_MMC_HIGHSPEED (1 << 1) /* Can do MMC high-speed timing */		#define MMC_CAP_MMC_HIGHSPEED (1 << 1) /* Can do MMC high-speed timing */
	@@ -241,7 +241,7 @@ struct mmc_host {
	#define MMC_CAP_CMD23 (1 << 30) /* CMD23 supported. */		#define MMC_CAP_CMD23 (1 << 30) /* CMD23 supported. */
	#define MMC_CAP_HW_RESET (1 << 31) /* Hardware reset */		#define MMC_CAP_HW_RESET (1 << 31) /* Hardware reset */

	unsigned int caps2; /* More host capabilities */		u32 caps2; /* More host capabilities */

	#define MMC_CAP2_BOOTPART_NOACC (1 << 0) /* Boot partition no access */		#define MMC_CAP2_BOOTPART_NOACC (1 << 0) /* Boot partition no access */
	#define MMC_CAP2_CACHE_CTRL (1 << 1) /* Allow cache control */		#define MMC_CAP2_CACHE_CTRL (1 << 1) /* Allow cache control */

include/linux/mmc/sdhci.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -158,8 +158,8 @@ struct sdhci_host {

	struct timer_list timer; /* Timer for timeouts */		struct timer_list timer; /* Timer for timeouts */

	unsigned int caps; /* Alternative CAPABILITY_0 */		u32 caps; /* Alternative CAPABILITY_0 */
	unsigned int caps1; /* Alternative CAPABILITY_1 */		u32 caps1; /* Alternative CAPABILITY_1 */

	unsigned int ocr_avail_sdio; /* OCR bit masks */		unsigned int ocr_avail_sdio; /* OCR bit masks */
	unsigned int ocr_avail_sd;		unsigned int ocr_avail_sd;

include/linux/platform_data/pxa_sdhci.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -48,8 +48,8 @@ struct sdhci_pxa_platdata {
	unsigned int ext_cd_gpio;		unsigned int ext_cd_gpio;
	bool ext_cd_gpio_invert;		bool ext_cd_gpio_invert;
	unsigned int max_speed;		unsigned int max_speed;
	unsigned int host_caps;		u32 host_caps;
	unsigned int host_caps2;		u32 host_caps2;
	unsigned int quirks;		unsigned int quirks;
	unsigned int pm_caps;		unsigned int pm_caps;
	};		};