From: Varadarajan Narayanan <varada@codeaurora.org>
To: broonie@kernel.org, robh+dt@kernel.org, mark.rutland@arm.com,
andy.gross@linaro.org, david.brown@linaro.org,
linux-spi@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org,
linux-soc@vger.kernel.org
Cc: Varadarajan Narayanan <varada@codeaurora.org>
Subject: [PATCH v5 14/14] spi: qup: Fix QUP version identify method
Date: Mon, 24 Jul 2017 13:17:25 +0530 [thread overview]
Message-ID: <1500882445-29008-15-git-send-email-varada@codeaurora.org> (raw)
In-Reply-To: <1500882445-29008-1-git-send-email-varada@codeaurora.org>
Use of_device_get_match_data to identify QUP version instead
of of_device_is_compatible.
Signed-off-by: Varadarajan Narayanan <varada@codeaurora.org>
---
drivers/spi/spi-qup.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c
index 4c3c938..1364516 100644
--- a/drivers/spi/spi-qup.c
+++ b/drivers/spi/spi-qup.c
@@ -19,6 +19,7 @@
#include <linux/list.h>
#include <linux/module.h>
#include <linux/of.h>
+#include <linux/of_device.h>
#include <linux/platform_device.h>
#include <linux/pm_runtime.h>
#include <linux/spi/spi.h>
@@ -1058,9 +1059,7 @@ static int spi_qup_probe(struct platform_device *pdev)
else if (!ret)
master->can_dma = spi_qup_can_dma;
- /* set v1 flag if device is version 1 */
- if (of_device_is_compatible(dev->of_node, "qcom,spi-qup-v1.1.1"))
- controller->qup_v1 = 1;
+ controller->qup_v1 = (int)of_device_get_match_data(dev);
if (!controller->qup_v1)
master->set_cs = spi_qup_set_cs;
@@ -1256,7 +1255,7 @@ static int spi_qup_remove(struct platform_device *pdev)
}
static const struct of_device_id spi_qup_dt_match[] = {
- { .compatible = "qcom,spi-qup-v1.1.1", },
+ { .compatible = "qcom,spi-qup-v1.1.1", .data = (void *)1, },
{ .compatible = "qcom,spi-qup-v2.1.1", },
{ .compatible = "qcom,spi-qup-v2.2.1", },
{ }
--
QUALCOMM INDIA, 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:[~2017-07-24 7:47 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-24 7:47 [PATCH v5 00/14] spi: qup: Fixes and add support for >64k transfers Varadarajan Narayanan
2017-07-24 7:47 ` [PATCH v5 01/14] spi: qup: Enable chip select support Varadarajan Narayanan
2017-07-24 7:47 ` [PATCH v5 04/14] spi: qup: Place the QUP in run mode before DMA Varadarajan Narayanan
2017-08-08 11:18 ` Applied "spi: qup: Place the QUP in run mode before DMA" to the spi tree Mark Brown
2017-08-08 11:18 ` Mark Brown
2017-07-24 7:47 ` [PATCH v5 06/14] spi: qup: Fix transaction done signaling Varadarajan Narayanan
2017-07-24 7:47 ` [PATCH v5 08/14] spi: qup: refactor spi_qup_io_config into two functions Varadarajan Narayanan
2017-08-08 11:18 ` Applied "spi: qup: refactor spi_qup_io_config into two functions" to the spi tree Mark Brown
2017-08-08 11:18 ` Mark Brown
[not found] ` <1500882445-29008-1-git-send-email-varada-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2017-07-24 7:47 ` [PATCH v5 02/14] spi: qup: Setup DMA mode correctly Varadarajan Narayanan
2017-07-24 7:47 ` Varadarajan Narayanan
2017-07-24 7:47 ` [PATCH v5 03/14] spi: qup: Add completion timeout Varadarajan Narayanan
2017-07-24 7:47 ` Varadarajan Narayanan
2017-07-27 8:30 ` kbuild test robot
2017-07-27 8:30 ` kbuild test robot
2017-07-24 7:47 ` [PATCH v5 05/14] spi: qup: Fix error handling in spi_qup_prep_sg Varadarajan Narayanan
2017-07-24 7:47 ` Varadarajan Narayanan
2017-08-08 11:18 ` Applied "spi: qup: Fix error handling in spi_qup_prep_sg" to the spi tree Mark Brown
2017-08-08 11:18 ` Mark Brown
2017-07-24 7:47 ` [PATCH v5 07/14] spi: qup: Do block sized read/write in block mode Varadarajan Narayanan
2017-07-24 7:47 ` Varadarajan Narayanan
2017-08-08 11:18 ` Applied "spi: qup: Do block sized read/write in block mode" to the spi tree Mark Brown
2017-08-08 11:18 ` Mark Brown
2017-07-24 7:47 ` [PATCH v5 09/14] spi: qup: call io_config in mode specific function Varadarajan Narayanan
2017-07-24 7:47 ` Varadarajan Narayanan
2017-07-24 7:47 ` [PATCH v5 10/14] spi: qup: allow block mode to generate multiple transactions Varadarajan Narayanan
2017-07-24 7:47 ` Varadarajan Narayanan
2017-08-08 11:18 ` Applied "spi: qup: allow block mode to generate multiple transactions" to the spi tree Mark Brown
2017-08-08 11:18 ` Mark Brown
2017-07-24 7:47 ` [PATCH v5 11/14] spi: qup: refactor spi_qup_prep_sg Varadarajan Narayanan
2017-07-24 7:47 ` Varadarajan Narayanan
2017-08-08 11:18 ` Applied "spi: qup: refactor spi_qup_prep_sg" to the spi tree Mark Brown
2017-08-08 11:18 ` Mark Brown
2017-07-24 7:47 ` [PATCH v5 12/14] spi: qup: allow multiple DMA transactions per spi xfer Varadarajan Narayanan
2017-07-24 7:47 ` Varadarajan Narayanan
2017-07-24 7:47 ` [PATCH v5 13/14] spi: qup: Ensure done detection Varadarajan Narayanan
2017-07-24 7:47 ` Varadarajan Narayanan [this message]
[not found] ` <1500882445-29008-15-git-send-email-varada-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2017-07-25 2:52 ` [PATCH v5 14/14] spi: qup: Fix QUP version identify method kbuild test robot
2017-07-25 2:52 ` kbuild test robot
2017-07-25 2:52 ` kbuild test robot
2017-08-08 11:17 ` Applied "spi: qup: Fix QUP version identify method" to the spi tree Mark Brown
2017-08-08 11:17 ` Mark Brown
2017-08-08 11:17 ` Mark Brown
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=1500882445-29008-15-git-send-email-varada@codeaurora.org \
--to=varada@codeaurora.org \
--cc=andy.gross@linaro.org \
--cc=broonie@kernel.org \
--cc=david.brown@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-soc@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.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.