> -----Original Message----- > From: Marc Kleine-Budde <m...@pengutronix.de> > Sent: 2020年9月25日 17:05 > To: Joakim Zhang <qiangqing.zh...@nxp.com>; linux-...@vger.kernel.org > Cc: dl-linux-imx <linux-...@nxp.com>; netdev@vger.kernel.org > Subject: Re: [PATCH linux-can-next/flexcan 2/4] can: flexcan: add flexcan > driver > for i.MX8MP > > On 9/25/20 5:10 PM, Joakim Zhang wrote: > > Add flexcan driver for i.MX8MP, which supports CAN FD and ECC. > > > > Signed-off-by: Joakim Zhang <qiangqing.zh...@nxp.com> > > --- > > drivers/net/can/flexcan.c | 9 +++++++++ > > 1 file changed, 9 insertions(+) > > > > diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c > > index f02f1de2bbca..8c8753f77764 100644 > > --- a/drivers/net/can/flexcan.c > > +++ b/drivers/net/can/flexcan.c > > @@ -214,6 +214,7 @@ > > * MX53 FlexCAN2 03.00.00.00 yes no no > no no no > > * MX6s FlexCAN3 10.00.12.00 yes yes no > no yes no > > * MX8QM FlexCAN3 03.00.23.00 yes yes no > no yes yes > > + * MX8MP FlexCAN3 03.00.17.01 yes yes no > yes yes yes > > This doesn't apply to net-next/master. The MX8QM indented differently.
Need I rebase on net-next/master in next version? This patch set is made from linux-can-next/flexcan branch. Best Regards, Joakim Zhang > Marc > > -- > Pengutronix e.K. | Marc Kleine-Budde | > Embedded Linux | https://www.pengutronix.de | > Vertretung West/Dortmund | Phone: +49-231-2826-924 | > Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
