[PATCH v2 03/11] mmc: sdhci-of-arasan: Replace deprecated clk API calls

All of lore.kernel.org
 help / color / mirror / Atom feed

From: Manish Narani <manish.narani@xilinx.com>
To: ulf.hansson@linaro.org, robh+dt@kernel.org, mark.rutland@arm.com,
	heiko@sntech.de, michal.simek@xilinx.com,
	adrian.hunter@intel.com,
	christoph.muellner@theobroma-systems.com,
	philipp.tomsich@theobroma-systems.com, viresh.kumar@linaro.org,
	scott.branden@broadcom.com, ayaka@soulik.info, kernel@esmil.dk,
	tony.xie@rock-chips.com, rajan.vaja@xilinx.com,
	jolly.shah@xilinx.com, nava.manne@xilinx.com, mdf@kernel.org,
	manish.narani@xilinx.com, olof@lixom.net
Cc: linux-mmc@vger.kernel.org, devicetree@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	linux-rockchip@lists.infradead.org
Subject: [PATCH v2 03/11] mmc: sdhci-of-arasan: Replace deprecated clk API calls
Date: Mon,  1 Jul 2019 10:59:43 +0530	[thread overview]
Message-ID: <1561958991-21935-4-git-send-email-manish.narani@xilinx.com> (raw)
In-Reply-To: <1561958991-21935-1-git-send-email-manish.narani@xilinx.com>

The clk framework APIs devm_clk_register and of_clk_add_provider, which
are used here, are deprecated. Replace the calls with the new API calls.
Also add an API call devm_clk_get() to get the clock from DT.

Signed-off-by: Manish Narani <manish.narani@xilinx.com>
---
 drivers/mmc/host/sdhci-of-arasan.c | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/drivers/mmc/host/sdhci-of-arasan.c b/drivers/mmc/host/sdhci-of-arasan.c
index b12abf9..d60a2e8 100644
--- a/drivers/mmc/host/sdhci-of-arasan.c
+++ b/drivers/mmc/host/sdhci-of-arasan.c
@@ -641,14 +641,25 @@ static int sdhci_arasan_register_sdclk(struct sdhci_arasan_data *sdhci_arasan,
 	sdcardclk_init.ops = &arasan_sdcardclk_ops;
 
 	sdhci_arasan->sdcardclk_hw.init = &sdcardclk_init;
-	sdhci_arasan->sdcardclk =
-		devm_clk_register(dev, &sdhci_arasan->sdcardclk_hw);
+	ret = devm_clk_hw_register(dev, &sdhci_arasan->sdcardclk_hw);
+	if (ret) {
+		dev_err(dev, "Failed to register SD clk_hw\n");
+		return ret;
+	}
 	sdhci_arasan->sdcardclk_hw.init = NULL;
 
-	ret = of_clk_add_provider(np, of_clk_src_simple_get,
-				  sdhci_arasan->sdcardclk);
-	if (ret)
+	ret = of_clk_add_hw_provider(np, of_clk_hw_simple_get,
+				     &sdhci_arasan->sdcardclk_hw);
+	if (ret) {
 		dev_err(dev, "Failed to add clock provider\n");
+		return ret;
+	}
+
+	sdhci_arasan->sdcardclk = devm_clk_get(dev, "clk_sdcard");
+	if (IS_ERR(sdhci_arasan->sdcardclk)) {
+		dev_err(dev, "sdcardclk clock not found.\n");
+		ret = PTR_ERR(sdhci_arasan->sdcardclk);
+	}
 
 	return ret;
 }
-- 
2.1.1

WARNING: multiple messages have this Message-ID (diff)

From: Manish Narani <manish.narani@xilinx.com>
To: ulf.hansson@linaro.org, robh+dt@kernel.org, mark.rutland@arm.com,
	heiko@sntech.de, michal.simek@xilinx.com,
	adrian.hunter@intel.com,
	christoph.muellner@theobroma-systems.com,
	philipp.tomsich@theobroma-systems.com, viresh.kumar@linaro.org,
	scott.branden@broadcom.com, ayaka@soulik.info, kernel@esmil.dk,
	tony.xie@rock-chips.com, rajan.vaja@xilinx.com,
	jolly.shah@xilinx.com, nava.manne@xilinx.com, mdf@kernel.org,
	manish.narani@xilinx.com, olof@lixom.net
