linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: sebastian.hesselbarth@gmail.com (Sebastian Hesselbarth)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH RESEND 07/12] mmc: sdhci-pxav3: Try to get named I/O clock first
Date: Tue, 21 Oct 2014 11:22:39 +0200	[thread overview]
Message-ID: <1413883364-681-8-git-send-email-sebastian.hesselbarth@gmail.com> (raw)
In-Reply-To: <1413883364-681-1-git-send-email-sebastian.hesselbarth@gmail.com>

With support for more than one clock, we'll need to distinguish between
the clock by name. Change clock probing to first try to get "io" clock
before falling back to unnamed clock.

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 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c
index a34a589670e6..3dfd97977515 100644
--- a/drivers/mmc/host/sdhci-pxav3.c
+++ b/drivers/mmc/host/sdhci-pxav3.c
@@ -309,7 +309,9 @@ static int sdhci_pxav3_probe(struct platform_device *pdev)
 	pltfm_host = sdhci_priv(host);
 	pltfm_host->priv = pxa;
 
-	pxa->clk_io = devm_clk_get(dev, NULL);
+	pxa->clk_io = devm_clk_get(dev, "io");
+	if (IS_ERR(pxa->clk_io))
+		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(pxa->clk_io);
-- 
2.1.1

  parent reply	other threads:[~2014-10-21  9:22 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
2014-10-28  9:52   ` Ulf Hansson
2014-10-21  9:22 ` Sebastian Hesselbarth [this message]
2014-10-28  9:53   ` [PATCH RESEND 07/12] mmc: sdhci-pxav3: Try to get named I/O clock first 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=1413883364-681-8-git-send-email-sebastian.hesselbarth@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).