Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 81d413554a020ebe4f1f761cc5c417a306687511

Authored by Thomas Abraham
Committed by Kukjin Kim
1 parent e816b57a33
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

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: Thomas Abraham <thomas.abraham@linaro.org>
[kgene.kim@samsung.com: re-worked on top of v3.4-rc2]
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

Showing 9 changed files with 0 additions and 29 deletions Side-by-side Diff

arch/arm/mach-exynos/mach-armlex4210.c
Diff comments   View file @ 81d4135
... ... @@ -77,7 +77,6 @@
77 77  
78 78 static struct s3c_sdhci_platdata armlex4210_hsmmc0_pdata __initdata = {
79 79 .cd_type = S3C_SDHCI_CD_PERMANENT,
80   - .clk_type = S3C_SDHCI_CLK_DIV_EXTERNAL,
81 80 #ifdef CONFIG_EXYNOS4_SDHCI_CH0_8BIT
82 81 .max_width = 8,
83 82 .host_caps = MMC_CAP_8_BIT_DATA,
84 83  
... ... @@ -88,13 +87,11 @@
88 87 .cd_type = S3C_SDHCI_CD_GPIO,
89 88 .ext_cd_gpio = EXYNOS4_GPX2(5),
90 89 .ext_cd_gpio_invert = 1,
91   - .clk_type = S3C_SDHCI_CLK_DIV_EXTERNAL,
92 90 .max_width = 4,
93 91 };
94 92  
95 93 static struct s3c_sdhci_platdata armlex4210_hsmmc3_pdata __initdata = {
96 94 .cd_type = S3C_SDHCI_CD_PERMANENT,
97   - .clk_type = S3C_SDHCI_CLK_DIV_EXTERNAL,
98 95 .max_width = 4,
99 96 };
100 97  
arch/arm/mach-exynos/mach-nuri.c
Diff comments   View file @ 81d4135
... ... @@ -113,7 +113,6 @@
113 113 MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED |
114 114 MMC_CAP_ERASE),
115 115 .cd_type = S3C_SDHCI_CD_PERMANENT,
116   - .clk_type = S3C_SDHCI_CLK_DIV_EXTERNAL,
117 116 };
118 117  
119 118 static struct regulator_consumer_supply emmc_supplies[] = {
... ... @@ -154,7 +153,6 @@
154 153 .ext_cd_gpio = EXYNOS4_GPX3(3), /* XEINT_27 */
155 154 .ext_cd_gpio_invert = 1,
156 155 .cd_type = S3C_SDHCI_CD_GPIO,
157   - .clk_type = S3C_SDHCI_CLK_DIV_EXTERNAL,
158 156 };
159 157  
160 158 /* WLAN */
... ... @@ -163,7 +161,6 @@
163 161 .host_caps = MMC_CAP_4_BIT_DATA |
164 162 MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED,
165 163 .cd_type = S3C_SDHCI_CD_EXTERNAL,
166   - .clk_type = S3C_SDHCI_CLK_DIV_EXTERNAL,
167 164 };
168 165  
169 166 static void __init nuri_sdhci_init(void)
arch/arm/mach-exynos/mach-origen.c
Diff comments   View file @ 81d4135
... ... @@ -472,12 +472,10 @@
472 472  
473 473 static struct s3c_sdhci_platdata origen_hsmmc0_pdata __initdata = {
474 474 .cd_type = S3C_SDHCI_CD_INTERNAL,
475   - .clk_type = S3C_SDHCI_CLK_DIV_EXTERNAL,
476 475 };
477 476  
478 477 static struct s3c_sdhci_platdata origen_hsmmc2_pdata __initdata = {
479 478 .cd_type = S3C_SDHCI_CD_INTERNAL,
480   - .clk_type = S3C_SDHCI_CLK_DIV_EXTERNAL,
481 479 };
482 480  
483 481 /* USB EHCI */
arch/arm/mach-exynos/mach-smdk4x12.c
Diff comments   View file @ 81d4135
... ... @@ -85,7 +85,6 @@
85 85  
86 86 static struct s3c_sdhci_platdata smdk4x12_hsmmc2_pdata __initdata = {
87 87 .cd_type = S3C_SDHCI_CD_INTERNAL,
88   - .clk_type = S3C_SDHCI_CLK_DIV_EXTERNAL,
89 88 #ifdef CONFIG_EXYNOS4_SDHCI_CH2_8BIT
90 89 .max_width = 8,
91 90 .host_caps = MMC_CAP_8_BIT_DATA,
... ... @@ -94,7 +93,6 @@
94 93  
95 94 static struct s3c_sdhci_platdata smdk4x12_hsmmc3_pdata __initdata = {
96 95 .cd_type = S3C_SDHCI_CD_INTERNAL,
97   - .clk_type = S3C_SDHCI_CLK_DIV_EXTERNAL,
98 96 };
99 97  
100 98 static struct regulator_consumer_supply max8997_buck1 =
arch/arm/mach-exynos/mach-smdkv310.c
Diff comments   View file @ 81d4135
... ... @@ -93,7 +93,6 @@
93 93  
94 94 static struct s3c_sdhci_platdata smdkv310_hsmmc0_pdata __initdata = {
95 95 .cd_type = S3C_SDHCI_CD_INTERNAL,
96   - .clk_type = S3C_SDHCI_CLK_DIV_EXTERNAL,
97 96 #ifdef CONFIG_EXYNOS4_SDHCI_CH0_8BIT
98 97 .max_width = 8,
99 98 .host_caps = MMC_CAP_8_BIT_DATA,
100 99  
... ... @@ -104,12 +103,10 @@
104 103 .cd_type = S3C_SDHCI_CD_GPIO,
105 104 .ext_cd_gpio = EXYNOS4_GPK0(2),
106 105 .ext_cd_gpio_invert = 1,
107   - .clk_type = S3C_SDHCI_CLK_DIV_EXTERNAL,
108 106 };
109 107  
110 108 static struct s3c_sdhci_platdata smdkv310_hsmmc2_pdata __initdata = {
111 109 .cd_type = S3C_SDHCI_CD_INTERNAL,
112   - .clk_type = S3C_SDHCI_CLK_DIV_EXTERNAL,
113 110 #ifdef CONFIG_EXYNOS4_SDHCI_CH2_8BIT
114 111 .max_width = 8,
115 112 .host_caps = MMC_CAP_8_BIT_DATA,
... ... @@ -120,7 +117,6 @@
120 117 .cd_type = S3C_SDHCI_CD_GPIO,
121 118 .ext_cd_gpio = EXYNOS4_GPK2(2),
122 119 .ext_cd_gpio_invert = 1,
123   - .clk_type = S3C_SDHCI_CLK_DIV_EXTERNAL,
124 120 };
125 121  
126 122 static void lcd_lte480wv_set_power(struct plat_lcd_data *pd,
arch/arm/mach-exynos/mach-universal_c210.c
Diff comments   View file @ 81d4135
... ... @@ -748,7 +748,6 @@
748 748 .host_caps = (MMC_CAP_8_BIT_DATA | MMC_CAP_4_BIT_DATA |
749 749 MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED),
750 750 .cd_type = S3C_SDHCI_CD_PERMANENT,
751   - .clk_type = S3C_SDHCI_CLK_DIV_EXTERNAL,
752 751 };
753 752  
754 753 static struct regulator_consumer_supply mmc0_supplies[] = {
... ... @@ -788,7 +787,6 @@
788 787 .ext_cd_gpio = EXYNOS4_GPX3(4), /* XEINT_28 */
789 788 .ext_cd_gpio_invert = 1,
790 789 .cd_type = S3C_SDHCI_CD_GPIO,
791   - .clk_type = S3C_SDHCI_CLK_DIV_EXTERNAL,
792 790 };
793 791  
794 792 /* WiFi */
arch/arm/plat-samsung/devs.c
Diff comments   View file @ 81d4135
... ... @@ -370,7 +370,6 @@
370 370 .max_width = 4,
371 371 .host_caps = (MMC_CAP_4_BIT_DATA |
372 372 MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED),
373   - .clk_type = S3C_SDHCI_CLK_DIV_INTERNAL,
374 373 };
375 374  
376 375 struct platform_device s3c_device_hsmmc0 = {
... ... @@ -401,7 +400,6 @@
401 400 .max_width = 4,
402 401 .host_caps = (MMC_CAP_4_BIT_DATA |
403 402 MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED),
404   - .clk_type = S3C_SDHCI_CLK_DIV_INTERNAL,
405 403 };
406 404  
407 405 struct platform_device s3c_device_hsmmc1 = {
... ... @@ -434,7 +432,6 @@
434 432 .max_width = 4,
435 433 .host_caps = (MMC_CAP_4_BIT_DATA |
436 434 MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED),
437   - .clk_type = S3C_SDHCI_CLK_DIV_INTERNAL,
438 435 };
439 436  
440 437 struct platform_device s3c_device_hsmmc2 = {
... ... @@ -465,7 +462,6 @@
465 462 .max_width = 4,
466 463 .host_caps = (MMC_CAP_4_BIT_DATA |
467 464 MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED),
468   - .clk_type = S3C_SDHCI_CLK_DIV_INTERNAL,
469 465 };
470 466  
471 467 struct platform_device s3c_device_hsmmc3 = {
arch/arm/plat-samsung/include/plat/sdhci.h
Diff comments   View file @ 81d4135
... ... @@ -31,18 +31,12 @@
31 31 S3C_SDHCI_CD_PERMANENT, /* no CD line, card permanently wired to host */
32 32 };
33 33  
34   -enum clk_types {
35   - S3C_SDHCI_CLK_DIV_INTERNAL, /* use mmc internal clock divider */
36   - S3C_SDHCI_CLK_DIV_EXTERNAL, /* use external clock divider */
37   -};
38   -
39 34 /**
40 35 * struct s3c_sdhci_platdata() - Platform device data for Samsung SDHCI
41 36 * @max_width: The maximum number of data bits supported.
42 37 * @host_caps: Standard MMC host capabilities bit field.
43 38 * @host_caps2: The second standard MMC host capabilities bit field.
44 39 * @cd_type: Type of Card Detection method (see cd_types enum above)
45   - * @clk_type: Type of clock divider method (see clk_types enum above)
46 40 * @ext_cd_init: Initialize external card detect subsystem. Called on
47 41 * sdhci-s3c driver probe when cd_type == S3C_SDHCI_CD_EXTERNAL.
48 42 * notify_func argument is a callback to the sdhci-s3c driver
... ... @@ -67,7 +61,6 @@
67 61 unsigned int host_caps2;
68 62 unsigned int pm_caps;
69 63 enum cd_types cd_type;
70   - enum clk_types clk_type;
71 64  
72 65 int ext_cd_gpio;
73 66 bool ext_cd_gpio_invert;
arch/arm/plat-samsung/platformdata.c
Diff comments   View file @ 81d4135
... ... @@ -57,7 +57,5 @@
57 57 set->host_caps2 |= pd->host_caps2;
58 58 if (pd->pm_caps)
59 59 set->pm_caps |= pd->pm_caps;
60   - if (pd->clk_type)
61   - set->clk_type = pd->clk_type;
62 60 }