GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-04-06 22:44:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

spi: qup: Fix QUP version identify method

Browse source 
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>
This commit is contained in:
Varadarajan Narayanan 2017-07-28 12:23:01 +05:30 • committed by Mark Brown
parent cd595b99af
commit 4d023737b2
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/spi/spi-qup.c
View file

@ -19,6 +19,7 @@
#include <linux/list.h> #include <linux/list.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_device.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
@ -1058,9 +1059,7 @@ static int spi_qup_probe(struct platform_device *pdev)
else if (!ret) else if (!ret)
master->can_dma = spi_qup_can_dma; master->can_dma = spi_qup_can_dma;
/* set v1 flag if device is version 1 */ controller->qup_v1 = (int)of_device_get_match_data(dev);
if (of_device_is_compatible(dev->of_node, "qcom,spi-qup-v1.1.1"))
controller->qup_v1 = 1;
if (!controller->qup_v1) if (!controller->qup_v1)
master->set_cs = spi_qup_set_cs; 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[] = { 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.1.1", },
{ .compatible = "qcom,spi-qup-v2.2.1", }, { .compatible = "qcom,spi-qup-v2.2.1", },
{ } { }