From: Andrew Jeffery <andrew@aj.id.au> To: linux-aspeed@lists.ozlabs.org Cc: joel@jms.id.au, robh+dt@kernel.org, mark.rutland@arm.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Adriana Kobylak <anoo@us.ibm.com>, Brian Yang <yang.brianc.w@inventec.com>, John Wang <wangzqbj@inspur.com>, Ken Chen <chen.kenyy@inventec.com>, Tao Ren <taoren@fb.com>, Xo Wang <xow@google.com>, Yuan Yao <yao.yuan@linaro.org> Subject: [PATCH 05/14] ARM: dts: aspeed-g5: Fix aspeed,external-nodes description Date: Tue, 3 Dec 2019 22:34:06 +1030 [thread overview] Message-ID: <141f068d10b94413a6d0ca73fe07f8e961380e7b.1575369656.git-series.andrew@aj.id.au> (raw) In-Reply-To: <cover.08e3a6c95159f017b753d0f240086d1a7923758b.1575369656.git-series.andrew@aj.id.au> 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(-) 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 { -- git-series 0.9.1
WARNING: multiple messages have this Message-ID (diff)
From: Andrew Jeffery <andrew@aj.id.au> To: linux-aspeed@lists.ozlabs.org Cc: mark.rutland@arm.com, devicetree@vger.kernel.org, Xo Wang <xow@google.com>, Ken Chen <chen.kenyy@inventec.com>, Tao Ren <taoren@fb.com>, Adriana Kobylak <anoo@us.ibm.com>, linux-kernel@vger.kernel.org, Yuan Yao <yao.yuan@linaro.org>, robh+dt@kernel.org, Brian Yang <yang.brianc.w@inventec.com>, joel@jms.id.au, linux-arm-kernel@lists.infradead.org, John Wang <wangzqbj@inspur.com> Subject: [PATCH 05/14] ARM: dts: aspeed-g5: Fix aspeed, external-nodes description Date: Tue, 3 Dec 2019 22:34:06 +1030 [thread overview] Message-ID: <141f068d10b94413a6d0ca73fe07f8e961380e7b.1575369656.git-series.andrew@aj.id.au> (raw) In-Reply-To: <cover.08e3a6c95159f017b753d0f240086d1a7923758b.1575369656.git-series.andrew@aj.id.au> 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(-) 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 { -- git-series 0.9.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-12-03 12:03 UTC|newest] Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-12-03 12:04 [PATCH 00/14] ARM: dts: aspeed: Cleanup dtc warnings Andrew Jeffery 2019-12-03 12:04 ` Andrew Jeffery 2019-12-03 12:04 ` [PATCH 01/14] dt-bindings: pinctrl: aspeed: Add reg property as a hint Andrew Jeffery 2019-12-03 12:04 ` Andrew Jeffery 2019-12-03 12:04 ` [PATCH 02/14] dt-bindings: misc: Document reg for aspeed,p2a-ctrl nodes Andrew Jeffery 2019-12-03 12:04 ` [PATCH 02/14] dt-bindings: misc: Document reg for aspeed, p2a-ctrl nodes Andrew Jeffery 2019-12-03 12:04 ` [PATCH 03/14] ARM: dts: aspeed-g5: Move EDAC node to APB Andrew Jeffery 2019-12-03 12:04 ` Andrew Jeffery 2019-12-03 12:04 ` [PATCH 04/14] ARM: dts: aspeed-g5: Use recommended generic node name for SDMC Andrew Jeffery 2019-12-03 12:04 ` Andrew Jeffery 2019-12-03 12:04 ` Andrew Jeffery [this message] 2019-12-03 12:04 ` [PATCH 05/14] ARM: dts: aspeed-g5: Fix aspeed, external-nodes description Andrew Jeffery 2019-12-03 14:43 ` [PATCH 05/14] ARM: dts: aspeed-g5: Fix aspeed,external-nodes description Rob Herring 2019-12-03 14:43 ` [PATCH 05/14] ARM: dts: aspeed-g5: Fix aspeed, external-nodes description Rob Herring 2019-12-05 5:06 ` [PATCH 05/14] ARM: dts: aspeed-g5: Fix aspeed,external-nodes description Andrew Jeffery 2019-12-05 5:06 ` [PATCH 05/14] ARM: dts: aspeed-g5: Fix aspeed, external-nodes description Andrew Jeffery 2019-12-03 12:04 ` [PATCH 06/14] ARM: dts: vesnin: Add unit address for memory node Andrew Jeffery 2019-12-03 12:04 ` Andrew Jeffery 2019-12-03 12:04 ` [PATCH 07/14] ARM: dts: fp5280g2: Cleanup gpio-keys-polled properties Andrew Jeffery 2019-12-03 12:04 ` Andrew Jeffery 2019-12-03 12:04 ` [PATCH 08/14] ARM: dts: swift: " Andrew Jeffery 2019-12-03 12:04 ` Andrew Jeffery 2019-12-04 22:29 ` Adriana Kobylak 2019-12-04 22:29 ` Adriana Kobylak 2019-12-03 12:04 ` [PATCH 09/14] ARM: dts: witherspoon: " Andrew Jeffery 2019-12-03 12:04 ` Andrew Jeffery 2019-12-03 12:04 ` [PATCH 10/14] ARM: dts: aspeed: Cleanup lpc-ctrl and snoop regs Andrew Jeffery 2019-12-03 12:04 ` Andrew Jeffery 2019-12-03 12:04 ` [PATCH 11/14] ARM: dts: aspeed: Add reg hints to syscon children Andrew Jeffery 2019-12-03 12:04 ` Andrew Jeffery 2019-12-03 12:04 ` [PATCH 12/14] ARM: dts: aspeed-g5: Sort LPC child nodes by unit address Andrew Jeffery 2019-12-03 12:04 ` Andrew Jeffery 2019-12-03 12:04 ` [PATCH 13/14] ARM: dts: aspeed-g6: Cleanup watchdog " Andrew Jeffery 2019-12-03 12:04 ` Andrew Jeffery 2019-12-03 12:04 ` [PATCH 14/14] ARM: dts: ibm-power9-dual: Add a unit address for OCC nodes Andrew Jeffery 2019-12-03 12:04 ` Andrew Jeffery 2019-12-03 14:47 ` [PATCH 00/14] ARM: dts: aspeed: Cleanup dtc warnings Rob Herring 2019-12-03 14:47 ` Rob Herring
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=141f068d10b94413a6d0ca73fe07f8e961380e7b.1575369656.git-series.andrew@aj.id.au \ --to=andrew@aj.id.au \ --cc=anoo@us.ibm.com \ --cc=chen.kenyy@inventec.com \ --cc=devicetree@vger.kernel.org \ --cc=joel@jms.id.au \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-aspeed@lists.ozlabs.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mark.rutland@arm.com \ --cc=robh+dt@kernel.org \ --cc=taoren@fb.com \ --cc=wangzqbj@inspur.com \ --cc=xow@google.com \ --cc=yang.brianc.w@inventec.com \ --cc=yao.yuan@linaro.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.