diff options
author | Marc Kleine-Budde <mkl@pengutronix.de> | 2013-10-03 23:51:55 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-13 12:05:31 +0900 |
commit | e350ff50bcd46d650d56015a1416c622d057ec90 (patch) | |
tree | 173871c17288356e7abc4d010cfcb801c8b0d3aa /drivers | |
parent | 1a64b62db0883ba42db1c3860a8aa25aa398e020 (diff) | |
download | linux-3.10-e350ff50bcd46d650d56015a1416c622d057ec90.tar.gz linux-3.10-e350ff50bcd46d650d56015a1416c622d057ec90.tar.bz2 linux-3.10-e350ff50bcd46d650d56015a1416c622d057ec90.zip |
can: flexcan: fix mx28 detection by rearanging OF match table
commit e358784297992b012e8071764d996191dd2b1a54 upstream.
The current implemetation of of_match_device() relies that the of_device_id
table in the driver is sorted from most specific to least specific compatible.
Without this patch the mx28 is detected as the less specific p1010. This leads
to a p1010 specific workaround is activated on the mx28, which is not needed.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/can/flexcan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c index 769d29ed106..261d1ee6447 100644 --- a/drivers/net/can/flexcan.c +++ b/drivers/net/can/flexcan.c @@ -983,9 +983,9 @@ static void unregister_flexcandev(struct net_device *dev) } static const struct of_device_id flexcan_of_match[] = { - { .compatible = "fsl,p1010-flexcan", .data = &fsl_p1010_devtype_data, }, - { .compatible = "fsl,imx28-flexcan", .data = &fsl_imx28_devtype_data, }, { .compatible = "fsl,imx6q-flexcan", .data = &fsl_imx6q_devtype_data, }, + { .compatible = "fsl,imx28-flexcan", .data = &fsl_imx28_devtype_data, }, + { .compatible = "fsl,p1010-flexcan", .data = &fsl_p1010_devtype_data, }, { /* sentinel */ }, }; MODULE_DEVICE_TABLE(of, flexcan_of_match); |