diff for duplicates of <aedd36af-8bf6-815f-34ee-9a3166e4fe5b@intel.com> diff --git a/a/1.txt b/N1/1.txt index 110713f..05e9afe 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -30,7 +30,7 @@ On 13/12/16 19:48, Gregory CLEMENT wrote: > +++ b/MAINTAINERS > @@ -7608,6 +7608,7 @@ MARVELL XENON MMC/SD/SDIO HOST CONTROLLER DRIVER > M: Ziji Hu <huziji@marvell.com> -> L: linux-mmc@vger.kernel.org +> L: linux-mmc at vger.kernel.org > S: Supported > +F: drivers/mmc/host/sdhci-xenon* > F: Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.txt @@ -785,4 +785,12 @@ Unnecessary () > +}; > + > +#endif -> +> + +-------------- next part -------------- +A non-text attachment was scrubbed... +Name: 0001-mmc-sdhci-Leave-internal-clock-on-when-bus-power-is-.patch +Type: text/x-patch +Size: 1423 bytes +Desc: not available +URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20170104/f4ab8f52/attachment-0001.bin> diff --git a/a/2.hdr b/a/2.hdr deleted file mode 100644 index 42ce201..0000000 --- a/a/2.hdr +++ /dev/null @@ -1,6 +0,0 @@ -Content-Type: text/x-patch; - name="0001-mmc-sdhci-Leave-internal-clock-on-when-bus-power-is-.patch" -Content-Transfer-Encoding: 7bit -Content-Disposition: attachment; - filename*0="0001-mmc-sdhci-Leave-internal-clock-on-when-bus-power-is-.pa"; - filename*1="tch" diff --git a/a/2.txt b/a/2.txt deleted file mode 100644 index 0e108b4..0000000 --- a/a/2.txt +++ /dev/null @@ -1,45 +0,0 @@ ->From 9a23bf1292e33d3d91a1ee2d7f269c9079d9c1be Mon Sep 17 00:00:00 2001 -From: Adrian Hunter <adrian.hunter@intel.com> -Date: Fri, 25 Nov 2016 16:25:05 +0200 -Subject: [PATCH] mmc: sdhci: Leave internal clock on when bus power is on - -According to the SDHCI specification, "Internal Clock Enable" is expected -to remain on while "SD Clock Enable" is off during voltage switching. Do -that by keeping the internal clock on if the bus power is on. - -Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> ---- - drivers/mmc/host/sdhci.c | 14 ++++++++++---- - 1 file changed, 10 insertions(+), 4 deletions(-) - -diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c -index 9a4fda81ff81..aeb001e7cc63 100644 ---- a/drivers/mmc/host/sdhci.c -+++ b/drivers/mmc/host/sdhci.c -@@ -1372,14 +1372,20 @@ void sdhci_enable_clk(struct sdhci_host *host, u16 clk) - - void sdhci_set_clock(struct sdhci_host *host, unsigned int clock) - { -- u16 clk; -+ u16 clk = 0; - - host->mmc->actual_clock = 0; - -- sdhci_writew(host, 0, SDHCI_CLOCK_CONTROL); -- -- if (clock == 0) -+ if (clock == 0) { -+ if (host->mmc->ios.power_mode != MMC_POWER_OFF) { -+ clk = sdhci_readw(host, SDHCI_CLOCK_CONTROL); -+ clk &= ~SDHCI_CLOCK_CARD_EN; -+ } -+ sdhci_writew(host, clk, SDHCI_CLOCK_CONTROL); - return; -+ } -+ -+ sdhci_writew(host, 0, SDHCI_CLOCK_CONTROL); - - clk = sdhci_calc_clk(host, clock, &host->mmc->actual_clock); - sdhci_enable_clk(host, clk); --- -1.9.1 diff --git a/a/content_digest b/N1/content_digest index e720095..83330b8 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,30 +1,10 @@ "ref\0cover.67d726f70f6bd48d38a2023513f2711080bc66c8.1481651244.git-series.gregory.clement@free-electrons.com\0" "ref\0f48940626343ca9cf68b32b7324b243e76a11960.1481651244.git-series.gregory.clement@free-electrons.com\0" - "From\0Adrian Hunter <adrian.hunter@intel.com>\0" - "Subject\0Re: [PATCH v4 07/12] mmc: sdhci-xenon: Add Marvell Xenon SDHC core functionality\0" + "From\0adrian.hunter@intel.com (Adrian Hunter)\0" + "Subject\0[PATCH v4 07/12] mmc: sdhci-xenon: Add Marvell Xenon SDHC core functionality\0" "Date\0Wed, 4 Jan 2017 09:26:36 +0200\0" - "To\0Gregory CLEMENT <gregory.clement@free-electrons.com>" - Ulf Hansson <ulf.hansson@linaro.org> - " linux-mmc@vger.kernel.org\0" - "Cc\0Jason Cooper <jason@lakedaemon.net>" - Andrew Lunn <andrew@lunn.ch> - Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> - Thomas Petazzoni <thomas.petazzoni@free-electrons.com> - linux-arm-kernel@lists.infradead.org - Ziji Hu <huziji@marvell.com> - Jimmy Xu <zmxu@marvell.com> - Jisheng Zhang <jszhang@marvell.com> - Nadav Haklai <nadavh@marvell.com> - Ryan Gao <ygao@marvell.com> - Doug Jones <dougj@marvell.com> - Victor Gu <xigu@marvell.com> - Wei(SOCP) Liu <liuw@marvell.com> - Wilson Ding <dingwei@marvell.com> - Yehuda Yitschak <yehuday@marvell.com> - Marcin Wojtas <mw@semihalf.com> - Hanna Hawa <hannah@marvell.com> - " Kostya Porotchkin <kostap@marvell.com>\0" - "\01:1\0" + "To\0linux-arm-kernel@lists.infradead.org\0" + "\00:1\0" "b\0" "On 13/12/16 19:48, Gregory CLEMENT wrote:\n" "> From: Hu Ziji <huziji@marvell.com>\n" @@ -58,7 +38,7 @@ "> +++ b/MAINTAINERS\n" "> @@ -7608,6 +7608,7 @@ MARVELL XENON MMC/SD/SDIO HOST CONTROLLER DRIVER\n" "> M:\tZiji Hu <huziji@marvell.com>\n" - "> L:\tlinux-mmc@vger.kernel.org\n" + "> L:\tlinux-mmc at vger.kernel.org\n" "> S:\tSupported\n" "> +F:\tdrivers/mmc/host/sdhci-xenon*\n" "> F:\tDocumentation/devicetree/bindings/mmc/marvell,xenon-sdhci.txt\n" @@ -813,54 +793,14 @@ "> +};\n" "> +\n" "> +#endif\n" - > - "\01:2\0" - "fn\00001-mmc-sdhci-Leave-internal-clock-on-when-bus-power-is-.patch\0" - "b\0" - ">From 9a23bf1292e33d3d91a1ee2d7f269c9079d9c1be Mon Sep 17 00:00:00 2001\n" - "From: Adrian Hunter <adrian.hunter@intel.com>\n" - "Date: Fri, 25 Nov 2016 16:25:05 +0200\n" - "Subject: [PATCH] mmc: sdhci: Leave internal clock on when bus power is on\n" - "\n" - "According to the SDHCI specification, \"Internal Clock Enable\" is expected\n" - "to remain on while \"SD Clock Enable\" is off during voltage switching. Do\n" - "that by keeping the internal clock on if the bus power is on.\n" - "\n" - "Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>\n" - "---\n" - " drivers/mmc/host/sdhci.c | 14 ++++++++++----\n" - " 1 file changed, 10 insertions(+), 4 deletions(-)\n" + "> \n" "\n" - "diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c\n" - "index 9a4fda81ff81..aeb001e7cc63 100644\n" - "--- a/drivers/mmc/host/sdhci.c\n" - "+++ b/drivers/mmc/host/sdhci.c\n" - "@@ -1372,14 +1372,20 @@ void sdhci_enable_clk(struct sdhci_host *host, u16 clk)\n" - " \n" - " void sdhci_set_clock(struct sdhci_host *host, unsigned int clock)\n" - " {\n" - "-\tu16 clk;\n" - "+\tu16 clk = 0;\n" - " \n" - " \thost->mmc->actual_clock = 0;\n" - " \n" - "-\tsdhci_writew(host, 0, SDHCI_CLOCK_CONTROL);\n" - "-\n" - "-\tif (clock == 0)\n" - "+\tif (clock == 0) {\n" - "+\t\tif (host->mmc->ios.power_mode != MMC_POWER_OFF) {\n" - "+\t\t\tclk = sdhci_readw(host, SDHCI_CLOCK_CONTROL);\n" - "+\t\t\tclk &= ~SDHCI_CLOCK_CARD_EN;\n" - "+\t\t}\n" - "+\t\tsdhci_writew(host, clk, SDHCI_CLOCK_CONTROL);\n" - " \t\treturn;\n" - "+\t}\n" - "+\n" - "+\tsdhci_writew(host, 0, SDHCI_CLOCK_CONTROL);\n" - " \n" - " \tclk = sdhci_calc_clk(host, clock, &host->mmc->actual_clock);\n" - " \tsdhci_enable_clk(host, clk);\n" - "-- \n" - 1.9.1 + "-------------- next part --------------\n" + "A non-text attachment was scrubbed...\n" + "Name: 0001-mmc-sdhci-Leave-internal-clock-on-when-bus-power-is-.patch\n" + "Type: text/x-patch\n" + "Size: 1423 bytes\n" + "Desc: not available\n" + URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20170104/f4ab8f52/attachment-0001.bin> -0a1810546a52578c6af6602dfedfdd4ccdcc3901f14a1028ddcdb93d2a7d7274 +d680cdb63a75fe85edc5144eff19a651625ba3b185e86a5ecf2ccef4afff1e89
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.