Cc: devicetree@vger.kernel.org, linux-mmc@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	linux-rockchip@lists.infradead.org
Subject: [PATCH v2 03/11] mmc: sdhci-of-arasan: Replace deprecated clk API calls
Date: Mon,  1 Jul 2019 10:59:43 +0530	[thread overview]
Message-ID: <1561958991-21935-4-git-send-email-manish.narani@xilinx.com> (raw)
In-Reply-To: <1561958991-21935-1-git-send-email-manish.narani@xilinx.com>

The clk framework APIs devm_clk_register and of_clk_add_provider, which
are used here, are deprecated. Replace the calls with the new API calls.
Also add an API call devm_clk_get() to get the clock from DT.

Signed-off-by: Manish Narani <manish.narani@xilinx.com>
---
 drivers/mmc/host/sdhci-of-arasan.c | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/drivers/mmc/host/sdhci-of-arasan.c b/drivers/mmc/host/sdhci-of-arasan.c
index b12abf9..d60a2e8 100644
--- a/drivers/mmc/host/sdhci-of-arasan.c
+++ b/drivers/mmc/host/sdhci-of-arasan.c
@@ -641,14 +641,25 @@ static int sdhci_arasan_register_sdclk(struct sdhci_arasan_data *sdhci_arasan,
 	sdcardclk_init.ops = &arasan_sdcardclk_ops;
 
 	sdhci_arasan->sdcardclk_hw.init = &sdcardclk_init;
-	sdhci_arasan->sdcardclk =
-		devm_clk_register(dev, &sdhci_arasan->sdcardclk_hw);
+	ret = devm_clk_hw_register(dev, &sdhci_arasan->sdcardclk_hw);
+	if (ret) {
+		dev_err(dev, "Failed to register SD clk_hw\n");
+		return ret;
+	}
 	sdhci_arasan->sdcardclk_hw.init = NULL;
 
-	ret = of_clk_add_provider(np, of_clk_src_simple_get,
-				  sdhci_arasan->sdcardclk);
-	if (ret)
+	ret = of_clk_add_hw_provider(np, of_clk_hw_simple_get,
+				     &sdhci_arasan->sdcardclk_hw);
+	if (ret) {
 		dev_err(dev, "Failed to add clock provider\n");
+		return ret;
+	}
+
+	sdhci_arasan->sdcardclk = devm_clk_get(dev, "clk_sdcard");
+	if (IS_ERR(sdhci_arasan->sdcardclk)) {
+		dev_err(dev, "sdcardclk clock not found.\n");
+		ret = PTR_ERR(sdhci_arasan->sdcardclk);
+	}
 
 	return ret;
 }
-- 
2.1.1

WARNING: multiple messages have this Message-ID (diff)

From: Manish Narani <manish.narani@xilinx.com>
To: ulf.hansson@linaro.org, robh+dt@kernel.org, mark.rutland@arm.com,
	heiko@sntech.de, michal.simek@xilinx.com,
	adrian.hunter@intel.com,
	christoph.muellner@theobroma-systems.com,
	philipp.tomsich@theobroma-systems.com, viresh.kumar@linaro.org,
	scott.branden@broadcom.com, ayaka@soulik.info, kernel@esmil.dk,
	tony.xie@rock-chips.com, rajan.vaja@xilinx.com,
	jolly.shah@xilinx.com, nava.manne@xilinx.com, mdf@kernel.org,
	manish.narani@xilinx.com, olof@lixom.net
Cc: devicetree@vger.kernel.org, linux-mmc@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	linux-rockchip@lists.infradead.org
Subject: [PATCH v2 03/11] mmc: sdhci-of-arasan: Replace deprecated clk API calls
Date: Mon,  1 Jul 2019 10:59:43 +0530	[thread overview]
Message-ID: <1561958991-21935-4-git-send-email-manish.narani@xilinx.com> (raw)
In-Reply-To: <1561958991-21935-1-git-send-email-manish.narani@xilinx.com>

The clk framework APIs devm_clk_register and of_clk_add_provider, which
are used here, are deprecated. Replace the calls with the new API calls.
Also add an API call devm_clk_get() to get the clock from DT.

