From: Yaniv Gardi <ygardi@codeaurora.org>
To: James.Bottomley@HansenPartnership.com
Cc: linux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org,
linux-arm-msm@vger.kernel.org, santoshsy@gmail.com,
linux-scsi-owner@vger.kernel.org, subhashj@codeaurora.org,
ygardi@codeaurora.org, pebolle@tiscali.nl,
gbroner@codeaurora.org, Rob Herring <robh+dt@kernel.org>,
Pawel Moll <pawel.moll@arm.com>,
Mark Rutland <mark.rutland@arm.com>,
Ian Campbell <ijc+devicetree@hellion.org.uk>,
Kumar Gala <galak@codeaurora.org>,
Vinayak Holikatti <vinholikatti@gmail.com>,
"James E.J. Bottomley" <JBottomley@odin.com>,
Dolev Raviv <draviv@codeaurora.org>,
Christoph Hellwig <hch@lst.de>,
Sujit Reddy Thumma <sthumma@codeaurora.org>,
Raviv Shvili <rshvili@codeaurora.org>,
Sahitya Tummala <stummala@codeaurora.org>,
devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND...)
Subject: [PATCH v2 4/4] scsi: ufs: probe and init of variant driver from the platform device
Date: Wed, 3 Jun 2015 12:37:35 +0300 [thread overview]
Message-ID: <1433324255-27510-5-git-send-email-ygardi@codeaurora.org> (raw)
In-Reply-To: <1433324255-27510-1-git-send-email-ygardi@codeaurora.org>
It does so by adding the following changes:
1. Introducing SCSI_UFS_QCOM as a platform device. Its probe
function registers a set of vops to its driver_data.
2. Adding an optional device tree sub-node, under SCSI_UFSHCD_PLATFORM.
Now, the probe function of SCSI_UFSHCD_PLATFORM invokes the probe
function of its sub-node (if it exists), by calling
of_platform_populate(). It ensures that vops are set, and ready to
be used, by the time the UFSHCD driver starts its initialization
procedure.
Signed-off-by: Yaniv Gardi <ygardi@codeaurora.org>
---
.../devicetree/bindings/ufs/ufshcd-pltfrm.txt | 8 +++++
drivers/scsi/ufs/ufs-qcom.c | 40 ++++++++++++++++++++++
drivers/scsi/ufs/ufshcd-pltfrm.c | 33 +++++++++++-------
3 files changed, 68 insertions(+), 13 deletions(-)
diff --git a/Documentation/devicetree/bindings/ufs/ufshcd-pltfrm.txt b/Documentation/devicetree/bindings/ufs/ufshcd-pltfrm.txt
index 5357919..e2f3058 100644
--- a/Documentation/devicetree/bindings/ufs/ufshcd-pltfrm.txt
+++ b/Documentation/devicetree/bindings/ufs/ufshcd-pltfrm.txt
@@ -55,3 +55,11 @@ Example:
clock-names = "core_clk", "ref_clk", "iface_clk";
freq-table-hz = <100000000 200000000>, <0 0>, <0 0>;
};
+
+This is an example to a variant sub-node of ufshc:
+ ufs_variant {
+ compatible = "qcom,ufs_variant";
+ };
+
+This sub-node holds various specific information that is not defined in the
+standard and that may differ between platforms.
diff --git a/drivers/scsi/ufs/ufs-qcom.c b/drivers/scsi/ufs/ufs-qcom.c
index 6671a8e..ad5ffa8 100644
--- a/drivers/scsi/ufs/ufs-qcom.c
+++ b/drivers/scsi/ufs/ufs-qcom.c
@@ -1018,4 +1018,44 @@ static const struct ufs_hba_variant_ops ufs_hba_qcom_vops = {
};
EXPORT_SYMBOL(ufs_hba_qcom_vops);
+/**
+ * ufs_qcom_probe - probe routine of the driver
+ * @pdev: pointer to Platform device handle
+ *
+ * Always return 0
+ */
+static int ufs_qcom_probe(struct platform_device *pdev)
+{
+ dev_set_drvdata(&pdev->dev, (void *)&ufs_hba_qcom_vops);
+ return 0;
+}
+
+/**
+ * ufs_qcom_remove - set driver_data of the device to NULL
+ * @pdev: pointer to platform device handle
+ *
+ * Always return 0
+ */
+static int ufs_qcom_remove(struct platform_device *pdev)
+{
+ dev_set_drvdata(&pdev->dev, NULL);
+ return 0;
+}
+
+static const struct of_device_id ufs_qcom_of_match[] = {
+ { .compatible = "qcom,ufs_variant"},
+ {},
+};
+
+static struct platform_driver ufs_qcom_pltform = {
+ .probe = ufs_qcom_probe,
+ .remove = ufs_qcom_remove,
+ .driver = {
+ .name = "ufs_qcom",
+ .owner = THIS_MODULE,
+ .of_match_table = of_match_ptr(ufs_qcom_of_match),
+ },
+};
+module_platform_driver(ufs_qcom_pltform);
+
MODULE_LICENSE("GPL v2");
diff --git a/drivers/scsi/ufs/ufshcd-pltfrm.c b/drivers/scsi/ufs/ufshcd-pltfrm.c
index 7db9564..7bf2f44 100644
--- a/drivers/scsi/ufs/ufshcd-pltfrm.c
+++ b/drivers/scsi/ufs/ufshcd-pltfrm.c
@@ -36,22 +36,11 @@
#include <linux/platform_device.h>
#include <linux/pm_runtime.h>
#include <linux/of.h>
+#include <linux/of_platform.h>
#include "ufshcd.h"
static const struct of_device_id ufs_of_match[];
-static struct ufs_hba_variant_ops *get_variant_ops(struct device *dev)
-{
- if (dev->of_node) {
- const struct of_device_id *match;
-
- match = of_match_node(ufs_of_match, dev->of_node);
- if (match)
- return (struct ufs_hba_variant_ops *)match->data;
- }
-
- return NULL;
-}
static int ufshcd_parse_clock_info(struct ufs_hba *hba)
{
@@ -300,6 +289,9 @@ static int ufshcd_pltfrm_probe(struct platform_device *pdev)
struct resource *mem_res;
int irq, err;
struct device *dev = &pdev->dev;
+ struct device_node *node = pdev->dev.of_node;
+ struct device_node *ufs_variant_node;
+ struct platform_device *ufs_variant_pdev;
mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
mmio_base = devm_ioremap_resource(dev, mem_res);
@@ -321,7 +313,22 @@ static int ufshcd_pltfrm_probe(struct platform_device *pdev)
goto out;
}
- hba->vops = get_variant_ops(&pdev->dev);
+ err = of_platform_populate(node, NULL, NULL, &pdev->dev);
+ if (err)
+ dev_err(&pdev->dev,
+ "%s: of_platform_populate() failed\n", __func__);
+
+ ufs_variant_node = of_get_next_available_child(node, NULL);
+
+ if (!ufs_variant_node) {
+ dev_dbg(&pdev->dev, "failed to find ufs_variant_node child\n");
+ } else {
+ ufs_variant_pdev = of_find_device_by_node(ufs_variant_node);
+
+ if (ufs_variant_pdev)
+ hba->vops = (struct ufs_hba_variant_ops *)
+ dev_get_drvdata(&ufs_variant_pdev->dev);
+ }
err = ufshcd_parse_clock_info(hba);
if (err) {
--
1.8.5.2
--
QUALCOMM ISRAEL, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
next prev parent reply other threads:[~2015-06-03 9:38 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-03 9:37 [PATCH v2 0/4] fixing building errors and warnings when components Yaniv Gardi
2015-06-03 9:37 ` [PATCH v2 1/4] phy: qcom-ufs: fix build error when the component is built as a module Yaniv Gardi
2015-06-03 9:37 ` [PATCH v2 2/4] scsi: ufs-qcom: fix compilation warning if compiled " Yaniv Gardi
2015-06-03 9:37 ` [PATCH v2 3/4] scsi: ufs-qcom: update configuration option of SCSI_UFS_QCOM component Yaniv Gardi
2015-06-03 9:37 ` Yaniv Gardi [this message]
2015-06-04 14:07 ` [PATCH v2 4/4] scsi: ufs: probe and init of variant driver from the platform device Paul Bolle
2015-06-04 14:42 ` Paul Bolle
2015-06-04 20:42 ` ygardi
2015-06-07 15:22 ` ygardi
2015-06-04 14:32 ` Akinobu Mita
2015-06-04 20:53 ` ygardi
2015-06-05 16:47 ` Akinobu Mita
2015-06-07 15:32 ` ygardi
2015-06-08 14:47 ` Akinobu Mita
2015-06-08 15:02 ` Rob Herring
2015-06-09 5:53 ` Dov Levenglick
2015-06-09 12:53 ` Rob Herring
2015-06-17 7:42 ` Dov Levenglick
2015-06-17 12:46 ` Rob Herring
2015-06-17 13:17 ` Dov Levenglick
2015-06-17 13:37 ` Rob Herring
2015-06-17 14:21 ` Dov Levenglick
2015-06-17 14:31 ` James Bottomley
2015-06-17 14:38 ` Dov Levenglick
2015-06-08 14:51 ` Rob Herring
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=1433324255-27510-5-git-send-email-ygardi@codeaurora.org \
--to=ygardi@codeaurora.org \
--cc=JBottomley@odin.com \
--cc=James.Bottomley@HansenPartnership.com \
--cc=devicetree@vger.kernel.org \
--cc=draviv@codeaurora.org \
--cc=galak@codeaurora.org \
--cc=gbroner@codeaurora.org \
--cc=hch@lst.de \
--cc=ijc+devicetree@hellion.org.uk \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi-owner@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=pawel.moll@arm.com \
--cc=pebolle@tiscali.nl \
--cc=robh+dt@kernel.org \
--cc=rshvili@codeaurora.org \
--cc=santoshsy@gmail.com \
--cc=sthumma@codeaurora.org \
--cc=stummala@codeaurora.org \
--cc=subhashj@codeaurora.org \
--cc=vinholikatti@gmail.com \
/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).