| Message ID | cover.08e3a6c95159f017b753d0f240086d1a7923758b.1575369656.git-series.andrew@aj.id.au |
|---|---|
| Headers | show |
| Series | ARM: dts: aspeed: Cleanup dtc warnings | expand |
On Tue, Dec 3, 2019 at 6:03 AM Andrew Jeffery <andrew@aj.id.au> wrote: > > The existing approach lead to an error from the dtbs_check: > > pinctrl: aspeed,external-nodes: [[8, 9]] is too short This one where we have list of phandles is fixed in dtc. I need to update the kernel's copy. > Cc: Adriana Kobylak <anoo@us.ibm.com> > Cc: Brian Yang <yang.brianc.w@inventec.com> > Cc: Joel Stanley <joel@jms.id.au> > Cc: John Wang <wangzqbj@inspur.com> > Cc: Ken Chen <chen.kenyy@inventec.com> > Cc: Tao Ren <taoren@fb.com> > Cc: Xo Wang <xow@google.com> > Cc: Yuan Yao <yao.yuan@linaro.org> > Signed-off-by: Andrew Jeffery <andrew@aj.id.au> > Reviewed-by: Joel Stanley <joel@jms.id.au> > --- > arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts | 4 +---- > arch/arm/boot/dts/aspeed-bmc-arm-stardragon4800-rep2.dts | 4 +---- > arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts | 9 +++++++-- > arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts | 4 +---- > arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts | 4 +---- > arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 4 +---- > arch/arm/boot/dts/aspeed-bmc-opp-swift.dts | 4 +---- > arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 4 +---- > arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 2 +-- > arch/arm/boot/dts/aspeed-g5.dtsi | 3 +-- > 10 files changed, 8 insertions(+), 34 deletions(-) > > diff --git a/arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts b/arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts > index c2ece0b91885..de9612e49c69 100644 > --- a/arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts > +++ b/arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts > @@ -211,10 +211,6 @@ > status = "okay"; > }; > > -&pinctrl { > - aspeed,external-nodes = <&gfx &lhc>; > -}; > - > &gpio { > pin_gpio_c7 { > gpio-hog; > diff --git a/arch/arm/boot/dts/aspeed-bmc-arm-stardragon4800-rep2.dts b/arch/arm/boot/dts/aspeed-bmc-arm-stardragon4800-rep2.dts > index 2c29ac037d32..022d0744d786 100644 > --- a/arch/arm/boot/dts/aspeed-bmc-arm-stardragon4800-rep2.dts > +++ b/arch/arm/boot/dts/aspeed-bmc-arm-stardragon4800-rep2.dts > @@ -200,10 +200,6 @@ > status = "okay"; > }; > > -&pinctrl { > - aspeed,external-nodes = <&gfx &lhc>; > -}; > - > &gpio { > pin_gpio_c7 { > gpio-hog; > diff --git a/arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts b/arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts > index c17bb7fce7ff..d69da58476fe 100644 > --- a/arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts > +++ b/arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts > @@ -782,8 +782,13 @@ > memory-region = <&gfx_memory>; > }; > > -&pinctrl { > - aspeed,external-nodes = <&gfx &lhc>; > +&gpio { > + pin_gpio_b7 { > + gpio-hog; > + gpios = <ASPEED_GPIO(B,7) GPIO_ACTIVE_LOW>; > + output-high; > + line-name = "BMC_INIT_OK"; > + }; Seems like an unrelated change? Rob
On Tue, Dec 3, 2019 at 6:02 AM Andrew Jeffery <andrew@aj.id.au> wrote: > > Hello, > > This series is based on an RFC-ish series I sent quite some time ago to which I > have only just been able to circle back. The previous discussion can be found > here: > > https://lore.kernel.org/lkml/20190726053959.2003-1-andrew@aj.id.au/ > > I've split, shuffled and rebased the series a little, with at least one extra > cleanup for the g6 dtsi. This series is just the devicetree changes, the IPMI > KCS changes will be posted separately shortly. > > Combined with the KCS changes we achieve similar stats to the RFC series, > reducing 264 warnings to 6. > > I've added each patches' tags from last time, but please glance over them > again. > > Cheers, > > Andrew > > Andrew Jeffery (14): > dt-bindings: pinctrl: aspeed: Add reg property as a hint > dt-bindings: misc: Document reg for aspeed,p2a-ctrl nodes > ARM: dts: aspeed-g5: Move EDAC node to APB > ARM: dts: aspeed-g5: Use recommended generic node name for SDMC > ARM: dts: aspeed-g5: Fix aspeed,external-nodes description > ARM: dts: vesnin: Add unit address for memory node > ARM: dts: fp5280g2: Cleanup gpio-keys-polled properties > ARM: dts: swift: Cleanup gpio-keys-polled properties > ARM: dts: witherspoon: Cleanup gpio-keys-polled properties > ARM: dts: aspeed: Cleanup lpc-ctrl and snoop regs > ARM: dts: aspeed: Add reg hints to syscon children > ARM: dts: aspeed-g5: Sort LPC child nodes by unit address > ARM: dts: aspeed-g6: Cleanup watchdog unit address > ARM: dts: ibm-power9-dual: Add a unit address for OCC nodes > > Documentation/devicetree/bindings/misc/aspeed-p2a-ctrl.txt | 1 + > Documentation/devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml | 3 +++ > Documentation/devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml | 3 +++ > arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts | 4 ---- > arch/arm/boot/dts/aspeed-bmc-arm-stardragon4800-rep2.dts | 4 ---- > arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts | 11 +++++++---- > arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts | 4 ---- > arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts | 4 ---- > arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 4 ---- > arch/arm/boot/dts/aspeed-bmc-opp-swift.dts | 6 ------ > arch/arm/boot/dts/aspeed-bmc-opp-vesnin.dts | 2 +- > arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 6 ------ > arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 2 -- > arch/arm/boot/dts/aspeed-g4.dtsi | 21 ++++++++++++--------- > arch/arm/boot/dts/aspeed-g5.dtsi | 49 ++++++++++++++++++++++++++----------------------- > arch/arm/boot/dts/aspeed-g6.dtsi | 2 +- > arch/arm/boot/dts/ibm-power9-dual.dtsi | 4 ++-- > 17 files changed, 56 insertions(+), 74 deletions(-) Other than patch 5, for the series: Reviewed-by: Rob Herring <robh@kernel.org>
On 2019-12-03 06:04, Andrew Jeffery wrote: > dtbs_check gave the following warning: > > Warning (avoid_unnecessary_addr_size): /gpio-keys-polled: > unnecessary #address-cells/#size-cells without "ranges" or child "reg" > property > > Cc: Adriana Kobylak <anoo@us.ibm.com> > Signed-off-by: Andrew Jeffery <andrew@aj.id.au> > Reviewed-by: Joel Stanley <joel@jms.id.au> Reviewed-by: Adriana Kobylak <anoo@us.ibm.com> Tested-by: Adriana Kobylak <anoo@us.ibm.com> > --- > arch/arm/boot/dts/aspeed-bmc-opp-swift.dts | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-swift.dts > b/arch/arm/boot/dts/aspeed-bmc-opp-swift.dts > index 0831bc1f5a4c..555d79405884 100644 > --- a/arch/arm/boot/dts/aspeed-bmc-opp-swift.dts > +++ b/arch/arm/boot/dts/aspeed-bmc-opp-swift.dts > @@ -82,8 +82,6 @@ > > gpio-keys-polled { > compatible = "gpio-keys-polled"; > - #address-cells = <1>; > - #size-cells = <0>; > poll-interval = <1000>; > > scm0-presence {
On Wed, 4 Dec 2019, at 01:13, Rob Herring wrote: > On Tue, Dec 3, 2019 at 6:03 AM Andrew Jeffery <andrew@aj.id.au> wrote: > > > > The existing approach lead to an error from the dtbs_check: > > > > pinctrl: aspeed,external-nodes: [[8, 9]] is too short > > This one where we have list of phandles is fixed in dtc. I need to > update the kernel's copy. Ah, cool. > > > Cc: Adriana Kobylak <anoo@us.ibm.com> > > Cc: Brian Yang <yang.brianc.w@inventec.com> > > Cc: Joel Stanley <joel@jms.id.au> > > Cc: John Wang <wangzqbj@inspur.com> > > Cc: Ken Chen <chen.kenyy@inventec.com> > > Cc: Tao Ren <taoren@fb.com> > > Cc: Xo Wang <xow@google.com> > > Cc: Yuan Yao <yao.yuan@linaro.org> > > Signed-off-by: Andrew Jeffery <andrew@aj.id.au> > > Reviewed-by: Joel Stanley <joel@jms.id.au> > > --- > > arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts | 4 +---- > > arch/arm/boot/dts/aspeed-bmc-arm-stardragon4800-rep2.dts | 4 +---- > > arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts | 9 +++++++-- > > arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts | 4 +---- > > arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts | 4 +---- > > arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 4 +---- > > arch/arm/boot/dts/aspeed-bmc-opp-swift.dts | 4 +---- > > arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 4 +---- > > arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 2 +-- > > arch/arm/boot/dts/aspeed-g5.dtsi | 3 +-- > > 10 files changed, 8 insertions(+), 34 deletions(-) > > > > diff --git a/arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts b/arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts > > index c2ece0b91885..de9612e49c69 100644 > > --- a/arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts > > +++ b/arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts > > @@ -211,10 +211,6 @@ > > status = "okay"; > > }; > > > > -&pinctrl { > > - aspeed,external-nodes = <&gfx &lhc>; > > -}; > > - > > &gpio { > > pin_gpio_c7 { > > gpio-hog; > > diff --git a/arch/arm/boot/dts/aspeed-bmc-arm-stardragon4800-rep2.dts b/arch/arm/boot/dts/aspeed-bmc-arm-stardragon4800-rep2.dts > > index 2c29ac037d32..022d0744d786 100644 > > --- a/arch/arm/boot/dts/aspeed-bmc-arm-stardragon4800-rep2.dts > > +++ b/arch/arm/boot/dts/aspeed-bmc-arm-stardragon4800-rep2.dts > > @@ -200,10 +200,6 @@ > > status = "okay"; > > }; > > > > -&pinctrl { > > - aspeed,external-nodes = <&gfx &lhc>; > > -}; > > - > > &gpio { > > pin_gpio_c7 { > > gpio-hog; > > diff --git a/arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts b/arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts > > index c17bb7fce7ff..d69da58476fe 100644 > > --- a/arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts > > +++ b/arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts > > @@ -782,8 +782,13 @@ > > memory-region = <&gfx_memory>; > > }; > > > > -&pinctrl { > > - aspeed,external-nodes = <&gfx &lhc>; > > +&gpio { > > + pin_gpio_b7 { > > + gpio-hog; > > + gpios = <ASPEED_GPIO(B,7) GPIO_ACTIVE_LOW>; > > + output-high; > > + line-name = "BMC_INIT_OK"; > > + }; > > Seems like an unrelated change? Yeah, that seems to be a bad rebase conflict resolution. Thanks, Andrew