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

diff --cc arch/arm/mach-exynos/mach-nuri.c
index ed90aef404c3175259e4a4ba576e60a6bb018a3f,91e5986a9d06c8d445005a1aea5bf43b8b153570..021dc68e89b508a43d68f26ab5c46906bcd6ae73
--- 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,9 -112,7 +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 cb2b027f09a603800477a31bfeb765b27f829942,ef706e98b595ca408cfbe0cb1f9f6991a87cb605..add55b432d7896a39ca376aa56dd696866d3b8dd
--- 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,9 -747,7 +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/include/plat/sdhci.h
Simple merge