ARM: exynos: remove the MMC_CAP2_BROKEN_VOLTAGE

PATCH In review Jaehoon Chung 2 participants 3 messages Sep 20, 2012 – Sep 21, 2012

Subsystems (4)

Arm (32-bit) Arm sub-architectures Arm Samsung Exynos MMC, SD and SDIO

lore

Share & tools

lore

Jaehoon Chung

author

2012-09-20 08:52 UTC #0 lore raw

PATCH 1/1 ARM: exynos: remove the MMC_CAP2_BROKEN_VOLTAGE

This patch is dependency with Chris's patch.
"[PATCH] mmc: core: Replace MMC_CAP2_BROKEN_VOLTAGE with test for fixed regulator"
http://git.kernel.org/?p=linux/kernel/git/cjb/mmc.git;a=commit;h=421fc8e70079b8b9e473a55a6267302695641dcc

After applied that patch, it needs not to set MMC_CAP2_BROKEN_VOLTAGE.

Signed-off-by Jaehoon Chung <[email protected]>

Signed-off-by Kyungmin Park <[email protected]>

---
 arch/arm/mach-exynos/mach-nuri.c           |    1 -
 arch/arm/mach-exynos/mach-universal_c210.c |    1 -
 arch/arm/mach-s5pv210/mach-goni.c          |    1 -
 3 files changed, 0 insertions(+), 3 deletions(-)

arch/arm/mach-exynos/mach-nuri.c +0 -1

index 90d8daa..6e0b0fa 100644
@@ -113,7 +113,6 @@ static struct s3c_sdhci_platdata nuri_hsmmc0_data __initdata = {
 	.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,
 };

arch/arm/mach-exynos/mach-universal_c210.c +0 -1

index 8139cd2..865be0a 100644
@@ -754,7 +754,6 @@ static struct s3c_sdhci_platdata universal_hsmmc0_data __initdata = {
 	.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,
 };

arch/arm/mach-s5pv210/mach-goni.c +0 -1

index c552581..239e896 100644
@@ -774,7 +774,6 @@ static void __init goni_pmic_init(void)
 /* MoviNAND */
 static struct s3c_sdhci_platdata goni_hsmmc0_data __initdata = {
 	.max_width		= 4,
-	.host_caps2		= MMC_CAP2_BROKEN_VOLTAGE,
 	.cd_type		= S3C_SDHCI_CD_PERMANENT,
 };

Signature · 1 line

1.7.4.1

Kukjin Kim

2012-09-20 23:36 UTC #1 lore raw

Quoted 9 lines · Jaehoon Chung

This patch is dependency with Chris's patch.
"[PATCH] mmc: core: Replace MMC_CAP2_BROKEN_VOLTAGE with test for fixed regulator"
http://git.kernel.org/?p=linux/kernel/git/cjb/mmc.git;a=commit;h=421fc8e70
079b8b9e473a55a6267302695641dcc
After applied that patch, it needs not to set MMC_CAP2_BROKEN_VOLTAGE.

Yeah, we don't need more this. This will be queued into -late branch for v3.7 or can be queued into cleanup for next merge window because this is not critical.

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.

Quoted 14 lines

Signed-off-by Jaehoon Chung <[email protected]>
Signed-off-by Kyungmin Park <[email protected]>
---
 arch/arm/mach-exynos/mach-nuri.c           |    1 -
 arch/arm/mach-exynos/mach-universal_c210.c |    1 -
 arch/arm/mach-s5pv210/mach-goni.c          |    1 -
 3 files changed, 0 insertions(+), 3 deletions(-)
arch/arm/mach-exynos/mach- renamed from arch/arm/mach-exynos/mach-nuri.c +0 -0
nuri.c
index 90d8daa..6e0b0fa 100644

arch/arm/mach-exynos/mach-nuri.c static struct s3c_sdhci_platdata nuri_hsmmc0_data · line 115

Quoted 3 lines

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

@@ -113,7 +113,6 @@ static struct s3c_sdhci_platdata nuri_hsmmc0_data
 __initdata = {
 	.host_caps		= (MMC_CAP_8_BIT_DATA | MMC_CAP_4_BIT_DATA |
 				MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED

Quoted 11 lines

arch/arm/mach-exynos/mach-nuri.c +0 -1
 				MMC_CAP_ERASE),
-	.host_caps2		= MMC_CAP2_BROKEN_VOLTAGE,
 	.cd_type		= S3C_SDHCI_CD_PERMANENT,
 };
arch/arm/mach- renamed from arch/arm/mach-exynos/mach-universal_c210.c +0 -0
exynos/mach-universal_c210.c
index 8139cd2..865be0a 100644

arch/arm/mach-exynos/mach-universal_c210.c static struct s3c_sdhci_platdata universal_hsmmc0_data · line 757

Quoted 4 lines

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

