From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
To: adrian.hunter@intel.com, linux-kernel@vger.kernel.org
Cc: phil@raspberrypi.com, linux-mmc@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, f.fainelli@gmail.com,
stefan.wahren@i2se.com, bcm-kernel-feedback-list@broadcom.com,
linux-rpi-kernel@lists.infradead.org,
Nicolas Saenz Julienne <nsaenzjulienne@suse.de>,
Ulf Hansson <ulf.hansson@linaro.org>
Subject: [PATCH v2 05/11] mmc: sdhci: pxav3: Use sdhci_set_power_and_voltage()
Date: Fri, 6 Mar 2020 18:44:07 +0100 [thread overview]
Message-ID: <20200306174413.20634-6-nsaenzjulienne@suse.de> (raw)
In-Reply-To: <20200306174413.20634-1-nsaenzjulienne@suse.de>
The sdhci core provides a helper function with the same functionality as
this controller's set_power() callback. Use it instead.
Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
---
drivers/mmc/host/sdhci-pxav3.c | 20 +-------------------
1 file changed, 1 insertion(+), 19 deletions(-)
diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c
index e55037ceda73..75fe90b88f9b 100644
--- a/drivers/mmc/host/sdhci-pxav3.c
+++ b/drivers/mmc/host/sdhci-pxav3.c
@@ -297,27 +297,9 @@ static void pxav3_set_uhs_signaling(struct sdhci_host *host, unsigned int uhs)
__func__, uhs, ctrl_2);
}
-static void pxav3_set_power(struct sdhci_host *host, unsigned char mode,
- unsigned short vdd)
-{
- struct mmc_host *mmc = host->mmc;
- u8 pwr = host->pwr;
-
- sdhci_set_power_noreg(host, mode, vdd);
-
- if (host->pwr == pwr)
- return;
-
- if (host->pwr == 0)
- vdd = 0;
-
- if (!IS_ERR(mmc->supply.vmmc))
- mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, vdd);
-}
-
static const struct sdhci_ops pxav3_sdhci_ops = {
.set_clock = sdhci_set_clock,
- .set_power = pxav3_set_power,
+ .set_power = sdhci_set_power_and_bus_voltage,
.platform_send_init_74_clocks = pxav3_gen_init_74_clocks,
.get_max_clock = sdhci_pltfm_clk_get_max_clock,
.set_bus_width = sdhci_set_bus_width,
--
2.25.1
next prev parent reply other threads:[~2020-03-06 17:44 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-06 17:44 [PATCH v2 00/11] Raspbery Pi 4 vmmc regulator support Nicolas Saenz Julienne
2020-03-06 17:44 ` [PATCH v2 01/11] mmc: sdhci: Introduce sdhci_set_power_and_bus_voltage() Nicolas Saenz Julienne
2020-03-09 7:21 ` Adrian Hunter
2020-03-06 17:44 ` [PATCH v2 02/11] mmc: sdhci: arasan: Use sdhci_set_power_and_voltage() Nicolas Saenz Julienne
2020-03-09 7:22 ` Adrian Hunter
2020-03-06 17:44 ` [PATCH v2 03/11] mmc: sdhci: milbeaut: " Nicolas Saenz Julienne
2020-03-09 7:25 ` Adrian Hunter
2020-03-06 17:44 ` [PATCH v2 04/11] mmc: sdhci: at91: " Nicolas Saenz Julienne
2020-03-09 7:25 ` Adrian Hunter
2020-03-06 17:44 ` Nicolas Saenz Julienne [this message]
2020-03-09 7:20 ` [PATCH v2 05/11] mmc: sdhci: pxav3: " Adrian Hunter
2020-03-06 17:44 ` [PATCH v2 06/11] mmc: sdhci: xenon: " Nicolas Saenz Julienne
2020-03-09 7:20 ` Adrian Hunter
2020-03-09 10:53 ` Nicolas Saenz Julienne
2020-03-09 11:55 ` Adrian Hunter
2020-03-09 11:56 ` Adrian Hunter
2020-03-06 17:44 ` [PATCH v2 07/11] mmc: sdhci: am654: " Nicolas Saenz Julienne
2020-03-09 7:27 ` Adrian Hunter
2020-03-06 17:44 ` [PATCH v2 08/11] mmc: sdhci: Unexport sdhci_set_power_noreg() Nicolas Saenz Julienne
2020-03-06 17:44 ` [PATCH v2 09/11] mmc: sdhci: iproc: Add custom set_power() callback for bcm2711 Nicolas Saenz Julienne
2020-03-09 7:29 ` Adrian Hunter
2020-03-06 17:44 ` [PATCH v2 10/11] ARM: dts: bcm2711: Update expgpio's GPIO labels Nicolas Saenz Julienne
2020-03-27 11:21 ` Nicolas Saenz Julienne
2020-03-06 17:44 ` [PATCH v2 11/11] ARM: dts: bcm2711: Add vmmc regulator in emmc2 Nicolas Saenz Julienne
2020-03-09 20:00 ` Stefan Wahren
2020-03-09 20:01 ` Nicolas Saenz Julienne
2020-03-27 11:22 ` Nicolas Saenz Julienne
2020-03-12 13:08 ` [PATCH v2 00/11] Raspbery Pi 4 vmmc regulator support Ulf Hansson
2020-03-12 13:13 ` Nicolas Saenz Julienne
2020-03-12 14:06 ` Ulf Hansson
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=20200306174413.20634-6-nsaenzjulienne@suse.de \
--to=nsaenzjulienne@suse.de \
--cc=adrian.hunter@intel.com \
--cc=bcm-kernel-feedback-list@broadcom.com \
--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.com \
--cc=stefan.wahren@i2se.com \
--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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).