devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Doug Brown <doug@schmorgal.com>
To: Ulf Hansson <ulf.hansson@linaro.org>,
	Adrian Hunter <adrian.hunter@intel.com>
Cc: Rob Herring <robh+dt@kernel.org>,
	Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
	linux-mmc@vger.kernel.org, devicetree@vger.kernel.org,
	Doug Brown <doug@schmorgal.com>,
	kernel test robot <lkp@intel.com>,
	Dan Carpenter <error27@gmail.com>
Subject: [PATCH v5 5/8] mmc: sdhci-pxav2: add optional core clock
Date: Mon, 16 Jan 2023 11:43:58 -0800	[thread overview]
Message-ID: <20230116194401.20372-6-doug@schmorgal.com> (raw)
In-Reply-To: <20230116194401.20372-1-doug@schmorgal.com>

Add ability to have an optional core clock just like the pxav3 driver.
The PXA168 needs this because its SDHC controllers have separate core
and io clocks that both need to be enabled. This also correctly matches
the documented devicetree bindings for this driver.

Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Doug Brown <doug@schmorgal.com>
---
The Reported-by tags above refer to a missing assignment to ret in an
earlier version of this patch. The kernel test robot caught it.

 drivers/mmc/host/sdhci-pxav2.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/drivers/mmc/host/sdhci-pxav2.c b/drivers/mmc/host/sdhci-pxav2.c
index f5c86e1ba734..3141901e1558 100644
--- a/drivers/mmc/host/sdhci-pxav2.c
+++ b/drivers/mmc/host/sdhci-pxav2.c
@@ -191,7 +191,7 @@ static int sdhci_pxav2_probe(struct platform_device *pdev)
 	const struct sdhci_pxa_variant *variant;
 
 	int ret;
-	struct clk *clk;
+	struct clk *clk, *clk_core;
 
 	host = sdhci_pltfm_init(pdev, NULL, 0);
 	if (IS_ERR(host))
@@ -214,6 +214,13 @@ static int sdhci_pxav2_probe(struct platform_device *pdev)
 		goto free;
 	}
 
+	clk_core = devm_clk_get_optional_enabled(dev, "core");
+	if (IS_ERR(clk_core)) {
+		ret = PTR_ERR(clk_core);
+		dev_err_probe(dev, ret, "failed to enable core clock\n");
+		goto disable_clk;
+	}
+
 	host->quirks = SDHCI_QUIRK_BROKEN_ADMA
 		| SDHCI_QUIRK_BROKEN_TIMEOUT_VAL
 		| SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN;
-- 
2.34.1


  parent reply	other threads:[~2023-01-16 19:44 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-16 19:43 [PATCH v5 0/8] mmc: sdhci-pxav2: Add support for PXA168 Doug Brown
2023-01-16 19:43 ` [PATCH v5 1/8] mmc: sdhci-pxav2: add initial support for PXA168 V1 controller Doug Brown
2023-01-16 19:43 ` [PATCH v5 2/8] mmc: sdhci-pxav2: enable CONFIG_MMC_SDHCI_IO_ACCESSORS Doug Brown
2023-01-16 19:43 ` [PATCH v5 3/8] mmc: sdhci-pxav2: add register workaround for PXA168 silicon bug Doug Brown
2023-01-16 19:43 ` [PATCH v5 4/8] mmc: sdhci-pxav2: change clock name to match DT bindings Doug Brown
2023-01-16 19:43 ` Doug Brown [this message]
2023-01-17  6:55   ` [PATCH v5 5/8] mmc: sdhci-pxav2: add optional core clock Adrian Hunter
2023-01-16 19:43 ` [PATCH v5 6/8] mmc: sdhci-pxav2: add SDIO card IRQ workaround for PXA168 V1 controller Doug Brown
2023-01-16 19:44 ` [PATCH v5 7/8] mmc: sdhci-pxav2: add optional pinctrl for SDIO IRQ workaround Doug Brown
2023-01-16 19:44 ` [PATCH v5 8/8] dt-bindings: mmc: sdhci-pxa: add pxav1 Doug Brown
2023-01-24 12:57 ` [PATCH v5 0/8] mmc: sdhci-pxav2: Add support for PXA168 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=20230116194401.20372-6-doug@schmorgal.com \
    --to=doug@schmorgal.com \
    --cc=adrian.hunter@intel.com \
    --cc=devicetree@vger.kernel.org \
    --cc=error27@gmail.com \
    --cc=krzysztof.kozlowski+dt@linaro.org \
    --cc=linux-mmc@vger.kernel.org \
    --cc=lkp@intel.com \
    --cc=robh+dt@kernel.org \
    --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).