On 11/07/2014 03:49 PM, Roger Quadros wrote: > Some platforms (e.g. TI) need special RAMINIT register handling. > Provide a way to store RAMINIT register description in driver data. > > Signed-off-by: Roger Quadros <[email protected]> > --- > drivers/net/can/c_can/c_can.h | 6 ++++++ > drivers/net/can/c_can/c_can_platform.c | 1 + > 2 files changed, 7 insertions(+) > > diff --git a/drivers/net/can/c_can/c_can.h b/drivers/net/can/c_can/c_can.h > index 26c975d..3c305a1 100644 > --- a/drivers/net/can/c_can/c_can.h > +++ b/drivers/net/can/c_can/c_can.h > @@ -171,6 +171,12 @@ enum c_can_dev_id { > > struct c_can_driver_data { > enum c_can_dev_id id; > + > + /* RAMINIT register description. Optional. */ > + u8 num_can; /* Number of CAN instances on the SoC */ > + u8 *raminit_start_bits; /* Array of START bit positions */ > + u8 *raminit_done_bits; /* Array of DONE bit positions */ > + bool raminit_pulse; /* If set, sets and clears START bit (pulse) */ > }; > > /* c_can private data structure */ > diff --git a/drivers/net/can/c_can/c_can_platform.c > b/drivers/net/can/c_can/c_can_platform.c > index 1546c2b..20deb67 100644 > --- a/drivers/net/can/c_can/c_can_platform.c > +++ b/drivers/net/can/c_can/c_can_platform.c > @@ -250,6 +250,7 @@ static int c_can_plat_probe(struct platform_device *pdev) > } > > priv = netdev_priv(dev); > +
Dropped this hunk while applying. Marc -- 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 |
signature.asc
Description: OpenPGP digital signature
