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

diff --cc arch/arm/mach-exynos/mach-armlex4210.c
Simple merge

diff --cc arch/arm/mach-exynos/mach-nuri.c
index 91e5986,ed90aef..021dc68
--- 1/arch/arm/mach-exynos/mach-nuri.c
--- 2/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-smdkv310.c
Simple merge

diff --cc arch/arm/mach-exynos/mach-universal_c210.c
index ef706e9,cb2b027..add55b4
--- 1/arch/arm/mach-exynos/mach-universal_c210.c
--- 2/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[] = {

diff --cc arch/arm/plat-samsung/devs.c
Simple merge

diff --cc arch/arm/plat-samsung/include/plat/sdhci.h
Simple merge