[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <OSBPR01MB2983BB81E025AABF7D633C18928D9@OSBPR01MB2983.jpnprd01.prod.outlook.com>
Date: Wed, 10 Feb 2021 05:33:59 +0000
From: <nobuhiro1.iwamatsu@...hiba.co.jp>
To: <arnd@...nel.org>, <geert@...ux-m68k.org>
CC: <sfr@...b.auug.org.au>, <brgl@...ev.pl>, <olof@...om.net>,
<arnd@...db.de>, <linux-arm-kernel@...ts.infradead.org>,
<bgolaszewski@...libre.com>, <linux-kernel@...r.kernel.org>,
<linux-next@...r.kernel.org>
Subject: RE: linux-next: manual merge of the gpio-brgl tree with the arm-soc
tree
Hi all,
> -----Original Message-----
> From: Arnd Bergmann [mailto:arnd@...nel.org]
> Sent: Tuesday, February 9, 2021 8:36 PM
> To: Geert Uytterhoeven <geert@...ux-m68k.org>
> Cc: Stephen Rothwell <sfr@...b.auug.org.au>; Bartosz Golaszewski <brgl@...ev.pl>; Olof Johansson <olof@...om.net>;
> Arnd Bergmann <arnd@...db.de>; ARM <linux-arm-kernel@...ts.infradead.org>; Bartosz Golaszewski
> <bgolaszewski@...libre.com>; Linux Kernel Mailing List <linux-kernel@...r.kernel.org>; Linux Next Mailing List
> <linux-next@...r.kernel.org>; iwamatsu nobuhiro(岩松 信洋 □SWC◯ACT) <nobuhiro1.iwamatsu@...hiba.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 <geert@...ux-m68k.org> wrote:
> > On Thu, Jan 28, 2021 at 7:05 AM Stephen Rothwell <sfr@...b.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-0vnAFS9Pik4TjrNRTrYeZr2RBZD6SFM8zotyQ@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
Powered by blists - more mailing lists