From: sebastian.hesselbarth@gmail.com (Sebastian Hesselbarth)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH RESEND 06/12] mmc: sdhci-pxav3: Move I/O clock to private data
Date: Mon, 27 Oct 2014 19:15:40 +0100 [thread overview]
Message-ID: <544E8BCC.5080208@gmail.com> (raw)
In-Reply-To: <CAPDyKFroUmuQU_mBmSNEQAHe9Y-OF4pkkK=4Qe=JtibWThaHPA@mail.gmail.com>
On 10/27/2014 02:28 PM, Ulf Hansson wrote:
> On 21 October 2014 11:22, Sebastian Hesselbarth
> <sebastian.hesselbarth@gmail.com> wrote:
>> As we are using references to the I/O clock throughout the driver,
>> move it to the private data. Also, in preparation for core clock,
>> rename it to clk_io.
>>
>> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
>> ---
>> Cc: Chris Ball <chris@printf.net>
>> Cc: Ulf Hansson <ulf.hansson@linaro.org>
>> Cc: "Antoine T?nart" <antoine.tenart@free-electrons.com>
>> Cc: linux-mmc at vger.kernel.org
>> Cc: devicetree at vger.kernel.org
>> Cc: linux-arm-kernel at lists.infradead.org
>> Cc: linux-kernel at vger.kernel.org
>> ---
>> drivers/mmc/host/sdhci-pxav3.c | 24 +++++++++++++-----------
>> 1 file changed, 13 insertions(+), 11 deletions(-)
>>
>> diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c
>> index e52bbbb09d88..a34a589670e6 100644
>> --- a/drivers/mmc/host/sdhci-pxav3.c
>> +++ b/drivers/mmc/host/sdhci-pxav3.c
>> @@ -59,6 +59,7 @@
>> #define SDCE_MISC_INT_EN (1<<1)
>>
>> struct sdhci_pxa {
>> + struct clk *clk_io;
>> u8 power_mode;
>> };
>>
>> @@ -288,9 +289,7 @@ static int sdhci_pxav3_probe(struct platform_device *pdev)
>> struct sdhci_host *host = NULL;
>> struct sdhci_pxa *pxa = NULL;
>> const struct of_device_id *match;
>> -
>> int ret;
>> - struct clk *clk;
>>
>> pxa = devm_kzalloc(&pdev->dev, sizeof(struct sdhci_pxa), GFP_KERNEL);
>> if (!pxa)
>> @@ -310,14 +309,14 @@ static int sdhci_pxav3_probe(struct platform_device *pdev)
>> pltfm_host = sdhci_priv(host);
>> pltfm_host->priv = pxa;
>>
>> - clk = devm_clk_get(dev, NULL);
>> - if (IS_ERR(clk)) {
>> + pxa->clk_io = devm_clk_get(dev, NULL);
>> + if (IS_ERR(pxa->clk_io)) {
>> dev_err(dev, "failed to get io clock\n");
>> - ret = PTR_ERR(clk);
>> + ret = PTR_ERR(pxa->clk_io);
>> goto err_clk_get;
>> }
>> - pltfm_host->clk = clk;
>> - clk_prepare_enable(clk);
>> + pltfm_host->clk = pxa->clk_io;
>
> Is the above still needed?
>
>> + clk_prepare_enable(pxa->clk_io);
Ulf,
I guess it is. It sets sdhci_pltfm_host's clk field which is used
by sdhci-pltfm.c to e.g. determine sdhci clock rate.
Sebastian
next prev parent reply other threads:[~2014-10-27 18:15 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-21 9:22 [PATCH RESEND 00/12] SDHCI PXA cleanup and clocks Sebastian Hesselbarth
2014-10-21 9:22 ` [PATCH RESEND 01/12] mmc: sdhci-pxav2: Drop unused struct sdhci_pxa Sebastian Hesselbarth
2014-10-27 13:38 ` Ulf Hansson
2014-10-21 9:22 ` [PATCH RESEND 02/12] mmc: sdhci-pxav3: Respect MMC_DDR52 timing on uhs signaling Sebastian Hesselbarth
2014-10-27 13:38 ` Ulf Hansson
2014-10-21 9:22 ` [PATCH RESEND 03/12] mmc: sdhci-pxav3: Move private driver data to driver source Sebastian Hesselbarth
2014-10-27 13:39 ` Ulf Hansson
2014-10-21 9:22 ` [PATCH RESEND 04/12] mmc: sdhci-pxav3: Remove unused clk_enable from sdhci_pxa Sebastian Hesselbarth
2014-10-27 13:39 ` Ulf Hansson
2014-10-21 9:22 ` [PATCH RESEND 05/12] mmc: sdhci-pxav3: Remove checks for mandatory host clock Sebastian Hesselbarth
2014-10-27 13:39 ` Ulf Hansson
2014-10-21 9:22 ` [PATCH RESEND 06/12] mmc: sdhci-pxav3: Move I/O clock to private data Sebastian Hesselbarth
2014-10-27 13:28 ` Ulf Hansson
2014-10-27 18:15 ` Sebastian Hesselbarth [this message]
2014-10-28 9:52 ` Ulf Hansson
2014-10-21 9:22 ` [PATCH RESEND 07/12] mmc: sdhci-pxav3: Try to get named I/O clock first Sebastian Hesselbarth
2014-10-28 9:53 ` Ulf Hansson
2014-10-21 9:22 ` [PATCH RESEND 08/12] mmc: sdhci-pxav3: Get optional core clock Sebastian Hesselbarth
2014-10-28 9:53 ` Ulf Hansson
2014-10-21 9:22 ` [PATCH RESEND 09/12] mmc: sdhci-pxav3: Document clocks and additional clock-names property Sebastian Hesselbarth
2014-10-28 9:53 ` Ulf Hansson
2014-10-21 9:22 ` [PATCH RESEND 10/12] ARM: dts: berlin: Add SDHCI controller nodes to BG2/BG2CD Sebastian Hesselbarth
2014-10-29 18:39 ` Sebastian Hesselbarth
2014-10-21 9:22 ` [PATCH RESEND 11/12] ARM: dts: berlin: Enable WiFi on Google Chromecast Sebastian Hesselbarth
2014-10-21 9:22 ` [PATCH RESEND 12/12] ARM: dts: berlin: Enable eMMC on Sony NSZ-GS7 Sebastian Hesselbarth
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=544E8BCC.5080208@gmail.com \
--to=sebastian.hesselbarth@gmail.com \
--cc=linux-arm-kernel@lists.infradead.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).