Skip to content

Commit

Permalink
spi: qup: Fix QUP version identify method
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Varadarajan Narayanan authored and Mark Brown committed Aug 8, 2017
1 parent cd595b9 commit 4d02373
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions drivers/spi/spi-qup.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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", },
{ }
Expand Down

0 comments on commit 4d02373

Please sign in to comment.