Commit 81d41355 authored by Thomas Abraham's avatar Thomas Abraham Committed by Kukjin Kim
Browse files

ARM: SAMSUNG: remove all uses of clk_type member in sdhci platform data 



The sdhci driver is modified to be independent of clk_type member in the sdhci
platform data. Hence, all usage of clk_type in platform code is removed.

Signed-off-by: default avatarThomas Abraham <thomas.abraham@linaro.org>
[kgene.kim@samsung.com: re-worked on top of v3.4-rc2]
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent e816b57a

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

+0 −3
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ static struct s3c2410_uartcfg armlex4210_uartcfgs[] __initdata = { 


static struct s3c_sdhci_platdata armlex4210_hsmmc0_pdata __initdata = {

	.cd_type		= S3C_SDHCI_CD_PERMANENT,

	.clk_type		= S3C_SDHCI_CLK_DIV_EXTERNAL,

#ifdef CONFIG_EXYNOS4_SDHCI_CH0_8BIT

	.max_width		= 8,

	.host_caps		= MMC_CAP_8_BIT_DATA,
@@ -88,13 +87,11 @@ static struct s3c_sdhci_platdata armlex4210_hsmmc2_pdata __initdata = { 
	.cd_type		= S3C_SDHCI_CD_GPIO,

	.ext_cd_gpio		= EXYNOS4_GPX2(5),

	.ext_cd_gpio_invert	= 1,

	.clk_type		= S3C_SDHCI_CLK_DIV_EXTERNAL,

	.max_width		= 4,

};



static struct s3c_sdhci_platdata armlex4210_hsmmc3_pdata __initdata = {

	.cd_type		= S3C_SDHCI_CD_PERMANENT,

	.clk_type		= S3C_SDHCI_CLK_DIV_EXTERNAL,

	.max_width		= 4,

};

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

+0 −3
Original line number Diff line number Diff line
@@ -113,7 +113,6 @@ static struct s3c_sdhci_platdata nuri_hsmmc0_data __initdata = { 
				MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED |

				MMC_CAP_ERASE),

	.cd_type		= S3C_SDHCI_CD_PERMANENT,

	.clk_type		= S3C_SDHCI_CLK_DIV_EXTERNAL,

};



static struct regulator_consumer_supply emmc_supplies[] = {
@@ -154,7 +153,6 @@ static struct s3c_sdhci_platdata nuri_hsmmc2_data __initdata = { 
	.ext_cd_gpio		= EXYNOS4_GPX3(3),	/* XEINT_27 */

	.ext_cd_gpio_invert	= 1,

	.cd_type		= S3C_SDHCI_CD_GPIO,

	.clk_type		= S3C_SDHCI_CLK_DIV_EXTERNAL,

};



/* WLAN */
@@ -163,7 +161,6 @@ static struct s3c_sdhci_platdata nuri_hsmmc3_data __initdata = { 
	.host_caps		= MMC_CAP_4_BIT_DATA |

				MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED,

	.cd_type		= S3C_SDHCI_CD_EXTERNAL,

	.clk_type		= S3C_SDHCI_CLK_DIV_EXTERNAL,

};



static void __init nuri_sdhci_init(void)

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

+0 −2
Original line number Diff line number Diff line
@@ -472,12 +472,10 @@ static struct i2c_board_info i2c0_devs[] __initdata = { 


static struct s3c_sdhci_platdata origen_hsmmc0_pdata __initdata = {

	.cd_type		= S3C_SDHCI_CD_INTERNAL,

	.clk_type		= S3C_SDHCI_CLK_DIV_EXTERNAL,

};



static struct s3c_sdhci_platdata origen_hsmmc2_pdata __initdata = {

	.cd_type		= S3C_SDHCI_CD_INTERNAL,

	.clk_type		= S3C_SDHCI_CLK_DIV_EXTERNAL,

};



/* USB EHCI */

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

+0 −2
Original line number Diff line number Diff line
@@ -85,7 +85,6 @@ static struct s3c2410_uartcfg smdk4x12_uartcfgs[] __initdata = { 


static struct s3c_sdhci_platdata smdk4x12_hsmmc2_pdata __initdata = {

	.cd_type		= S3C_SDHCI_CD_INTERNAL,

	.clk_type		= S3C_SDHCI_CLK_DIV_EXTERNAL,

#ifdef CONFIG_EXYNOS4_SDHCI_CH2_8BIT

	.max_width		= 8,

	.host_caps		= MMC_CAP_8_BIT_DATA,
@@ -94,7 +93,6 @@ static struct s3c_sdhci_platdata smdk4x12_hsmmc2_pdata __initdata = { 


static struct s3c_sdhci_platdata smdk4x12_hsmmc3_pdata __initdata = {

	.cd_type		= S3C_SDHCI_CD_INTERNAL,

	.clk_type		= S3C_SDHCI_CLK_DIV_EXTERNAL,

};



static struct regulator_consumer_supply max8997_buck1 =

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

+0 −4
Original line number Diff line number Diff line
@@ -93,7 +93,6 @@ static struct s3c2410_uartcfg smdkv310_uartcfgs[] __initdata = { 


static struct s3c_sdhci_platdata smdkv310_hsmmc0_pdata __initdata = {

	.cd_type		= S3C_SDHCI_CD_INTERNAL,

	.clk_type		= S3C_SDHCI_CLK_DIV_EXTERNAL,

#ifdef CONFIG_EXYNOS4_SDHCI_CH0_8BIT

	.max_width		= 8,

	.host_caps		= MMC_CAP_8_BIT_DATA,
@@ -104,12 +103,10 @@ static struct s3c_sdhci_platdata smdkv310_hsmmc1_pdata __initdata = { 
	.cd_type		= S3C_SDHCI_CD_GPIO,

	.ext_cd_gpio		= EXYNOS4_GPK0(2),

	.ext_cd_gpio_invert	= 1,

	.clk_type		= S3C_SDHCI_CLK_DIV_EXTERNAL,

};



static struct s3c_sdhci_platdata smdkv310_hsmmc2_pdata __initdata = {

	.cd_type		= S3C_SDHCI_CD_INTERNAL,

	.clk_type		= S3C_SDHCI_CLK_DIV_EXTERNAL,

#ifdef CONFIG_EXYNOS4_SDHCI_CH2_8BIT

	.max_width		= 8,

	.host_caps		= MMC_CAP_8_BIT_DATA,
@@ -120,7 +117,6 @@ static struct s3c_sdhci_platdata smdkv310_hsmmc3_pdata __initdata = { 
	.cd_type		= S3C_SDHCI_CD_GPIO,

	.ext_cd_gpio		= EXYNOS4_GPK2(2),

	.ext_cd_gpio_invert	= 1,

	.clk_type		= S3C_SDHCI_CLK_DIV_EXTERNAL,

};



static void lcd_lte480wv_set_power(struct plat_lcd_data *pd,

CRA Git | Maintained and supported by SUSTech CRA and CCSE