Hi all, > -----Original Message----- > From: Arnd Bergmann [mailto:a...@kernel.org] > Sent: Tuesday, February 9, 2021 8:36 PM > To: Geert Uytterhoeven <ge...@linux-m68k.org> > Cc: Stephen Rothwell <s...@canb.auug.org.au>; Bartosz Golaszewski > <b...@bgdev.pl>; Olof Johansson <o...@lixom.net>; > Arnd Bergmann <a...@arndb.de>; ARM <linux-arm-ker...@lists.infradead.org>; > Bartosz Golaszewski > <bgolaszew...@baylibre.com>; Linux Kernel Mailing List > <linux-kernel@vger.kernel.org>; Linux Next Mailing List > <linux-n...@vger.kernel.org>; iwamatsu nobuhiro(岩松 信洋 □ＳＷＣ◯ＡＣＴ) > <nobuhiro1.iwama...@toshiba.co.jp> > 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 <ge...@linux-m68k.org> > wrote: > > On Thu, Jan 28, 2021 at 7:05 AM Stephen Rothwell <s...@canb.auug.org.au> > > 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-0vnafs9pik4tjrnrtryezr2rbzd6sfm8zo...@mail.gmail.com/ Bartosz, could you remove commit " arm: dts: visconti: Add DT support for Toshiba Visconti5 GPIO driver" from your tree? Best regards, Nobuhiro