Signed-off-by: Manish Narani <manish.narani@xilinx.com>
---
 drivers/mmc/host/sdhci-of-arasan.c | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/drivers/mmc/host/sdhci-of-arasan.c b/drivers/mmc/host/sdhci-of-arasan.c
index b12abf9..d60a2e8 100644
--- a/drivers/mmc/host/sdhci-of-arasan.c
+++ b/drivers/mmc/host/sdhci-of-arasan.c
@@ -641,14 +641,25 @@ static int sdhci_arasan_register_sdclk(struct sdhci_arasan_data *sdhci_arasan,
 	sdcardclk_init.ops = &arasan_sdcardclk_ops;
 
 	sdhci_arasan->sdcardclk_hw.init = &sdcardclk_init;
-	sdhci_arasan->sdcardclk =
-		devm_clk_register(dev, &sdhci_arasan->sdcardclk_hw);
+	ret = devm_clk_hw_register(dev, &sdhci_arasan->sdcardclk_hw);
+	if (ret) {
+		dev_err(dev, "Failed to register SD clk_hw\n");
+		return ret;
+	}
 	sdhci_arasan->sdcardclk_hw.init = NULL;
 
-	ret = of_clk_add_provider(np, of_clk_src_simple_get,
-				  sdhci_arasan->sdcardclk);
-	if (ret)
+	ret = of_clk_add_hw_provider(np, of_clk_hw_simple_get,
+				     &sdhci_arasan->sdcardclk_hw);
+	if (ret) {
 		dev_err(dev, "Failed to add clock provider\n");
+		return ret;
+	}
+
+	sdhci_arasan->sdcardclk = devm_clk_get(dev, "clk_sdcard");
+	if (IS_ERR(sdhci_arasan->sdcardclk)) {
+		dev_err(dev, "sdcardclk clock not found.\n");
+		ret = PTR_ERR(sdhci_arasan->sdcardclk);
+	}
 
 	return ret;
 }
-- 
2.1.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

next prev parent reply	other threads:[~2019-07-01  5:30 UTC|newest]

