Message ID | 1415371762-29885-9-git-send-email-rogerq@ti.com |
---|---|
State | New |
Headers | show |
On Fri, Nov 07, 2014 at 04:49:22PM +0200, Roger Quadros wrote: > AM3352 SoC has 2 DCAN modules. Add compatible id and > raminit driver data for am3352 DCAN. > > Signed-off-by: Roger Quadros <rogerq@ti.com> Acked-by: Wolfram Sang <wsa@the-dreams.de>
On 11/13/2014 05:06 PM, Wolfram Sang wrote: > On Fri, Nov 07, 2014 at 04:49:22PM +0200, Roger Quadros wrote: >> AM3352 SoC has 2 DCAN modules. Add compatible id and >> raminit driver data for am3352 DCAN. >> >> Signed-off-by: Roger Quadros <rogerq@ti.com> > > Acked-by: Wolfram Sang <wsa@the-dreams.de> For the whole series or just this patch? Marc
On Fri, Nov 14, 2014 at 10:25:55AM +0100, Marc Kleine-Budde wrote: > On 11/13/2014 05:06 PM, Wolfram Sang wrote: > > On Fri, Nov 07, 2014 at 04:49:22PM +0200, Roger Quadros wrote: > >> AM3352 SoC has 2 DCAN modules. Add compatible id and > >> raminit driver data for am3352 DCAN. > >> > >> Signed-off-by: Roger Quadros <rogerq@ti.com> > > > > Acked-by: Wolfram Sang <wsa@the-dreams.de> > > For the whole series or just this patch? Just this one.
diff --git a/Documentation/devicetree/bindings/net/can/c_can.txt b/Documentation/devicetree/bindings/net/can/c_can.txt index f682fdb..6731730 100644 --- a/Documentation/devicetree/bindings/net/can/c_can.txt +++ b/Documentation/devicetree/bindings/net/can/c_can.txt @@ -4,7 +4,7 @@ Bosch C_CAN/D_CAN controller Device Tree Bindings Required properties: - compatible : Should be "bosch,c_can" for C_CAN controllers and "bosch,d_can" for D_CAN controllers. - Can be "ti,dra7-d_can". + Can be "ti,dra7-d_can" or "ti,am3352-d_can". - reg : physical base address and size of the C_CAN/D_CAN registers map - interrupts : property with a value describing the interrupt diff --git a/drivers/net/can/c_can/c_can_platform.c b/drivers/net/can/c_can/c_can_platform.c index 7a81db4..eb09068 100644 --- a/drivers/net/can/c_can/c_can_platform.c +++ b/drivers/net/can/c_can/c_can_platform.c @@ -205,6 +205,15 @@ static struct c_can_driver_data dra7_dcan_drvdata = { .raminit_pulse = true, }; +static u8 am3352_raminit_start_bits[] = {0, 1}; +static u8 am3352_raminit_done_bits[] = {8, 9}; +static struct c_can_driver_data am3352_dcan_drvdata = { + .id = BOSCH_D_CAN, + .num_can = 2, + .raminit_start_bits = am3352_raminit_start_bits, + .raminit_done_bits = am3352_raminit_done_bits, +}; + static struct platform_device_id c_can_id_table[] = { { .name = KBUILD_MODNAME, @@ -226,6 +235,7 @@ static const struct of_device_id c_can_of_table[] = { { .compatible = "bosch,c_can", .data = &c_can_drvdata }, { .compatible = "bosch,d_can", .data = &d_can_drvdata }, { .compatible = "ti,dra7-d_can", .data = &dra7_dcan_drvdata }, + { .compatible = "ti,am3352-d_can", .data = &am3352_dcan_drvdata }, { /* sentinel */ }, }; MODULE_DEVICE_TABLE(of, c_can_of_table);
AM3352 SoC has 2 DCAN modules. Add compatible id and raminit driver data for am3352 DCAN. Signed-off-by: Roger Quadros <rogerq@ti.com> --- Documentation/devicetree/bindings/net/can/c_can.txt | 2 +- drivers/net/can/c_can/c_can_platform.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-)