@@ -754,7 +754,6 @@ static struct s3c_sdhci_platdata universal_hsmmc0_data
 __initdata = {
 	.max_width		= 8,
 	.host_caps		= (MMC_CAP_8_BIT_DATA | MMC_CAP_4_BIT_DATA |
 				MMC_CAP_MMC_HIGHSPEED |

MMC_CAP_SD_HIGHSPEED),

Quoted 19 lines

arch/arm/mach-exynos/mach-universal_c210.c +0 -1
-	.host_caps2		= MMC_CAP2_BROKEN_VOLTAGE,
 	.cd_type		= S3C_SDHCI_CD_PERMANENT,
 };
arch/arm/mach- renamed from arch/arm/mach-s5pv210/mach-goni.c +0 -0
s5pv210/mach-goni.c
index c552581..239e896 100644
arch/arm/mach-s5pv210/mach-goni.c +0 -2
@@ -774,7 +774,6 @@ static void __init goni_pmic_init(void)
 /* MoviNAND */
 static struct s3c_sdhci_platdata goni_hsmmc0_data __initdata = {
 	.max_width		= 4,
-	.host_caps2		= MMC_CAP2_BROKEN_VOLTAGE,
 	.cd_type		= S3C_SDHCI_CD_PERMANENT,
 };
 
--
1.7.4.1

Jaehoon Chung

author

2012-09-21 01:19 UTC #2 lore raw

Thanks Kukjin.

Best Regards,
Jaehoon Chung

Quoted 82 lines · Kukjin Kim

Quoted 9 lines · Jaehoon Chung
This patch is dependency with Chris's patch.
"[PATCH] mmc: core: Replace MMC_CAP2_BROKEN_VOLTAGE with test for fixed regulator"
http://git.kernel.org/?p=linux/kernel/git/cjb/mmc.git;a=commit;h=421fc8e70
079b8b9e473a55a6267302695641dcc
After applied that patch, it needs not to set MMC_CAP2_BROKEN_VOLTAGE.
Yeah, we don't need more this. This will be queued into -late branch for v3.7 or can be queued into cleanup for next merge window because this is not critical.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
Quoted 14 lines
Signed-off-by Jaehoon Chung <[email protected]>
Signed-off-by Kyungmin Park <[email protected]>
---
 arch/arm/mach-exynos/mach-nuri.c           |    1 -
 arch/arm/mach-exynos/mach-universal_c210.c |    1 -
 arch/arm/mach-s5pv210/mach-goni.c          |    1 -
 3 files changed, 0 insertions(+), 3 deletions(-)
arch/arm/mach-exynos/mach- renamed from arch/arm/mach-exynos/mach-nuri.c +0 -0
nuri.c
index 90d8daa..6e0b0fa 100644
arch/arm/mach-exynos/mach-nuri.c static struct s3c_sdhci_platdata nuri_hsmmc0_data · line 115
Quoted 3 lines
arch/arm/mach-exynos/mach-nuri.c +0 -0
@@ -113,7 +113,6 @@ static struct s3c_sdhci_platdata nuri_hsmmc0_data
 __initdata = {
 	.host_caps		= (MMC_CAP_8_BIT_DATA | MMC_CAP_4_BIT_DATA |
 				MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED
|
Quoted 11 lines
arch/arm/mach-exynos/mach-nuri.c +0 -1
 				MMC_CAP_ERASE),
-	.host_caps2		= MMC_CAP2_BROKEN_VOLTAGE,
 	.cd_type		= S3C_SDHCI_CD_PERMANENT,
 };
arch/arm/mach- renamed from arch/arm/mach-exynos/mach-universal_c210.c +0 -0
exynos/mach-universal_c210.c
index 8139cd2..865be0a 100644
arch/arm/mach-exynos/mach-universal_c210.c static struct s3c_sdhci_platdata universal_hsmmc0_data · line 757
Quoted 4 lines
arch/arm/mach-exynos/mach-universal_c210.c +0 -0
@@ -754,7 +754,6 @@ static struct s3c_sdhci_platdata universal_hsmmc0_data
 __initdata = {
 	.max_width		= 8,
 	.host_caps		= (MMC_CAP_8_BIT_DATA | MMC_CAP_4_BIT_DATA |
 				MMC_CAP_MMC_HIGHSPEED |
MMC_CAP_SD_HIGHSPEED),
Quoted 18 lines
arch/arm/mach-exynos/mach-universal_c210.c +0 -1
-	.host_caps2		= MMC_CAP2_BROKEN_VOLTAGE,
 	.cd_type		= S3C_SDHCI_CD_PERMANENT,
 };
arch/arm/mach- renamed from arch/arm/mach-s5pv210/mach-goni.c +0 -0
s5pv210/mach-goni.c
index c552581..239e896 100644
arch/arm/mach-s5pv210/mach-goni.c +0 -2
@@ -774,7 +774,6 @@ static void __init goni_pmic_init(void)
 /* MoviNAND */
 static struct s3c_sdhci_platdata goni_hsmmc0_data __initdata = {
 	.max_width		= 4,
-	.host_caps2		= MMC_CAP2_BROKEN_VOLTAGE,
 	.cd_type		= S3C_SDHCI_CD_PERMANENT,
 };
 
--
Quoted 1 line
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html