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

Commit f3d88244 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'next/devel-samsung-mmc' of... 

Merge branch 'next/devel-samsung-mmc' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/drivers

* 'next/devel-samsung-mmc' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: SAMSUNG: change the name from s3c-sdhci to exynos4-sdhci
  mmc: sdhci-s3c: add platform data for the second capability
  ARM: SAMSUNG: support the second capability for samsung-soc
parents 04cc7bc6 f5cca864

arch/arm/mach-exynos/mach-nuri.c

+2 −2
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ static struct s3c_sdhci_platdata nuri_hsmmc0_data __initdata = { 
};



static struct regulator_consumer_supply emmc_supplies[] = {

	REGULATOR_SUPPLY("vmmc", "s3c-sdhci.0"),

	REGULATOR_SUPPLY("vmmc", "exynos4-sdhci.0"),

	REGULATOR_SUPPLY("vmmc", "dw_mmc"),

};
@@ -413,7 +413,7 @@ static struct regulator_consumer_supply __initdata max8997_ldo12_[] = { 
	REGULATOR_SUPPLY("vddio", "6-003c"), /* HDC802 */

};

static struct regulator_consumer_supply __initdata max8997_ldo13_[] = {

	REGULATOR_SUPPLY("vmmc", "s3c-sdhci.2"), /* TFLASH */

	REGULATOR_SUPPLY("vmmc", "exynos4-sdhci.2"), /* TFLASH */

};

static struct regulator_consumer_supply __initdata max8997_ldo14_[] = {

	REGULATOR_SUPPLY("inmotor", "max8997-haptic"),

arch/arm/mach-exynos/mach-universal_c210.c

+1 −1
Original line number Diff line number Diff line
@@ -741,7 +741,7 @@ static struct s3c_sdhci_platdata universal_hsmmc0_data __initdata = { 
};



static struct regulator_consumer_supply mmc0_supplies[] = {

	REGULATOR_SUPPLY("vmmc", "s3c-sdhci.0"),

	REGULATOR_SUPPLY("vmmc", "exynos4-sdhci.0"),

};



static struct regulator_init_data mmc0_fixed_voltage_init_data = {

arch/arm/plat-samsung/include/plat/sdhci.h

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ enum clk_types { 
 * struct s3c_sdhci_platdata() - Platform device data for Samsung SDHCI

 * @max_width: The maximum number of data bits supported.

 * @host_caps: Standard MMC host capabilities bit field.

 * @host_caps2: The second standard MMC host capabilities bit field.

 * @cd_type: Type of Card Detection method (see cd_types enum above)

 * @clk_type: Type of clock divider method (see clk_types enum above)

 * @ext_cd_init: Initialize external card detect subsystem. Called on
@@ -63,6 +64,7 @@ enum clk_types { 
struct s3c_sdhci_platdata {

	unsigned int	max_width;

	unsigned int	host_caps;

	unsigned int	host_caps2;

	unsigned int	pm_caps;

	enum cd_types	cd_type;

	enum clk_types	clk_type;

arch/arm/plat-samsung/platformdata.c

+2 −0
Original line number Diff line number Diff line
@@ -53,6 +53,8 @@ void s3c_sdhci_set_platdata(struct s3c_sdhci_platdata *pd, 
		set->cfg_gpio = pd->cfg_gpio;

	if (pd->host_caps)

		set->host_caps |= pd->host_caps;

	if (pd->host_caps2)

		set->host_caps2 |= pd->host_caps2;

	if (pd->pm_caps)

		set->pm_caps |= pd->pm_caps;

	if (pd->clk_type)

drivers/mmc/host/sdhci-s3c.c

+3 −3
Original line number Diff line number Diff line
@@ -518,9 +518,6 @@ static int __devinit sdhci_s3c_probe(struct platform_device *pdev) 
	if (pdata->cd_type == S3C_SDHCI_CD_PERMANENT)

		host->mmc->caps = MMC_CAP_NONREMOVABLE;



	if (pdata->host_caps)

		host->mmc->caps |= pdata->host_caps;



	if (pdata->pm_caps)

		host->mmc->pm_caps |= pdata->pm_caps;
@@ -544,6 +541,9 @@ static int __devinit sdhci_s3c_probe(struct platform_device *pdev) 
	if (pdata->host_caps)

		host->mmc->caps |= pdata->host_caps;



	if (pdata->host_caps2)

		host->mmc->caps2 |= pdata->host_caps2;



	ret = sdhci_add_host(host);

	if (ret) {

		dev_err(dev, "sdhci_add_host() failed\n");