summaryrefslogtreecommitdiffstats
path: root/drivers/net/can
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2013-10-09 12:19:19 +0200
committerMarc Kleine-Budde <mkl@pengutronix.de>2013-10-09 23:04:31 +0200
commit5abbeea553c8260ed4e2ac4aae962aff800b6c6d (patch)
treeb9372be4c4f41e35d65078a171a27c1a9c5afa40 /drivers/net/can
parente358784297992b012e8071764d996191dd2b1a54 (diff)
downloadop-kernel-dev-5abbeea553c8260ed4e2ac4aae962aff800b6c6d.zip
op-kernel-dev-5abbeea553c8260ed4e2ac4aae962aff800b6c6d.tar.gz
can: at91-can: fix device to driver data mapping for platform devices
In commit: 3078cde7 can: at91_can: add dt support device tree support was added to the at91_can driver. In this commit the mapping of device to driver data was mixed up. This results in the sam9x5 parameters being used for the sam9263 and the workaround for the broken mailbox 0 on the sam9263 not being activated. This patch fixes the broken platform_device_id table. Cc: linux-stable <stable@vger.kernel.org> Cc: Ludovic Desroches <ludovic.desroches@atmel.com> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'drivers/net/can')
-rw-r--r--drivers/net/can/at91_can.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/can/at91_can.c b/drivers/net/can/at91_can.c
index 3b1ff61..693d8ff 100644
--- a/drivers/net/can/at91_can.c
+++ b/drivers/net/can/at91_can.c
@@ -1405,10 +1405,10 @@ static int at91_can_remove(struct platform_device *pdev)
static const struct platform_device_id at91_can_id_table[] = {
{
- .name = "at91_can",
+ .name = "at91sam9x5_can",
.driver_data = (kernel_ulong_t)&at91_at91sam9x5_data,
}, {
- .name = "at91sam9x5_can",
+ .name = "at91_can",
.driver_data = (kernel_ulong_t)&at91_at91sam9263_data,
}, {
/* sentinel */
OpenPOWER on IntegriCloud