> From: Shawn Guo <shawnguo@xxxxxxxxxx>
> Sent: Monday, March 16, 2020 2:45 PM
>
> On Mon, Mar 16, 2020 at 06:31:21AM +0000, Anson Huang wrote:
> > Hi, Shawn
> >
> > > Subject: Re: [PATCH V2 1/2] arm64: dts: imx8qxp-mek: Sort labels
> > > alphabetically
> > >
> > > On Mon, Mar 16, 2020 at 09:26:32AM +0800, Anson Huang wrote:
> > > > Sort the labels alphabetically for consistency.
> > > >
> > > > Signed-off-by: Anson Huang <Anson.Huang@xxxxxxx>
> > > > ---
> > > > Changes since V1:
> > > > - Rebase to latest branch, no code change.
> > > > ---
> > > > arch/arm64/boot/dts/freescale/imx8qxp-mek.dts | 50
> > > > ++++++++++++++++-----------
> > > > 1 file changed, 30 insertions(+), 20 deletions(-)
> > > >
> > > > diff --git a/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts
> > > > b/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts
> > > > index d3d26cc..b1befdb 100644
> > > > --- a/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts
> > > > +++ b/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts
> > > > @@ -30,18 +30,7 @@
> > > > };
> > > > };
> > > >
> > > > -&adma_lpuart0 {
> > > > - pinctrl-names = "default";
> > > > - pinctrl-0 = <&pinctrl_lpuart0>;
> > > > - status = "okay";
> > > > -};
> > > > -
> > > > -&fec1 {
> > > > - pinctrl-names = "default";
> > > > - pinctrl-0 = <&pinctrl_fec1>;
> > > > - phy-mode = "rgmii-id";
> > > > - phy-handle = <ðphy0>;
> > > > - fsl,magic-packet;
> > > > +&adma_dsp {
> > > > status = "okay";
> > > >
> > > > mdio {
> > >
> > > Here is a rebase issue, i.e. adma_dsp shouldn't get a mdio child node.
> > > It came from the conflict with one commit on my fixes branch. I
> > > decided to drop the series for the coming merge window. Let's start
> > > over again after
> > > 5.7-rc1 becomes available.
> >
> > OK, I am also confused by this conflict, I normally do the patch based
> > on your for-next branch, and I did NOT meet the conflict at all, then
> > I redo it based on your dt branch I met the conflict and fix it...
> >
> > So, do I need to resend the patch series later when 5.7-rc1 available?
>
> You need to resend later.
Hi Shawn,
Could we hold on this patch as subsys prefix (e.g adma_) will be removed later and
devices will be embedded into each subsys dtsi?
So this re-order may become meaningless which also potentially cause a lot troubles
on the rebase of the dts re-org patch:
[RESEND,v3,00/15] arm64: dts: imx8: architecture improvement and adding imx8qm support
https://patchwork.kernel.org/cover/11248271/
Regards
Aisheng
>
> Shawn
