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

Commit 9b4d1cbb authored by Marek Szyprowski's avatar Marek Szyprowski Committed by Kukjin Kim
Browse files

ARM: SAMSUNG: add missing MMC_CAP2_BROKEN_VOLTAGE capability 



Commit 6e8201f5 "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
ceb6143b ("mmc: sdhci: fix vmmc handling").

Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 6fff5a11

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

+1 −0
Original line number Diff line number Diff line
@@ -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,

	.clk_type		= S3C_SDHCI_CLK_DIV_EXTERNAL,

};

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

+1 −0
Original line number Diff line number Diff line
@@ -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,

	.clk_type		= S3C_SDHCI_CLK_DIV_EXTERNAL,

};

arch/arm/mach-s5pv210/mach-goni.c

+2 −0
Original line number Diff line number Diff line
@@ -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,

};