ARM: Samsung: add missing MMC_CAP2_BROKEN_VOLTAGE capability

PATCH New Marek Szyprowski 2 participants 2 messages Apr 16, 2012 – Apr 25, 2012

Subsystems (3)

Arm (32-bit) Arm sub-architectures Arm Samsung Exynos

lore

Share & tools

lore

Marek Szyprowski

author

2012-04-16 06:33 UTC #0 lore raw

PATCH 1/1 ARM: Samsung: add missing MMC_CAP2_BROKEN_VOLTAGE capability

Commit 6e8201f57c935 "mmc: core: add the capability for broken voltage" introduced a new quirk to indicate that MMC core should ignore voltage change errors reported by the regulators core. This is required to get SDHCI working on UniversalC210, NURI and GONI boards again after commit ceb6143b2df81c ("mmc: sdhci: fix vmmc handling").

Signed-off-by Marek Szyprowski <[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          |    2 ++
 3 files changed, 4 insertions(+), 0 deletions(-)

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

index 91e5986..021dc68 100644
@@ -112,6 +112,7 @@ 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 +1 -0

index ef706e9..add55b4 100644
@@ -747,6 +747,7 @@ 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 +2 -0

index a8933de..3239566 100644
@@ -25,6 +25,7 @@
 #include <linux/gpio_keys.h>
 #include <linux/input.h>
 #include <linux/gpio.h>
+#include <linux/mmc/host.h>
 #include <linux/interrupt.h>
 
 #include <asm/hardware/vic.h>

@@ -765,6 +766,7 @@ 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.1.569.g6f426

Kukjin Kim

2012-04-25 00:33 UTC #1 lore raw

PATCH 1/1 ARM: Samsung: add missing MMC_CAP2_BROKEN_VOLTAGE capability

Quoted 51 lines · Marek Szyprowski

Signed-off-by Marek Szyprowski<[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          |    2 ++
  3 files changed, 4 insertions(+), 0 deletions(-)

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

index 91e5986..021dc68 100644
@@ -112,6 +112,7 @@ 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 +1 -0

index ef706e9..add55b4 100644
@@ -747,6 +747,7 @@ 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 +1 -0

index a8933de..3239566 100644
@@ -25,6 +25,7 @@
  #include<linux/gpio_keys.h>
  #include<linux/input.h>
  #include<linux/gpio.h>
+#include<linux/mmc/host.h>
  #include<linux/interrupt.h>
 
  #include<asm/hardware/vic.h>

arch/arm/mach-s5pv210/mach-goni.c static void __init goni_pmic_init(void) · line 772

Quoted 7 lines

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

@@ -765,6 +766,7 @@ 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,
  };

OK, will apply.

Thanks.

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