can: at91_can: add dt support
PATCH v2 1/2 can: at91_can: add dt support
From: Ludovic Desroches <[email protected]>
Add device tree support.
---
Changes in v2:
- code cleanup
- correct typo
.../devicetree/bindings/net/can/atmel-can.txt | 14 ++++ drivers/net/can/at91_can.c | 74 ++++++++++++++++------ 2 files changed, 69 insertions(+), 19 deletions(-) create mode 100644 Documentation/devicetree/bindings/net/can/atmel-can.txt
Documentation/devicetree/bindings/net/can/atmel-can.txt new file +14 -0
@@ -0,0 +1,14 @@ +* AT91 CAN * + +Required properties: + - compatible: Should be "atmel,at91sam9263-can" or "atmel,at91sam9x5-can" + - reg: Should contain CAN controller registers location and length + - interrupts: Should contain IRQ line for the CAN controller + +Example: + + can0: can at f000c000 { + compatbile = "atmel,at91sam9x5-can"; + reg = <0xf000c000 0x300>; + interrupts = <40 4 5> + };
drivers/net/can/at91_can.c +55 -19
121 lines not on this page · raw message
Signature · 1 line
1.7.11.3
PATCH v2 2/2 can: Kconfig: CAN_AT91 depends on ARM
From: Ludovic Desroches <[email protected]>
SAMA5D3 devices also embed CAN feature. Moreover if we want to produce a single kernel image it is not useful to be too restrictive.
---
Changes in v2:
- depends on ARM instead of ARCH_AT91 (compilation tested with exynos4_defconfig and imx_v6_v7_defconfig)
driver/net/can/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/can/Kconfig +1 -1
@@ -65,7 +65,7 @@ config CAN_LEDS config CAN_AT91 tristate "Atmel AT91 onchip CAN controller" - depends on ARCH_AT91SAM9263 || ARCH_AT91SAM9X5 + depends on ARM ---help--- This is a driver for the SoC CAN controller in Atmel's AT91SAM9263 and AT91SAM9X5 processors.
Signature · 1 line
1.7.11.3
Marc Kleine-Budde
maintainerPATCH v2 1/2 can: at91_can: add dt support
In reply to ludovic.desroches at atmel.comQuoted 147 lines · ludovic.desroches at atmel.com
From: Ludovic Desroches <[email protected]>
Add device tree support.
Signed-off-by Ludovic Desroches <[email protected]>---
Changes in v2:
- code cleanup
- correct typo.../devicetree/bindings/net/can/atmel-can.txt | 14 ++++ drivers/net/can/at91_can.c | 74 ++++++++++++++++------ 2 files changed, 69 insertions(+), 19 deletions(-) create mode 100644 Documentation/devicetree/bindings/net/can/atmel-can.txtDocumentation/devicetree/bindings/net/can/atmel-can.txt new file +14
-0@@ -0,0 +1,14 @@ +* AT91 CAN * + +Required properties: + - compatible: Should be "atmel,at91sam9263-can" or "atmel,at91sam9x5-can" + - reg: Should contain CAN controller registers location and length + - interrupts: Should contain IRQ line for the CAN controller + +Example: + + can0: can at f000c000 { + compatbile = "atmel,at91sam9x5-can"; + reg = <0xf000c000 0x300>; + interrupts = <40 4 5> + };drivers/net/can/at91_can.c +52
-17@@ -27,6 +27,7 @@#include <linux/kernel.h> #include <linux/module.h> #include <linux/netdevice.h> +#include <linux/of.h> #include <linux/platform_device.h> #include <linux/rtnetlink.h> #include <linux/skbuff.h> @@ -155,19 +156,20 @@ struct at91_priv {canid_t mb0_id; }; -static const struct at91_devtype_data at91_devtype_data[] = { - [AT91_DEVTYPE_SAM9263 ] = { - .rx_first =1 , - .rx_split =8 , - .rx_last =11 , - .tx_shift =2 , - }, - [AT91_DEVTYPE_SAM9X5 ] = { - .rx_first =0 , - .rx_split =4 , - .rx_last =5 , - .tx_shift =1 , - }, +static struct at91_devtype_data at91_at91sam9263_data = { + .rx_first =1 , + .rx_split =8 , + .rx_last =11 , + .tx_shift =2 , + .type =AT91_DEVTYPE_SAM9263 , +}; + +static struct at91_devtype_data at91_at91sam9x5_data = { + .rx_first =0 , + .rx_split =4 , + .rx_last =5 , + .tx_shift =1 , + .type =AT91_DEVTYPE_SAM9X5 , };static const struct can_bittiming_const at91_bittiming_const = {@@ -1249,10 +1251,40 @@ static struct attribute_group at91_sysfs_attr_group = { .attrs = at91_sysfs_attrs, }; +#if defined(CONFIG_OF ) +static const struct of_device_id at91_can_dt_ids[] = { + { + .compatible ="atmel,at91sam9x5-can" , + .data = &at91_at91sam9x5_data, + }, { + .compatible ="atmel,at91sam9263-can" , + .data = &at91_at91sam9263_data, + }, { +/* sentinel */ + } +}; +MODULE_DEVICE_TABLE (of, at91_can_dt_ids); +#else +#define at91_can_dt_ids NULL +#endif + +static struct at91_devtype_data *at91_can_get_driver_data (struct platform_device *pdev) +{ +if (pdev->dev.of_node) { +const struct of_device_id *match; + match =of_match_node (at91_can_dt_ids, pdev->dev.of_node); +if (!match) { +dev_err (&pdev->dev,"no matching node found in dtb\n" ); +return NULL ; + } +return (struct at91_devtype_data *)match->data; + } +return (struct at91_devtype_data *)platform_get_device_id (pdev)->driver_data; +} +static int at91_can_probe (struct platform_device *pdev) {const struct at91_devtype_data *devtype_data; -enum at91_devtype devtype;struct net_device *dev;struct at91_priv *priv;struct resource *res;@@ -1260,8 +1292,12 @@ static int at91_can_probe(struct platform_device *pdev)void __iomem *addr;int err, irq; - devtype = pdev->id_entry->driver_data; - devtype_data = &at91_devtype_data[devtype]; + devtype_data =at91_can_get_driver_data (pdev); +if (!devtype_data) { +dev_err (&pdev->dev,"no driver data\n" ); + err = -ENODEV ; + goto exit; + } clk =clk_get (&pdev->dev,"can_clk" );if (IS_ERR (clk)) {@@ -1310,7 +1346,6 @@ static int at91_can_probe(struct platform_device *pdev) priv->dev = dev; priv->reg_base = addr; priv->devtype_data = *devtype_data; - priv->devtype_data.type = devtype; priv->clk = clk; priv->pdata = pdev->dev.platform_data; priv->mb0_id =0x7ff ;
drivers/net/can/at91_can.c static int at91_can_remove(struct platform_device *pdev) · line 1414
Quoted 9 lines
drivers/net/can/at91_can.c +2
-2@@ -1373,10 +1408,10 @@ static int at91_can_remove(struct platform_device *pdev)static const struct platform_device_id at91_can_id_table[] = { { .name ="at91_can" , - .driver_data =AT91_DEVTYPE_SAM9263 , + .driver_data = (unsigned long )&at91_at91sam9x5_data, }, { .name ="at91sam9x5_can" , - .driver_data =AT91_DEVTYPE_SAM9X5 , + .driver_data = (unsigned long )&at91_at91sam9263_data,
It's a kernel_ulong_t, not a (unsigned long), I can fix this while applying the patch.
drivers/net/can/at91_can.c static struct platform_driver at91_can_driver = { · line 1430
Quoted 12 lines
drivers/net/can/at91_can.c +1
-0}, {/* sentinel */ }@@ -1389,6 +1424,7 @@ static struct platform_driver at91_can_driver = { .driver = { .name = KBUILD_MODNAME, .owner = THIS_MODULE, + .of_match_table = at91_can_dt_ids, }, .id_table = at91_can_id_table, };
Marc
Signature · 12 lines
Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 263 bytes Desc: OpenPGP digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130311/7b36677d/attachment.sig>
PATCH v2 1/2 can: at91_can: add dt support
Quoted 152 lines · Marc Kleine-Budde
Quoted 151 lines · ludovic.desroches at atmel.com
From: Ludovic Desroches <[email protected]>
Add device tree support.
Signed-off-by Ludovic Desroches <[email protected]>---
Changes in v2:
- code cleanup
- correct typo.../devicetree/bindings/net/can/atmel-can.txt | 14 ++++ drivers/net/can/at91_can.c | 74 ++++++++++++++++------ 2 files changed, 69 insertions(+), 19 deletions(-) create mode 100644 Documentation/devicetree/bindings/net/can/atmel-can.txtDocumentation/devicetree/bindings/net/can/atmel-can.txt new file +14
-0@@ -0,0 +1,14 @@ +* AT91 CAN * + +Required properties: + - compatible: Should be "atmel,at91sam9263-can" or "atmel,at91sam9x5-can" + - reg: Should contain CAN controller registers location and length + - interrupts: Should contain IRQ line for the CAN controller + +Example: + + can0: can at f000c000 { + compatbile = "atmel,at91sam9x5-can"; + reg = <0xf000c000 0x300>; + interrupts = <40 4 5> + };drivers/net/can/at91_can.c +52
-18@@ -27,6 +27,7 @@#include <linux/kernel.h> #include <linux/module.h> #include <linux/netdevice.h> +#include <linux/of.h> #include <linux/platform_device.h> #include <linux/rtnetlink.h> #include <linux/skbuff.h> @@ -155,19 +156,20 @@ struct at91_priv {canid_t mb0_id; }; -static const struct at91_devtype_data at91_devtype_data[] = { - [AT91_DEVTYPE_SAM9263 ] = { - .rx_first =1 , - .rx_split =8 , - .rx_last =11 , - .tx_shift =2 , - }, - [AT91_DEVTYPE_SAM9X5 ] = { - .rx_first =0 , - .rx_split =4 , - .rx_last =5 , - .tx_shift =1 , - }, +static struct at91_devtype_data at91_at91sam9263_data = { + .rx_first =1 , + .rx_split =8 , + .rx_last =11 , + .tx_shift =2 , + .type =AT91_DEVTYPE_SAM9263 , +}; + +static struct at91_devtype_data at91_at91sam9x5_data = { + .rx_first =0 , + .rx_split =4 , + .rx_last =5 , + .tx_shift =1 , + .type =AT91_DEVTYPE_SAM9X5 , };static const struct can_bittiming_const at91_bittiming_const = {@@ -1249,10 +1251,40 @@ static struct attribute_group at91_sysfs_attr_group = { .attrs = at91_sysfs_attrs, }; +#if defined(CONFIG_OF ) +static const struct of_device_id at91_can_dt_ids[] = { + { + .compatible ="atmel,at91sam9x5-can" , + .data = &at91_at91sam9x5_data, + }, { + .compatible ="atmel,at91sam9263-can" , + .data = &at91_at91sam9263_data, + }, { +/* sentinel */ + } +}; +MODULE_DEVICE_TABLE (of, at91_can_dt_ids); +#else +#define at91_can_dt_ids NULL +#endif + +static struct at91_devtype_data *at91_can_get_driver_data (struct platform_device *pdev) +{ +if (pdev->dev.of_node) { +const struct of_device_id *match; + match =of_match_node (at91_can_dt_ids, pdev->dev.of_node); +if (!match) { +dev_err (&pdev->dev,"no matching node found in dtb\n" ); +return NULL ; + } +return (struct at91_devtype_data *)match->data; + } +return (struct at91_devtype_data *)platform_get_device_id (pdev)->driver_data; +} +static int at91_can_probe (struct platform_device *pdev) {const struct at91_devtype_data *devtype_data; -enum at91_devtype devtype;struct net_device *dev;struct at91_priv *priv;struct resource *res;@@ -1260,8 +1292,12 @@ static int at91_can_probe(struct platform_device *pdev)void __iomem *addr;int err, irq; - devtype = pdev->id_entry->driver_data; - devtype_data = &at91_devtype_data[devtype]; + devtype_data =at91_can_get_driver_data (pdev); +if (!devtype_data) { +dev_err (&pdev->dev,"no driver data\n" ); + err = -ENODEV ; + goto exit; + } clk =clk_get (&pdev->dev,"can_clk" );if (IS_ERR (clk)) {@@ -1310,7 +1346,6 @@ static int at91_can_probe(struct platform_device *pdev) priv->dev = dev; priv->reg_base = addr; priv->devtype_data = *devtype_data; - priv->devtype_data.type = devtype; priv->clk = clk; priv->pdata = pdev->dev.platform_data; priv->mb0_id =0x7ff ;@@ -1373,10 +1408,10 @@ static int at91_can_remove(struct platform_device *pdev)static const struct platform_device_id at91_can_id_table[] = { { .name ="at91_can" , - .driver_data =AT91_DEVTYPE_SAM9263 ,
Quoted 9 lines
drivers/net/can/at91_can.c static int at91_can_remove(struct platform_device *pdev) · line 1414
Quoted 5 lines
drivers/net/can/at91_can.c +2
-1+ .driver_data = (unsigned long)&at91_at91sam9x5_data, }, { .name = "at91sam9x5_can", - .driver_data = AT91_DEVTYPE_SAM9X5, + .driver_data = (unsigned long)&at91_at91sam9263_data,It's a
kernel_ulong_t, not a (unsigned long), I can fix this while applying the patch.
Ok I let you fix it while applying so.
Thanks Marc.
Regards
Ludovic
Quoted 21 lines
drivers/net/can/at91_can.c static struct platform_driver at91_can_driver = { · line 1430
Quoted 12 lines
drivers/net/can/at91_can.c +1
-0}, {/* sentinel */ }@@ -1389,6 +1424,7 @@ static struct platform_driver at91_can_driver = { .driver = { .name = KBUILD_MODNAME, .owner = THIS_MODULE, + .of_match_table = at91_can_dt_ids, }, .id_table = at91_can_id_table, };Marc
Signature · 4 lines
Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
Quoted 152 lines · Marc Kleine-Budde
Quoted 151 lines · On 03/11/2013 06:26 PM, [email protected] wrote:
From: Ludovic Desroches <[email protected]>
Add device tree support.
Signed-off-by Ludovic Desroches <[email protected]>---
Changes in v2:
- code cleanup
- correct typo.../devicetree/bindings/net/can/atmel-can.txt | 14 ++++ drivers/net/can/at91_can.c | 74 ++++++++++++++++------ 2 files changed, 69 insertions(+), 19 deletions(-) create mode 100644 Documentation/devicetree/bindings/net/can/atmel-can.txtDocumentation/devicetree/bindings/net/can/atmel-can.txt new file +14
-0@@ -0,0 +1,14 @@ +* AT91 CAN * + +Required properties: + - compatible: Should be "atmel,at91sam9263-can" or "atmel,at91sam9x5-can" + - reg: Should contain CAN controller registers location and length + - interrupts: Should contain IRQ line for the CAN controller + +Example: + + can0: can@f000c000 { + compatbile = "atmel,at91sam9x5-can"; + reg = <0xf000c000 0x300>; + interrupts = <40 4 5> + };drivers/net/can/at91_can.c +52
-18@@ -27,6 +27,7 @@#include <linux/kernel.h> #include <linux/module.h> #include <linux/netdevice.h> +#include <linux/of.h> #include <linux/platform_device.h> #include <linux/rtnetlink.h> #include <linux/skbuff.h> @@ -155,19 +156,20 @@ struct at91_priv {canid_t mb0_id; }; -static const struct at91_devtype_data at91_devtype_data[] = { - [AT91_DEVTYPE_SAM9263 ] = { - .rx_first =1 , - .rx_split =8 , - .rx_last =11 , - .tx_shift =2 , - }, - [AT91_DEVTYPE_SAM9X5 ] = { - .rx_first =0 , - .rx_split =4 , - .rx_last =5 , - .tx_shift =1 , - }, +static struct at91_devtype_data at91_at91sam9263_data = { + .rx_first =1 , + .rx_split =8 , + .rx_last =11 , + .tx_shift =2 , + .type =AT91_DEVTYPE_SAM9263 , +}; + +static struct at91_devtype_data at91_at91sam9x5_data = { + .rx_first =0 , + .rx_split =4 , + .rx_last =5 , + .tx_shift =1 , + .type =AT91_DEVTYPE_SAM9X5 , };static const struct can_bittiming_const at91_bittiming_const = {@@ -1249,10 +1251,40 @@ static struct attribute_group at91_sysfs_attr_group = { .attrs = at91_sysfs_attrs, }; +#if defined(CONFIG_OF ) +static const struct of_device_id at91_can_dt_ids[] = { + { + .compatible ="atmel,at91sam9x5-can" , + .data = &at91_at91sam9x5_data, + }, { + .compatible ="atmel,at91sam9263-can" , + .data = &at91_at91sam9263_data, + }, { +/* sentinel */ + } +}; +MODULE_DEVICE_TABLE (of, at91_can_dt_ids); +#else +#define at91_can_dt_ids NULL +#endif + +static struct at91_devtype_data *at91_can_get_driver_data (struct platform_device *pdev) +{ +if (pdev->dev.of_node) { +const struct of_device_id *match; + match =of_match_node (at91_can_dt_ids, pdev->dev.of_node); +if (!match) { +dev_err (&pdev->dev,"no matching node found in dtb\n" ); +return NULL ; + } +return (struct at91_devtype_data *)match->data; + } +return (struct at91_devtype_data *)platform_get_device_id (pdev)->driver_data; +} +static int at91_can_probe (struct platform_device *pdev) {const struct at91_devtype_data *devtype_data; -enum at91_devtype devtype;struct net_device *dev;struct at91_priv *priv;struct resource *res;@@ -1260,8 +1292,12 @@ static int at91_can_probe(struct platform_device *pdev)void __iomem *addr;int err, irq; - devtype = pdev->id_entry->driver_data; - devtype_data = &at91_devtype_data[devtype]; + devtype_data =at91_can_get_driver_data (pdev); +if (!devtype_data) { +dev_err (&pdev->dev,"no driver data\n" ); + err = -ENODEV ; + goto exit; + } clk =clk_get (&pdev->dev,"can_clk" );if (IS_ERR (clk)) {@@ -1310,7 +1346,6 @@ static int at91_can_probe(struct platform_device *pdev) priv->dev = dev; priv->reg_base = addr; priv->devtype_data = *devtype_data; - priv->devtype_data.type = devtype; priv->clk = clk; priv->pdata = pdev->dev.platform_data; priv->mb0_id =0x7ff ;@@ -1373,10 +1408,10 @@ static int at91_can_remove(struct platform_device *pdev)static const struct platform_device_id at91_can_id_table[] = { { .name ="at91_can" , - .driver_data =AT91_DEVTYPE_SAM9263 ,
Quoted 9 lines
drivers/net/can/at91_can.c static int at91_can_remove(struct platform_device *pdev) · line 1414
Quoted 5 lines
drivers/net/can/at91_can.c +2
-1+ .driver_data = (unsigned long)&at91_at91sam9x5_data, }, { .name = "at91sam9x5_can", - .driver_data = AT91_DEVTYPE_SAM9X5, + .driver_data = (unsigned long)&at91_at91sam9263_data,It's a
kernel_ulong_t, not a (unsigned long), I can fix this while applying the patch.
Ok I let you fix it while applying so.
Thanks Marc.
Regards
Ludovic
Quoted 21 lines
drivers/net/can/at91_can.c static struct platform_driver at91_can_driver = { · line 1430
Quoted 12 lines
drivers/net/can/at91_can.c +1
-0}, {/* sentinel */ }@@ -1389,6 +1424,7 @@ static struct platform_driver at91_can_driver = { .driver = { .name = KBUILD_MODNAME, .owner = THIS_MODULE, + .of_match_table = at91_can_dt_ids, }, .id_table = at91_can_id_table, };Marc
Signature · 4 lines
Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 152 lines · Marc Kleine-Budde
Quoted 151 lines · On 03/11/2013 06:26 PM, [email protected]…
From: Ludovic Desroches <[email protected]>
Add device tree support.
Signed-off-by Ludovic Desroches <[email protected]>---
Changes in v2:
- code cleanup
- correct typo.../devicetree/bindings/net/can/atmel-can.txt | 14 ++++ drivers/net/can/at91_can.c | 74 ++++++++++++++++------ 2 files changed, 69 insertions(+), 19 deletions(-) create mode 100644 Documentation/devicetree/bindings/net/can/atmel-can.txtDocumentation/devicetree/bindings/net/can/atmel-can.txt new file +14
-0@@ -0,0 +1,14 @@ +* AT91 CAN * + +Required properties: + - compatible: Should be "atmel,at91sam9263-can" or "atmel,at91sam9x5-can" + - reg: Should contain CAN controller registers location and length + - interrupts: Should contain IRQ line for the CAN controller + +Example: + + can0: can@f000c000 { + compatbile = "atmel,at91sam9x5-can"; + reg = <0xf000c000 0x300>; + interrupts = <40 4 5> + };drivers/net/can/at91_can.c +52
-18@@ -27,6 +27,7 @@#include <linux/kernel.h> #include <linux/module.h> #include <linux/netdevice.h> +#include <linux/of.h> #include <linux/platform_device.h> #include <linux/rtnetlink.h> #include <linux/skbuff.h> @@ -155,19 +156,20 @@ struct at91_priv {canid_t mb0_id; }; -static const struct at91_devtype_data at91_devtype_data[] = { - [AT91_DEVTYPE_SAM9263 ] = { - .rx_first =1 , - .rx_split =8 , - .rx_last =11 , - .tx_shift =2 , - }, - [AT91_DEVTYPE_SAM9X5 ] = { - .rx_first =0 , - .rx_split =4 , - .rx_last =5 , - .tx_shift =1 , - }, +static struct at91_devtype_data at91_at91sam9263_data = { + .rx_first =1 , + .rx_split =8 , + .rx_last =11 , + .tx_shift =2 , + .type =AT91_DEVTYPE_SAM9263 , +}; + +static struct at91_devtype_data at91_at91sam9x5_data = { + .rx_first =0 , + .rx_split =4 , + .rx_last =5 , + .tx_shift =1 , + .type =AT91_DEVTYPE_SAM9X5 , };static const struct can_bittiming_const at91_bittiming_const = {@@ -1249,10 +1251,40 @@ static struct attribute_group at91_sysfs_attr_group = { .attrs = at91_sysfs_attrs, }; +#if defined(CONFIG_OF ) +static const struct of_device_id at91_can_dt_ids[] = { + { + .compatible ="atmel,at91sam9x5-can" , + .data = &at91_at91sam9x5_data, + }, { + .compatible ="atmel,at91sam9263-can" , + .data = &at91_at91sam9263_data, + }, { +/* sentinel */ + } +}; +MODULE_DEVICE_TABLE (of, at91_can_dt_ids); +#else +#define at91_can_dt_ids NULL +#endif + +static struct at91_devtype_data *at91_can_get_driver_data (struct platform_device *pdev) +{ +if (pdev->dev.of_node) { +const struct of_device_id *match; + match =of_match_node (at91_can_dt_ids, pdev->dev.of_node); +if (!match) { +dev_err (&pdev->dev,"no matching node found in dtb\n" ); +return NULL ; + } +return (struct at91_devtype_data *)match->data; + } +return (struct at91_devtype_data *)platform_get_device_id (pdev)->driver_data; +} +static int at91_can_probe (struct platform_device *pdev) {const struct at91_devtype_data *devtype_data; -enum at91_devtype devtype;struct net_device *dev;struct at91_priv *priv;struct resource *res;@@ -1260,8 +1292,12 @@ static int at91_can_probe(struct platform_device *pdev)void __iomem *addr;int err, irq; - devtype = pdev->id_entry->driver_data; - devtype_data = &at91_devtype_data[devtype]; + devtype_data =at91_can_get_driver_data (pdev); +if (!devtype_data) { +dev_err (&pdev->dev,"no driver data\n" ); + err = -ENODEV ; + goto exit; + } clk =clk_get (&pdev->dev,"can_clk" );if (IS_ERR (clk)) {@@ -1310,7 +1346,6 @@ static int at91_can_probe(struct platform_device *pdev) priv->dev = dev; priv->reg_base = addr; priv->devtype_data = *devtype_data; - priv->devtype_data.type = devtype; priv->clk = clk; priv->pdata = pdev->dev.platform_data; priv->mb0_id =0x7ff ;@@ -1373,10 +1408,10 @@ static int at91_can_remove(struct platform_device *pdev)static const struct platform_device_id at91_can_id_table[] = { { .name ="at91_can" , - .driver_data =AT91_DEVTYPE_SAM9263 ,
Quoted 9 lines
drivers/net/can/at91_can.c static int at91_can_remove(struct platform_device *pdev) · line 1414
Quoted 5 lines
drivers/net/can/at91_can.c +2
-1+ .driver_data = (unsigned long)&at91_at91sam9x5_data, }, { .name = "at91sam9x5_can", - .driver_data = AT91_DEVTYPE_SAM9X5, + .driver_data = (unsigned long)&at91_at91sam9263_data,It's a
kernel_ulong_t, not a (unsigned long), I can fix this while applying the patch.
Ok I let you fix it while applying so.
Thanks Marc.
Regards
Ludovic
Quoted 21 lines
drivers/net/can/at91_can.c static struct platform_driver at91_can_driver = { · line 1430
Quoted 12 lines
drivers/net/can/at91_can.c +1
-0}, {/* sentinel */ }@@ -1389,6 +1424,7 @@ static struct platform_driver at91_can_driver = { .driver = { .name = KBUILD_MODNAME, .owner = THIS_MODULE, + .of_match_table = at91_can_dt_ids, }, .id_table = at91_can_id_table, };Marc
Signature · 4 lines
Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |