Hi all, > -----Original Message----- > From: Arnd Bergmann [mailto:arnd@xxxxxxxxxx] > Sent: Tuesday, February 9, 2021 8:36 PM > To: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx> > Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>; Bartosz Golaszewski <brgl@xxxxxxxx>; Olof Johansson <olof@xxxxxxxxx>; > Arnd Bergmann <arnd@xxxxxxxx>; ARM <linux-arm-kernel@xxxxxxxxxxxxxxxxxxx>; Bartosz Golaszewski > <bgolaszewski@xxxxxxxxxxxx>; Linux Kernel Mailing List <linux-kernel@xxxxxxxxxxxxxxx>; Linux Next Mailing List > <linux-next@xxxxxxxxxxxxxxx>; iwamatsu nobuhiro(岩松 信洋 □ＳＷＣ◯ＡＣＴ) <nobuhiro1.iwamatsu@xxxxxxxxxxxxx> > Subject: Re: linux-next: manual merge of the gpio-brgl tree with the arm-soc tree > > On Tue, Feb 9, 2021 at 11:01 AM Geert Uytterhoeven <geert@xxxxxxxxxxxxxx> wrote: > > On Thu, Jan 28, 2021 at 7:05 AM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: > > > > diff --cc arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts > > > index 37da418393e0,950010a290f0..000000000000 > > > --- a/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts > > > +++ b/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts > > > @@@ -42,7 -42,6 +42,11 @@@ > > > clock-names = "apb_pclk"; > > > }; > > > > > > +&wdt { > > > + status = "okay"; > > > + clocks = <&wdt_clk>; > > > +}; > > > ++ > > > + &gpio { > > > + status = "okay"; > > > + }; > > > > Probably some sort order should be taken into account (gpio before uart0), > > also avoidng the conflict? > > > > We normally do this by asking everyone to send the dts changes for > inclusion through the soc tree rather than the subsystem that contains > the driver. Why is this one in the gpio-brgl tree? Perhaps this is Bartosz's mistake. Linus has commented that gpio ml is captured via the soc tree. https://lore.kernel.org/linux-gpio/CACRpkdb--GSy-0vnAFS9Pik4TjrNRTrYeZr2RBZD6SFM8zotyQ@xxxxxxxxxxxxxx/ Bartosz, could you remove commit " arm: dts: visconti: Add DT support for Toshiba Visconti5 GPIO driver" from your tree? Best regards, Nobuhiro