Thread overview: 67+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-01  5:29 [PATCH v2 00/11] Arasan SDHCI enhancements and ZynqMP Tap Delays Handling Manish Narani
2019-07-01  5:29 ` Manish Narani
2019-07-01  5:29 ` [PATCH v2 01/11] dt-bindings: mmc: arasan: Update documentation for SD Card Clock Manish Narani
2019-07-01  5:29   ` Manish Narani
2019-07-22 21:54   ` Rob Herring
2019-07-22 21:54     ` Rob Herring
2019-07-23  8:23     ` Manish Narani
2019-07-23  8:23       ` Manish Narani
2019-07-23  8:23       ` Manish Narani
2019-07-25 13:00       ` Ulf Hansson
2019-07-25 13:00         ` Ulf Hansson
2019-07-25 13:00         ` Ulf Hansson
2019-08-19  9:21         ` Manish Narani
2019-08-19  9:21           ` Manish Narani
2019-08-19  9:21           ` Manish Narani
2019-08-22 13:38           ` Ulf Hansson
2019-08-22 13:38             ` Ulf Hansson
2019-08-22 13:38             ` Ulf Hansson
2019-08-22 18:23             ` Heiko Stuebner
2019-08-22 18:23               ` Heiko Stuebner
2019-08-22 18:23               ` Heiko Stuebner
2019-08-23 10:01               ` Manish Narani
2019-08-23 10:01                 ` Manish Narani
2019-08-23 10:01                 ` Manish Narani
2019-07-01  5:29 ` [PATCH v2 02/11] arm64: dts: rockchip: Add optional clock property indicating sdcard clock Manish Narani
2019-07-01  5:29   ` Manish Narani
2019-07-01  5:29 ` Manish Narani [this message]
2019-07-01  5:29   ` [PATCH v2 03/11] mmc: sdhci-of-arasan: Replace deprecated clk API calls Manish Narani
2019-07-01  5:29   ` Manish Narani
2019-07-01  5:29 ` [PATCH v2 04/11] mmc: sdhci-of-arasan: Separate out clk related data to another structure Manish Narani
2019-07-01  5:29   ` Manish Narani
2019-07-01  5:29 ` [PATCH v2 05/11] dt-bindings: mmc: arasan: Update Documentation for the input clock Manish Narani
2019-07-01  5:29   ` Manish Narani
2019-07-22 21:56   ` Rob Herring
2019-07-22 21:56     ` Rob Herring
2019-07-01  5:29 ` [PATCH v2 06/11] mmc: sdhci-of-arasan: Add sampling clock for a phy to use Manish Narani
2019-07-01  5:29   ` Manish Narani
2019-07-01  5:29   ` Manish Narani
2019-07-01  5:29 ` [PATCH v2 07/11] dt-bindings: mmc: arasan: Add optional properties for Arasan SDHCI Manish Narani
2019-07-01  5:29   ` Manish Narani
2019-07-22 22:01   ` Rob Herring
2019-07-22 22:01     ` Rob Herring
2019-07-01  5:29 ` [PATCH v2 08/11] mmc: sdhci-of-arasan: Add support to set clock phase delays for SD Manish Narani
2019-07-01  5:29   ` Manish Narani
2019-07-01  5:29 ` [PATCH v2 09/11] firmware: xilinx: Add SDIO Tap Delay APIs Manish Narani
2019-07-01  5:29   ` Manish Narani
2019-07-01 18:06   ` Jolly Shah
2019-07-01 18:06     ` Jolly Shah
2019-07-01 18:06     ` Jolly Shah
2019-07-02  5:03     ` Manish Narani
2019-07-02  5:03       ` Manish Narani
2019-07-02  5:03       ` Manish Narani
2019-07-01  5:29 ` [PATCH v2 10/11] dt-bindings: mmc: arasan: Document 'xlnx,zynqmp-8.9a' controller Manish Narani
2019-07-01  5:29   ` [PATCH v2 10/11] dt-bindings: mmc: arasan: Document 'xlnx, zynqmp-8.9a' controller Manish Narani
2019-07-22 22:06   ` [PATCH v2 10/11] dt-bindings: mmc: arasan: Document 'xlnx,zynqmp-8.9a' controller Rob Herring
2019-07-22 22:06     ` Rob Herring
2019-07-22 22:06     ` Rob Herring
2019-07-01  5:29 ` [PATCH v2 11/11] mmc: sdhci-of-arasan: Add support for ZynqMP Platform Tap Delays Setup Manish Narani
2019-07-01  5:29   ` Manish Narani
2019-07-10 11:33 ` [PATCH v2 00/11] Arasan SDHCI enhancements and ZynqMP Tap Delays Handling Adrian Hunter
2019-07-10 11:33   ` Adrian Hunter
2019-07-15  7:15 ` Manish Narani
2019-07-15  7:15   ` Manish Narani
2019-07-15  7:15   ` Manish Narani
2019-07-22  4:56   ` Manish Narani
2019-07-22  4:56     ` Manish Narani
2019-07-22  4:56     ` Manish Narani

find likely ancestor, descendant, or conflicting patches for this message:
dfblob:b12abf9 dfblob:b12abf9 dfblob:b12abf9 dfblob:d60a2e8
dfblob:d60a2e8 dfblob:d60a2e8
	(help)

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=1561958991-21935-4-git-send-email-manish.narani@xilinx.com \
    --to=manish.narani@xilinx.com \
    --cc=adrian.hunter@intel.com \
    --cc=ayaka@soulik.info \
    --cc=christoph.muellner@theobroma-systems.com \
    --cc=devicetree@vger.kernel.org \
    --cc=heiko@sntech.de \
    --cc=jolly.shah@xilinx.com \
    --cc=kernel@esmil.dk \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mmc@vger.kernel.org \
    --cc=linux-rockchip@lists.infradead.org \
    --cc=mark.rutland@arm.com \
    --cc=mdf@kernel.org \
    --cc=michal.simek@xilinx.com \
    --cc=nava.manne@xilinx.com \
    --cc=olof@lixom.net \
    --cc=philipp.tomsich@theobroma-systems.com \
    --cc=rajan.vaja@xilinx.com \
    --cc=robh+dt@kernel.org \
    --cc=scott.branden@broadcom.com \
    --cc=tony.xie@rock-chips.com \
    --cc=ulf.hansson@linaro.org \
    --cc=viresh.kumar@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 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.