From: Kukjin Kim <kgene.kim@samsung.com>
Date: Sat, 12 May 2012 21:48:21 +0000 (+0900)
Subject: Merge branch 'next/cleanup-samsung-macro' into next/cleanup-samsung
X-Git-Tag: v3.5-rc1~156^2~3^2
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/2870f5352451a99a364a807803e4c39477264c3c

Merge branch 'next/cleanup-samsung-macro' into next/cleanup-samsung
---

2870f5352451a99a364a807803e4c39477264c3c
diff --cc arch/arm/mach-exynos/mach-nuri.c
index 91e5986a9d06,ed90aef404c3..021dc68e89b5
--- a/arch/arm/mach-exynos/mach-nuri.c
+++ b/arch/arm/mach-exynos/mach-nuri.c
@@@ -112,7 -112,9 +112,8 @@@ static struct s3c_sdhci_platdata nuri_h
  	.host_caps		= (MMC_CAP_8_BIT_DATA | MMC_CAP_4_BIT_DATA |
  				MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED |
  				MMC_CAP_ERASE),
+ 	.host_caps2		= MMC_CAP2_BROKEN_VOLTAGE,
  	.cd_type		= S3C_SDHCI_CD_PERMANENT,
 -	.clk_type		= S3C_SDHCI_CLK_DIV_EXTERNAL,
  };
  
  static struct regulator_consumer_supply emmc_supplies[] = {
diff --cc arch/arm/mach-exynos/mach-universal_c210.c
index ef706e98b595,cb2b027f09a6..add55b432d78
--- a/arch/arm/mach-exynos/mach-universal_c210.c
+++ b/arch/arm/mach-exynos/mach-universal_c210.c
@@@ -747,7 -747,9 +747,8 @@@ static struct s3c_sdhci_platdata univer
  	.max_width		= 8,
  	.host_caps		= (MMC_CAP_8_BIT_DATA | MMC_CAP_4_BIT_DATA |
  				MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED),
+ 	.host_caps2		= MMC_CAP2_BROKEN_VOLTAGE,
  	.cd_type		= S3C_SDHCI_CD_PERMANENT,
 -	.clk_type		= S3C_SDHCI_CLK_DIV_EXTERNAL,
  };
  
  static struct regulator_consumer_supply mmc0_supplies[] = {