Patch "mmc: sdhci-xenon: add set_power callback" has been added to the 4.12-stable tree

This is a note to let you know that I've just added the patch titled

mmc: sdhci-xenon: add set_power callback

to the 4.12-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
mmc-sdhci-xenon-add-set_power-callback.patch
and it can be found in the queue-4.12 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Zhoujie Wu <[email protected]>
Date: Mon, 21 Aug 2017 11:02:09 -0700
Subject: mmc: sdhci-xenon: add set_power callback

From: Zhoujie Wu <[email protected]>

commit 99c14fc360dbbb583a03ab985551b12b5c5ca4f1 upstream.

Xenon sdh controller requests proper SD bus voltage select bits programmed even with vmmc power supply. Any reserved value(100b-000b) programmed in this field will lead to controller ignore SD bus power bit and keep its value at zero.
Add set_power callback to handle this.

---
 drivers/mmc/host/sdhci-xenon.c |   19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

@@ -210,8 +210,27 @@ static void xenon_set_uhs_signaling(stru
 	sdhci_writew(host, ctrl_2, SDHCI_HOST_CONTROL2);
 }
 
+static void xenon_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 sdhci_xenon_ops = {
 	.set_clock		= sdhci_set_clock,
+	.set_power		= xenon_set_power,
 	.set_bus_width		= sdhci_set_bus_width,
 	.reset			= xenon_reset,
 	.set_uhs_signaling	= xenon_set_uhs_signaling,

Patches currently in stable-queue which might be from [email protected] are

queue-4.12/mmc-sdhci-xenon-add-set_power-callback.patch