From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de> To: devicetree@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-mmc@vger.kernel.org, Adrian Hunter <adrian.hunter@intel.com> Cc: ulf.hansson@linaro.org, f.fainelli@gmail.com, phil@raspberrypi.org, Nicolas Saenz Julienne <nsaenzjulienne@suse.de>, linux-kernel@vger.kernel.org Subject: [PATCH 01/10] mmc: sdhci: Add quirk SDHCI_QUIRK2_SET_BUS_VOLTAGE Date: Fri, 6 Mar 2020 11:38:46 +0100 [thread overview] Message-ID: <20200306103857.23962-2-nsaenzjulienne@suse.de> (raw) In-Reply-To: <20200306103857.23962-1-nsaenzjulienne@suse.de> Adds quirk for controllers whose bus power select register has to be set even when powering SD cards from a regulator. Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de> --- drivers/mmc/host/sdhci.c | 5 +++++ drivers/mmc/host/sdhci.h | 2 ++ 2 files changed, 7 insertions(+) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index c59566363a42..c7fd87447457 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -1920,6 +1920,11 @@ static void sdhci_set_power_reg(struct sdhci_host *host, unsigned char mode, mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, vdd); + if (host->quirks2 & SDHCI_QUIRK2_SET_BUS_VOLTAGE) { + sdhci_set_power_noreg(host, mode, vdd); + return; + } + if (mode != MMC_POWER_OFF) sdhci_writeb(host, SDHCI_POWER_ON, SDHCI_POWER_CONTROL); else diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index cac2d97782e6..9531a4e5b148 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h @@ -484,6 +484,8 @@ struct sdhci_host { * block count. */ #define SDHCI_QUIRK2_USE_32BIT_BLK_CNT (1<<18) +/* Set bus voltage even when powering from an external regulator */ +#define SDHCI_QUIRK2_SET_BUS_VOLTAGE (1<<19) int irq; /* Device IRQ */ void __iomem *ioaddr; /* Mapped address */ -- 2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de> To: devicetree@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-mmc@vger.kernel.org, Adrian Hunter <adrian.hunter@intel.com> Cc: ulf.hansson@linaro.org, f.fainelli@gmail.com, phil@raspberrypi.org, linux-kernel@vger.kernel.org, Nicolas Saenz Julienne <nsaenzjulienne@suse.de> Subject: [PATCH 01/10] mmc: sdhci: Add quirk SDHCI_QUIRK2_SET_BUS_VOLTAGE Date: Fri, 6 Mar 2020 11:38:46 +0100 [thread overview] Message-ID: <20200306103857.23962-2-nsaenzjulienne@suse.de> (raw) In-Reply-To: <20200306103857.23962-1-nsaenzjulienne@suse.de> Adds quirk for controllers whose bus power select register has to be set even when powering SD cards from a regulator. Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de> --- drivers/mmc/host/sdhci.c | 5 +++++ drivers/mmc/host/sdhci.h | 2 ++ 2 files changed, 7 insertions(+) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index c59566363a42..c7fd87447457 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -1920,6 +1920,11 @@ static void sdhci_set_power_reg(struct sdhci_host *host, unsigned char mode, mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, vdd); + if (host->quirks2 & SDHCI_QUIRK2_SET_BUS_VOLTAGE) { + sdhci_set_power_noreg(host, mode, vdd); + return; + } + if (mode != MMC_POWER_OFF) sdhci_writeb(host, SDHCI_POWER_ON, SDHCI_POWER_CONTROL); else diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index cac2d97782e6..9531a4e5b148 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h @@ -484,6 +484,8 @@ struct sdhci_host { * block count. */ #define SDHCI_QUIRK2_USE_32BIT_BLK_CNT (1<<18) +/* Set bus voltage even when powering from an external regulator */ +#define SDHCI_QUIRK2_SET_BUS_VOLTAGE (1<<19) int irq; /* Device IRQ */ void __iomem *ioaddr; /* Mapped address */ -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-03-06 10:39 UTC|newest] Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-03-06 10:38 [PATCH 00/10] Raspberry Pi vmmc regulator support Nicolas Saenz Julienne 2020-03-06 10:38 ` Nicolas Saenz Julienne 2020-03-06 10:38 ` Nicolas Saenz Julienne [this message] 2020-03-06 10:38 ` [PATCH 01/10] mmc: sdhci: Add quirk SDHCI_QUIRK2_SET_BUS_VOLTAGE Nicolas Saenz Julienne 2020-03-06 12:34 ` Adrian Hunter 2020-03-06 12:34 ` Adrian Hunter 2020-03-06 12:40 ` Nicolas Saenz Julienne 2020-03-06 12:40 ` Nicolas Saenz Julienne 2020-03-06 10:38 ` [PATCH 02/10] mmc: sdhci: milbeaut: Use quirk instead of custom set_power() Nicolas Saenz Julienne 2020-03-06 10:38 ` Nicolas Saenz Julienne 2020-03-06 10:38 ` [PATCH 03/10] mmc: sdhci: arsan: " Nicolas Saenz Julienne 2020-03-06 10:38 ` Nicolas Saenz Julienne 2020-03-06 10:38 ` [PATCH 04/10] mmc: sdhci: at-91: " Nicolas Saenz Julienne 2020-03-06 10:38 ` Nicolas Saenz Julienne 2020-03-06 10:38 ` [PATCH 05/10] mmc: sdhci: pxav3: " Nicolas Saenz Julienne 2020-03-06 10:38 ` Nicolas Saenz Julienne 2020-03-06 10:38 ` [PATCH 06/10] mmc: sdhci: xenon: " Nicolas Saenz Julienne 2020-03-06 10:38 ` Nicolas Saenz Julienne 2020-03-06 10:38 ` [PATCH 07/10] mmc: sdhci: am654: " Nicolas Saenz Julienne 2020-03-06 10:38 ` Nicolas Saenz Julienne 2020-03-06 10:38 ` [PATCH 08/10] mmc: sdhci: Unexport sdhci_set_power_noreg() Nicolas Saenz Julienne 2020-03-06 10:38 ` Nicolas Saenz Julienne 2020-03-06 10:38 ` [PATCH 09/10] mmc: sdhci: iproc: Use SDHCI_QUIRK2_SET_BUS_VOLTAGE on bcm2711 Nicolas Saenz Julienne 2020-03-06 10:38 ` Nicolas Saenz Julienne 2020-03-06 10:38 ` [PATCH 10/10] ARM: dts: bcm2711: Add vmmc regulator in emmc2 Nicolas Saenz Julienne 2020-03-06 10:38 ` Nicolas Saenz Julienne 2020-03-06 11:07 ` Stefan Wahren 2020-03-06 11:07 ` Stefan Wahren 2020-03-06 11:35 ` Phil Elwell 2020-03-06 11:35 ` Phil Elwell 2020-03-06 11:37 ` Nicolas Saenz Julienne 2020-03-06 11:37 ` Nicolas Saenz Julienne 2020-03-06 10:46 ` [PATCH 00/10] Raspberry Pi vmmc regulator support Phil Elwell 2020-03-06 10:46 ` Phil Elwell 2020-03-06 10:52 ` Nicolas Saenz Julienne 2020-03-06 10:52 ` Nicolas Saenz Julienne
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200306103857.23962-2-nsaenzjulienne@suse.de \ --to=nsaenzjulienne@suse.de \ --cc=adrian.hunter@intel.com \ --cc=bcm-kernel-feedback-list@broadcom.com \ --cc=devicetree@vger.kernel.org \ --cc=f.fainelli@gmail.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mmc@vger.kernel.org \ --cc=linux-rpi-kernel@lists.infradead.org \ --cc=phil@raspberrypi.org \ --cc=ulf.hansson@linaro.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.