Re: linux-next: manual merge of the imx-mxs tree with the net tree

[Marc Kleine-Budde]

On 12.10.2023 08:43:56, Shawn Guo wrote:
> On Thu, Oct 12, 2023 at 10:14:34AM +1100, Stephen Rothwell wrote:
> > Hi all,
> > 
> > Today's linux-next merge of the imx-mxs tree got a conflict in:
> > 
> >   arch/arm64/boot/dts/freescale/imx93.dtsi
> > 
> > between commit:
> > 
> >   23ed2be5404d ("arm64: dts: imx93: add the Flex-CAN stop mode by GPR")
> 
> Marc,
> 
> Is there any particular reason why this dts change needs to go via net
> tree?  Otherwise, could you drop it from net and let it go via i.MX tree?

As far as I understand the problem, the imx93 A0 silicon was supposed to
have a functional auto-stop mode for the flexcan peripheral. But wakeup
stress tests show that it doesn't work reliable. So this and the
following patch switched the imx93 back to the "old" stop-mode via GPR,
which needs a DT update.

| 23ed2be5404d ("arm64: dts: imx93: add the Flex-CAN stop mode by GPR")
| 63ead535570f ("can: flexcan: remove the auto stop mode for IMX93")

See the description of 63ead535570f for more details.

Marc

-- 
Pengutronix e.K.                 | Marc Kleine-Budde          |
Embedded Linux                   | https://www.pengutronix.de |
Vertretung Nürnberg              | Phone: +49-5121-206917-129 |
Amtsgericht Hildesheim, HRA 2686 | Fax:   +49-5121-206917-9   |

Attachment: signature.asc
Description: PGP signature