[PATCH] ARM: dts: imx25/karo-tx25: Replace NO_PAD_CTL by explicit pad configuration

[Shawn Guo]

On Mon, Jul 17, 2023 at 09:03:50AM +0200, Uwe Kleine-König wrote:
> Hello Shawn,
> 
> On Mon, Jul 17, 2023 at 09:06:52AM +0800, Shawn Guo wrote:
> > On Thu, Jun 15, 2023 at 11:41:00AM +0200, Uwe Kleine-König wrote:
> > > Instead of using 0x80000000 explicitly specify the reset defaults for
> > > the pad settings. This way the pad configuration is explicit and so
> > > isn't affected by changes that might have been done in the bootloader.
> > > 
> > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig at pengutronix.de>
> > > ---
> > >  arch/arm/boot/dts/imx25-karo-tx25.dts | 50 +++++++++++++--------------
> > >  1 file changed, 25 insertions(+), 25 deletions(-)
> > 
> > It doesn't apply any more.  Could you rebase and resend?
> 
> when using git am -3 to apply, it works fine for me on top of
> next-20230717 and v6.5-rc2.

Ah, I completely forgot about 3-way merge parameter :)

Applied, thanks!

Shawn