| Message ID | 141f068d10b94413a6d0ca73fe07f8e961380e7b.1575369656.git-series.andrew@aj.id.au (mailing list archive) |
|---|---|
| State | New, archived |
| 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 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
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"; + }; }; &wdt1 { diff --git a/arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts b/arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts index 1deb30ec912c..8a9782b7e1af 100644 --- a/arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts +++ b/arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts @@ -118,10 +118,6 @@ status = "okay"; }; -&pinctrl { - aspeed,external-nodes = <&gfx &lhc>; -}; - &pwm_tacho { status = "okay"; pinctrl-names = "default"; diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts b/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts index 42b37a204241..a875e873bd47 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts @@ -263,10 +263,6 @@ status = "okay"; }; -&pinctrl { - aspeed,external-nodes = <&gfx &lhc>; -}; - &gpio { pin_gpio_b0 { gpio-hog; diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts b/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts index edfa44fe1f75..270184cb0577 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts @@ -260,10 +260,6 @@ memory-region = <&gfx_memory>; }; -&pinctrl { - aspeed,external-nodes = <&gfx &lhc>; -}; - &pwm_tacho { status = "okay"; pinctrl-names = "default"; diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-swift.dts b/arch/arm/boot/dts/aspeed-bmc-opp-swift.dts index b8fdd2a8a2c9..0831bc1f5a4c 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-swift.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-swift.dts @@ -940,10 +940,6 @@ memory-region = <&gfx_memory>; }; -&pinctrl { - aspeed,external-nodes = <&gfx &lhc>; -}; - &wdt1 { aspeed,reset-type = "none"; aspeed,external-signal; diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts index 569dad93e162..39ba4d5a787e 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts @@ -623,10 +623,6 @@ memory-region = <&gfx_memory>; }; -&pinctrl { - aspeed,external-nodes = <&gfx &lhc>; -}; - &wdt1 { aspeed,reset-type = "none"; aspeed,external-signal; diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts index bc60ec291681..7795248ba188 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts @@ -466,8 +466,6 @@ }; &pinctrl { - aspeed,external-nodes = <&gfx &lhc>; - pinctrl_gpioh_unbiased: gpioi_unbiased { pins = "A8", "C7", "B7", "A7", "D7", "B6", "A6", "E7"; bias-disable; diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi index d8d358e23d78..5757d3f0e947 100644 --- a/arch/arm/boot/dts/aspeed-g5.dtsi +++ b/arch/arm/boot/dts/aspeed-g5.dtsi @@ -223,8 +223,7 @@ pinctrl: pinctrl { compatible = "aspeed,ast2500-pinctrl"; - aspeed,external-nodes = <&gfx &lhc>; - + aspeed,external-nodes = <&gfx>, <&lhc>; }; p2a: p2a-control {
The existing approach lead to an error from the dtbs_check: pinctrl: aspeed,external-nodes: [[8, 9]] is too short 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(-)