diff options
author | Varadarajan Narayanan <varada@codeaurora.org> | 2017-07-28 02:53:01 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2017-08-08 07:15:54 -0400 |
commit | 4d023737b2efcaac36e4e6bbfdce3a3b377f3946 (patch) | |
tree | 3a02a5784ef1723ca4ef010508dca33dfa8ee165 | |
parent | cd595b99af24b8efa4a6a8889ad65f4d270fd644 (diff) |
spi: qup: Fix QUP version identify method
Use of_device_get_match_data to identify QUP version instead
of of_device_is_compatible.
Signed-off-by: Varadarajan Narayanan <varada@codeaurora.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r-- | drivers/spi/spi-qup.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c index 4c3c938360f4..1364516e87c2 100644 --- a/drivers/spi/spi-qup.c +++ b/drivers/spi/spi-qup.c | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <linux/list.h> | 19 | #include <linux/list.h> |
20 | #include <linux/module.h> | 20 | #include <linux/module.h> |
21 | #include <linux/of.h> | 21 | #include <linux/of.h> |
22 | #include <linux/of_device.h> | ||
22 | #include <linux/platform_device.h> | 23 | #include <linux/platform_device.h> |
23 | #include <linux/pm_runtime.h> | 24 | #include <linux/pm_runtime.h> |
24 | #include <linux/spi/spi.h> | 25 | #include <linux/spi/spi.h> |
@@ -1058,9 +1059,7 @@ static int spi_qup_probe(struct platform_device *pdev) | |||
1058 | else if (!ret) | 1059 | else if (!ret) |
1059 | master->can_dma = spi_qup_can_dma; | 1060 | master->can_dma = spi_qup_can_dma; |
1060 | 1061 | ||
1061 | /* set v1 flag if device is version 1 */ | 1062 | controller->qup_v1 = (int)of_device_get_match_data(dev); |
1062 | if (of_device_is_compatible(dev->of_node, "qcom,spi-qup-v1.1.1")) | ||
1063 | controller->qup_v1 = 1; | ||
1064 | 1063 | ||
1065 | if (!controller->qup_v1) | 1064 | if (!controller->qup_v1) |
1066 | master->set_cs = spi_qup_set_cs; | 1065 | master->set_cs = spi_qup_set_cs; |
@@ -1256,7 +1255,7 @@ static int spi_qup_remove(struct platform_device *pdev) | |||
1256 | } | 1255 | } |
1257 | 1256 | ||
1258 | static const struct of_device_id spi_qup_dt_match[] = { | 1257 | static const struct of_device_id spi_qup_dt_match[] = { |
1259 | { .compatible = "qcom,spi-qup-v1.1.1", }, | 1258 | { .compatible = "qcom,spi-qup-v1.1.1", .data = (void *)1, }, |
1260 | { .compatible = "qcom,spi-qup-v2.1.1", }, | 1259 | { .compatible = "qcom,spi-qup-v2.1.1", }, |
1261 | { .compatible = "qcom,spi-qup-v2.2.1", }, | 1260 | { .compatible = "qcom,spi-qup-v2.2.1", }, |
1262 | { } | 1261 | { } |