| Message ID | 20211118014445.1621187-1-wak@google.com |
|---|---|
| State | New |
| Headers | show |
| Series | ARM: dts: nuvoton: Fix GPIO pin names | expand |
Hi William, On Thu, 18 Nov 2021 at 01:45, William A. Kennington III <wak@google.com> wrote: > > The pinctrl driver for the NPCM7xx updated some of the pinctrl names to > include HGPIO definitions, but the dts file remained unchanged. This > breaks pinctrl parsing if the strings don't match. > > Signed-off-by: William A. Kennington III <wak@google.com> I'm wondering where you want this patch to be applied (and who would do so!). Is the relevant pinctrl driver change merged to mainline? If so, send it to the upstream lists (linux-arm-kernel) and cc some nuvoton reviewers. If you just want it in the openbmc tree, we can do that. Normally this means putting the branch name in the subject. You should get some review from someone who works on the nuvoton boards regardless. Cheers, Joel > --- > arch/arm/boot/dts/nuvoton-npcm750-gpio.dtsi | 42 ++++++++++----------- > 1 file changed, 21 insertions(+), 21 deletions(-) > > diff --git a/arch/arm/boot/dts/nuvoton-npcm750-gpio.dtsi b/arch/arm/boot/dts/nuvoton-npcm750-gpio.dtsi > index 444ea403547b..7c7942cdfd08 100644 > --- a/arch/arm/boot/dts/nuvoton-npcm750-gpio.dtsi > +++ b/arch/arm/boot/dts/nuvoton-npcm750-gpio.dtsi > @@ -219,77 +219,77 @@ gpio19ol_pins: gpio19ol-pins { > output-low; > }; > gpio20_pins: gpio20-pins { > - pins = "GPIO20/SMB4CSDA/SMB15SDA"; > + pins = "GPIO20/HGPIO0/SMB4CSDA/SMB15SDA"; > bias-disable; > input-enable; > }; > gpio20o_pins: gpio20o-pins { > - pins = "GPIO20/SMB4CSDA/SMB15SDA"; > + pins = "GPIO20/HGPIO0/SMB4CSDA/SMB15SDA"; > bias-disable; > output-high; > }; > gpio20ol_pins: gpio20ol-pins { > - pins = "GPIO20/SMB4CSDA/SMB15SDA"; > + pins = "GPIO20/HGPIO0/SMB4CSDA/SMB15SDA"; > bias-disable; > output-low; > }; > gpio21_pins: gpio21-pins { > - pins = "GPIO21/SMB4CSCL/SMB15SCL"; > + pins = "GPIO21/HGPIO1/SMB4CSCL/SMB15SCL"; > bias-disable; > input-enable; > }; > gpio21ol_pins: gpio21ol-pins { > - pins = "GPIO21/SMB4CSCL/SMB15SCL"; > + pins = "GPIO21/HGPIO1/SMB4CSCL/SMB15SCL"; > bias-disable; > output-low; > }; > gpio22_pins: gpio22-pins { > - pins = "GPIO22/SMB4DSDA/SMB14SDA"; > + pins = "GPIO22/HGPIO2/SMB4DSDA/SMB14SDA"; > bias-disable; > input-enable; > }; > gpio22ol_pins: gpio22ol-pins { > - pins = "GPIO22/SMB4DSDA/SMB14SDA"; > + pins = "GPIO22/HGPIO2/SMB4DSDA/SMB14SDA"; > bias-disable; > output-low; > }; > gpio23_pins: gpio23-pins { > - pins = "GPIO23/SMB4DSCL/SMB14SCL"; > + pins = "GPIO23/HGPIO3/SMB4DSCL/SMB14SCL"; > bias-disable; > input-enable; > }; > gpio23ol_pins: gpio23ol-pins { > - pins = "GPIO23/SMB4DSCL/SMB14SCL"; > + pins = "GPIO23/HGPIO3/SMB4DSCL/SMB14SCL"; > bias-disable; > output-low; > }; > gpio24_pins: gpio24-pins { > - pins = "GPIO24/IOXHDO"; > + pins = "GPIO24/HGPIO4/IOXHDO"; > bias-disable; > input-enable; > }; > gpio24o_pins: gpio24o-pins { > - pins = "GPIO24/IOXHDO"; > + pins = "GPIO24/HGPIO4/IOXHDO"; > bias-disable; > output-high; > }; > gpio24ol_pins: gpio24ol-pins { > - pins = "GPIO24/IOXHDO"; > + pins = "GPIO24/HGPIO4/IOXHDO"; > bias-disable; > output-low; > }; > gpio25_pins: gpio25-pins { > - pins = "GPIO25/IOXHDI"; > + pins = "GPIO25/HGPIO5/IOXHDI"; > bias-disable; > input-enable; > }; > gpio25o_pins: gpio25o-pins { > - pins = "GPIO25/IOXHDI"; > + pins = "GPIO25/HGPIO5/IOXHDI"; > bias-disable; > output-high; > }; > gpio25ol_pins: gpio25ol-pins { > - pins = "GPIO25/IOXHDI"; > + pins = "GPIO25/HGPIO5/IOXHDI"; > bias-disable; > output-low; > }; > @@ -523,32 +523,32 @@ gpio58ol_pins: gpio58ol-pins { > output-low; > }; > gpio59_pins: gpio59-pins { > - pins = "GPIO59/SMB3DSDA"; > + pins = "GPIO59/HGPIO6/SMB3DSDA"; > bias-disable; > input-enable; > }; > gpio59o_pins: gpio59o-pins { > - pins = "GPIO59/SMB3DSDA"; > + pins = "GPIO59/HGPIO6/SMB3DSDA"; > bias-disable; > output-high; > }; > gpio59ol_pins: gpio59ol-pins { > - pins = "GPIO59/SMB3DSDA"; > + pins = "GPIO59/HGPIO6/SMB3DSDA"; > bias-disable; > output-low; > }; > gpio60_pins: gpio60-pins { > - pins = "GPIO60/SMB3DSCL"; > + pins = "GPIO60/HGPIO7/SMB3DSCL"; > bias-disable; > input-enable; > }; > gpio60o_pins: gpio60o-pins { > - pins = "GPIO60/SMB3DSCL"; > + pins = "GPIO60/HGPIO7/SMB3DSCL"; > bias-disable; > output-high; > }; > gpio60ol_pins: gpio60ol-pins { > - pins = "GPIO60/SMB3DSCL"; > + pins = "GPIO60/HGPIO7/SMB3DSCL"; > bias-disable; > output-low; > }; > -- > 2.34.0.rc1.387.gb447b232ab-goog >
The changes only exist in 9a543726887d805d80f63b5165ef3d1a07d6c6eb, which is an openbmc specific tree change. Mainline doesn't have the breakage yet. On Tue, Nov 23, 2021 at 12:53 AM Joel Stanley <joel@jms.id.au> wrote: > > Hi William, > > On Thu, 18 Nov 2021 at 01:45, William A. Kennington III <wak@google.com> wrote: > > > > The pinctrl driver for the NPCM7xx updated some of the pinctrl names to > > include HGPIO definitions, but the dts file remained unchanged. This > > breaks pinctrl parsing if the strings don't match. > > > > Signed-off-by: William A. Kennington III <wak@google.com> > > I'm wondering where you want this patch to be applied (and who would do so!). > > Is the relevant pinctrl driver change merged to mainline? If so, send > it to the upstream lists (linux-arm-kernel) and cc some nuvoton > reviewers. > > If you just want it in the openbmc tree, we can do that. Normally this > means putting the branch name in the subject. > > You should get some review from someone who works on the nuvoton > boards regardless. > > Cheers, > > Joel > > > --- > > arch/arm/boot/dts/nuvoton-npcm750-gpio.dtsi | 42 ++++++++++----------- > > 1 file changed, 21 insertions(+), 21 deletions(-) > > > > diff --git a/arch/arm/boot/dts/nuvoton-npcm750-gpio.dtsi b/arch/arm/boot/dts/nuvoton-npcm750-gpio.dtsi > > index 444ea403547b..7c7942cdfd08 100644 > > --- a/arch/arm/boot/dts/nuvoton-npcm750-gpio.dtsi > > +++ b/arch/arm/boot/dts/nuvoton-npcm750-gpio.dtsi > > @@ -219,77 +219,77 @@ gpio19ol_pins: gpio19ol-pins { > > output-low; > > }; > > gpio20_pins: gpio20-pins { > > - pins = "GPIO20/SMB4CSDA/SMB15SDA"; > > + pins = "GPIO20/HGPIO0/SMB4CSDA/SMB15SDA"; > > bias-disable; > > input-enable; > > }; > > gpio20o_pins: gpio20o-pins { > > - pins = "GPIO20/SMB4CSDA/SMB15SDA"; > > + pins = "GPIO20/HGPIO0/SMB4CSDA/SMB15SDA"; > > bias-disable; > > output-high; > > }; > > gpio20ol_pins: gpio20ol-pins { > > - pins = "GPIO20/SMB4CSDA/SMB15SDA"; > > + pins = "GPIO20/HGPIO0/SMB4CSDA/SMB15SDA"; > > bias-disable; > > output-low; > > }; > > gpio21_pins: gpio21-pins { > > - pins = "GPIO21/SMB4CSCL/SMB15SCL"; > > + pins = "GPIO21/HGPIO1/SMB4CSCL/SMB15SCL"; > > bias-disable; > > input-enable; > > }; > > gpio21ol_pins: gpio21ol-pins { > > - pins = "GPIO21/SMB4CSCL/SMB15SCL"; > > + pins = "GPIO21/HGPIO1/SMB4CSCL/SMB15SCL"; > > bias-disable; > > output-low; > > }; > > gpio22_pins: gpio22-pins { > > - pins = "GPIO22/SMB4DSDA/SMB14SDA"; > > + pins = "GPIO22/HGPIO2/SMB4DSDA/SMB14SDA"; > > bias-disable; > > input-enable; > > }; > > gpio22ol_pins: gpio22ol-pins { > > - pins = "GPIO22/SMB4DSDA/SMB14SDA"; > > + pins = "GPIO22/HGPIO2/SMB4DSDA/SMB14SDA"; > > bias-disable; > > output-low; > > }; > > gpio23_pins: gpio23-pins { > > - pins = "GPIO23/SMB4DSCL/SMB14SCL"; > > + pins = "GPIO23/HGPIO3/SMB4DSCL/SMB14SCL"; > > bias-disable; > > input-enable; > > }; > > gpio23ol_pins: gpio23ol-pins { > > - pins = "GPIO23/SMB4DSCL/SMB14SCL"; > > + pins = "GPIO23/HGPIO3/SMB4DSCL/SMB14SCL"; > > bias-disable; > > output-low; > > }; > > gpio24_pins: gpio24-pins { > > - pins = "GPIO24/IOXHDO"; > > + pins = "GPIO24/HGPIO4/IOXHDO"; > > bias-disable; > > input-enable; > > }; > > gpio24o_pins: gpio24o-pins { > > - pins = "GPIO24/IOXHDO"; > > + pins = "GPIO24/HGPIO4/IOXHDO"; > > bias-disable; > > output-high; > > }; > > gpio24ol_pins: gpio24ol-pins { > > - pins = "GPIO24/IOXHDO"; > > + pins = "GPIO24/HGPIO4/IOXHDO"; > > bias-disable; > > output-low; > > }; > > gpio25_pins: gpio25-pins { > > - pins = "GPIO25/IOXHDI"; > > + pins = "GPIO25/HGPIO5/IOXHDI"; > > bias-disable; > > input-enable; > > }; > > gpio25o_pins: gpio25o-pins { > > - pins = "GPIO25/IOXHDI"; > > + pins = "GPIO25/HGPIO5/IOXHDI"; > > bias-disable; > > output-high; > > }; > > gpio25ol_pins: gpio25ol-pins { > > - pins = "GPIO25/IOXHDI"; > > + pins = "GPIO25/HGPIO5/IOXHDI"; > > bias-disable; > > output-low; > > }; > > @@ -523,32 +523,32 @@ gpio58ol_pins: gpio58ol-pins { > > output-low; > > }; > > gpio59_pins: gpio59-pins { > > - pins = "GPIO59/SMB3DSDA"; > > + pins = "GPIO59/HGPIO6/SMB3DSDA"; > > bias-disable; > > input-enable; > > }; > > gpio59o_pins: gpio59o-pins { > > - pins = "GPIO59/SMB3DSDA"; > > + pins = "GPIO59/HGPIO6/SMB3DSDA"; > > bias-disable; > > output-high; > > }; > > gpio59ol_pins: gpio59ol-pins { > > - pins = "GPIO59/SMB3DSDA"; > > + pins = "GPIO59/HGPIO6/SMB3DSDA"; > > bias-disable; > > output-low; > > }; > > gpio60_pins: gpio60-pins { > > - pins = "GPIO60/SMB3DSCL"; > > + pins = "GPIO60/HGPIO7/SMB3DSCL"; > > bias-disable; > > input-enable; > > }; > > gpio60o_pins: gpio60o-pins { > > - pins = "GPIO60/SMB3DSCL"; > > + pins = "GPIO60/HGPIO7/SMB3DSCL"; > > bias-disable; > > output-high; > > }; > > gpio60ol_pins: gpio60ol-pins { > > - pins = "GPIO60/SMB3DSCL"; > > + pins = "GPIO60/HGPIO7/SMB3DSCL"; > > bias-disable; > > output-low; > > }; > > -- > > 2.34.0.rc1.387.gb447b232ab-goog > >
+Tomer Maimon On Tue, Nov 30, 2021 at 10:59 AM William Kennington <wak@google.com> wrote: > > The changes only exist in 9a543726887d805d80f63b5165ef3d1a07d6c6eb, > which is an openbmc specific tree change. Mainline doesn't have the > breakage yet. > > On Tue, Nov 23, 2021 at 12:53 AM Joel Stanley <joel@jms.id.au> wrote: > > > > Hi William, > > > > On Thu, 18 Nov 2021 at 01:45, William A. Kennington III <wak@google.com> wrote: > > > > > > The pinctrl driver for the NPCM7xx updated some of the pinctrl names to > > > include HGPIO definitions, but the dts file remained unchanged. This > > > breaks pinctrl parsing if the strings don't match. > > > > > > Signed-off-by: William A. Kennington III <wak@google.com> > > > > I'm wondering where you want this patch to be applied (and who would do so!). > > > > Is the relevant pinctrl driver change merged to mainline? If so, send > > it to the upstream lists (linux-arm-kernel) and cc some nuvoton > > reviewers. > > > > If you just want it in the openbmc tree, we can do that. Normally this > > means putting the branch name in the subject. > > > > You should get some review from someone who works on the nuvoton > > boards regardless. > > > > Cheers, > > > > Joel > > > > > --- > > > arch/arm/boot/dts/nuvoton-npcm750-gpio.dtsi | 42 ++++++++++----------- > > > 1 file changed, 21 insertions(+), 21 deletions(-) > > > > > > diff --git a/arch/arm/boot/dts/nuvoton-npcm750-gpio.dtsi b/arch/arm/boot/dts/nuvoton-npcm750-gpio.dtsi > > > index 444ea403547b..7c7942cdfd08 100644 > > > --- a/arch/arm/boot/dts/nuvoton-npcm750-gpio.dtsi > > > +++ b/arch/arm/boot/dts/nuvoton-npcm750-gpio.dtsi > > > @@ -219,77 +219,77 @@ gpio19ol_pins: gpio19ol-pins { > > > output-low; > > > }; > > > gpio20_pins: gpio20-pins { > > > - pins = "GPIO20/SMB4CSDA/SMB15SDA"; > > > + pins = "GPIO20/HGPIO0/SMB4CSDA/SMB15SDA"; > > > bias-disable; > > > input-enable; > > > }; > > > gpio20o_pins: gpio20o-pins { > > > - pins = "GPIO20/SMB4CSDA/SMB15SDA"; > > > + pins = "GPIO20/HGPIO0/SMB4CSDA/SMB15SDA"; > > > bias-disable; > > > output-high; > > > }; > > > gpio20ol_pins: gpio20ol-pins { > > > - pins = "GPIO20/SMB4CSDA/SMB15SDA"; > > > + pins = "GPIO20/HGPIO0/SMB4CSDA/SMB15SDA"; > > > bias-disable; > > > output-low; > > > }; > > > gpio21_pins: gpio21-pins { > > > - pins = "GPIO21/SMB4CSCL/SMB15SCL"; > > > + pins = "GPIO21/HGPIO1/SMB4CSCL/SMB15SCL"; > > > bias-disable; > > > input-enable; > > > }; > > > gpio21ol_pins: gpio21ol-pins { > > > - pins = "GPIO21/SMB4CSCL/SMB15SCL"; > > > + pins = "GPIO21/HGPIO1/SMB4CSCL/SMB15SCL"; > > > bias-disable; > > > output-low; > > > }; > > > gpio22_pins: gpio22-pins { > > > - pins = "GPIO22/SMB4DSDA/SMB14SDA"; > > > + pins = "GPIO22/HGPIO2/SMB4DSDA/SMB14SDA"; > > > bias-disable; > > > input-enable; > > > }; > > > gpio22ol_pins: gpio22ol-pins { > > > - pins = "GPIO22/SMB4DSDA/SMB14SDA"; > > > + pins = "GPIO22/HGPIO2/SMB4DSDA/SMB14SDA"; > > > bias-disable; > > > output-low; > > > }; > > > gpio23_pins: gpio23-pins { > > > - pins = "GPIO23/SMB4DSCL/SMB14SCL"; > > > + pins = "GPIO23/HGPIO3/SMB4DSCL/SMB14SCL"; > > > bias-disable; > > > input-enable; > > > }; > > > gpio23ol_pins: gpio23ol-pins { > > > - pins = "GPIO23/SMB4DSCL/SMB14SCL"; > > > + pins = "GPIO23/HGPIO3/SMB4DSCL/SMB14SCL"; > > > bias-disable; > > > output-low; > > > }; > > > gpio24_pins: gpio24-pins { > > > - pins = "GPIO24/IOXHDO"; > > > + pins = "GPIO24/HGPIO4/IOXHDO"; > > > bias-disable; > > > input-enable; > > > }; > > > gpio24o_pins: gpio24o-pins { > > > - pins = "GPIO24/IOXHDO"; > > > + pins = "GPIO24/HGPIO4/IOXHDO"; > > > bias-disable; > > > output-high; > > > }; > > > gpio24ol_pins: gpio24ol-pins { > > > - pins = "GPIO24/IOXHDO"; > > > + pins = "GPIO24/HGPIO4/IOXHDO"; > > > bias-disable; > > > output-low; > > > }; > > > gpio25_pins: gpio25-pins { > > > - pins = "GPIO25/IOXHDI"; > > > + pins = "GPIO25/HGPIO5/IOXHDI"; > > > bias-disable; > > > input-enable; > > > }; > > > gpio25o_pins: gpio25o-pins { > > > - pins = "GPIO25/IOXHDI"; > > > + pins = "GPIO25/HGPIO5/IOXHDI"; > > > bias-disable; > > > output-high; > > > }; > > > gpio25ol_pins: gpio25ol-pins { > > > - pins = "GPIO25/IOXHDI"; > > > + pins = "GPIO25/HGPIO5/IOXHDI"; > > > bias-disable; > > > output-low; > > > }; > > > @@ -523,32 +523,32 @@ gpio58ol_pins: gpio58ol-pins { > > > output-low; > > > }; > > > gpio59_pins: gpio59-pins { > > > - pins = "GPIO59/SMB3DSDA"; > > > + pins = "GPIO59/HGPIO6/SMB3DSDA"; > > > bias-disable; > > > input-enable; > > > }; > > > gpio59o_pins: gpio59o-pins { > > > - pins = "GPIO59/SMB3DSDA"; > > > + pins = "GPIO59/HGPIO6/SMB3DSDA"; > > > bias-disable; > > > output-high; > > > }; > > > gpio59ol_pins: gpio59ol-pins { > > > - pins = "GPIO59/SMB3DSDA"; > > > + pins = "GPIO59/HGPIO6/SMB3DSDA"; > > > bias-disable; > > > output-low; > > > }; > > > gpio60_pins: gpio60-pins { > > > - pins = "GPIO60/SMB3DSCL"; > > > + pins = "GPIO60/HGPIO7/SMB3DSCL"; > > > bias-disable; > > > input-enable; > > > }; > > > gpio60o_pins: gpio60o-pins { > > > - pins = "GPIO60/SMB3DSCL"; > > > + pins = "GPIO60/HGPIO7/SMB3DSCL"; > > > bias-disable; > > > output-high; > > > }; > > > gpio60ol_pins: gpio60ol-pins { > > > - pins = "GPIO60/SMB3DSCL"; > > > + pins = "GPIO60/HGPIO7/SMB3DSCL"; > > > bias-disable; > > > output-low; > > > }; > > > -- > > > 2.34.0.rc1.387.gb447b232ab-goog > > >
On Tue, 30 Nov 2021 at 18:59, William Kennington <wak@google.com> wrote: > > The changes only exist in 9a543726887d805d80f63b5165ef3d1a07d6c6eb, > which is an openbmc specific tree change. Mainline doesn't have the > breakage yet. Please reply inline on open source mailing lists instead of top posting. If you want this in the openbmc tree, we have conventions for doing so. Please see my note below. > > On Tue, Nov 23, 2021 at 12:53 AM Joel Stanley <joel@jms.id.au> wrote: > > > > Hi William, > > > > On Thu, 18 Nov 2021 at 01:45, William A. Kennington III <wak@google.com> wrote: > > > > > > The pinctrl driver for the NPCM7xx updated some of the pinctrl names to > > > include HGPIO definitions, but the dts file remained unchanged. This > > > breaks pinctrl parsing if the strings don't match. > > > > > > Signed-off-by: William A. Kennington III <wak@google.com> > > > > I'm wondering where you want this patch to be applied (and who would do so!). > > > > Is the relevant pinctrl driver change merged to mainline? If so, send > > it to the upstream lists (linux-arm-kernel) and cc some nuvoton > > reviewers. > > > > If you just want it in the openbmc tree, we can do that. Normally this > > means putting the branch name in the subject. > > > > You should get some review from someone who works on the nuvoton > > boards regardless. > > > > Cheers, > > > > Joel > > > > > --- > > > arch/arm/boot/dts/nuvoton-npcm750-gpio.dtsi | 42 ++++++++++----------- > > > 1 file changed, 21 insertions(+), 21 deletions(-) > > > > > > diff --git a/arch/arm/boot/dts/nuvoton-npcm750-gpio.dtsi b/arch/arm/boot/dts/nuvoton-npcm750-gpio.dtsi > > > index 444ea403547b..7c7942cdfd08 100644 > > > --- a/arch/arm/boot/dts/nuvoton-npcm750-gpio.dtsi > > > +++ b/arch/arm/boot/dts/nuvoton-npcm750-gpio.dtsi > > > @@ -219,77 +219,77 @@ gpio19ol_pins: gpio19ol-pins { > > > output-low; > > > }; > > > gpio20_pins: gpio20-pins { > > > - pins = "GPIO20/SMB4CSDA/SMB15SDA"; > > > + pins = "GPIO20/HGPIO0/SMB4CSDA/SMB15SDA"; > > > bias-disable; > > > input-enable; > > > }; > > > gpio20o_pins: gpio20o-pins { > > > - pins = "GPIO20/SMB4CSDA/SMB15SDA"; > > > + pins = "GPIO20/HGPIO0/SMB4CSDA/SMB15SDA"; > > > bias-disable; > > > output-high; > > > }; > > > gpio20ol_pins: gpio20ol-pins { > > > - pins = "GPIO20/SMB4CSDA/SMB15SDA"; > > > + pins = "GPIO20/HGPIO0/SMB4CSDA/SMB15SDA"; > > > bias-disable; > > > output-low; > > > }; > > > gpio21_pins: gpio21-pins { > > > - pins = "GPIO21/SMB4CSCL/SMB15SCL"; > > > + pins = "GPIO21/HGPIO1/SMB4CSCL/SMB15SCL"; > > > bias-disable; > > > input-enable; > > > }; > > > gpio21ol_pins: gpio21ol-pins { > > > - pins = "GPIO21/SMB4CSCL/SMB15SCL"; > > > + pins = "GPIO21/HGPIO1/SMB4CSCL/SMB15SCL"; > > > bias-disable; > > > output-low; > > > }; > > > gpio22_pins: gpio22-pins { > > > - pins = "GPIO22/SMB4DSDA/SMB14SDA"; > > > + pins = "GPIO22/HGPIO2/SMB4DSDA/SMB14SDA"; > > > bias-disable; > > > input-enable; > > > }; > > > gpio22ol_pins: gpio22ol-pins { > > > - pins = "GPIO22/SMB4DSDA/SMB14SDA"; > > > + pins = "GPIO22/HGPIO2/SMB4DSDA/SMB14SDA"; > > > bias-disable; > > > output-low; > > > }; > > > gpio23_pins: gpio23-pins { > > > - pins = "GPIO23/SMB4DSCL/SMB14SCL"; > > > + pins = "GPIO23/HGPIO3/SMB4DSCL/SMB14SCL"; > > > bias-disable; > > > input-enable; > > > }; > > > gpio23ol_pins: gpio23ol-pins { > > > - pins = "GPIO23/SMB4DSCL/SMB14SCL"; > > > + pins = "GPIO23/HGPIO3/SMB4DSCL/SMB14SCL"; > > > bias-disable; > > > output-low; > > > }; > > > gpio24_pins: gpio24-pins { > > > - pins = "GPIO24/IOXHDO"; > > > + pins = "GPIO24/HGPIO4/IOXHDO"; > > > bias-disable; > > > input-enable; > > > }; > > > gpio24o_pins: gpio24o-pins { > > > - pins = "GPIO24/IOXHDO"; > > > + pins = "GPIO24/HGPIO4/IOXHDO"; > > > bias-disable; > > > output-high; > > > }; > > > gpio24ol_pins: gpio24ol-pins { > > > - pins = "GPIO24/IOXHDO"; > > > + pins = "GPIO24/HGPIO4/IOXHDO"; > > > bias-disable; > > > output-low; > > > }; > > > gpio25_pins: gpio25-pins { > > > - pins = "GPIO25/IOXHDI"; > > > + pins = "GPIO25/HGPIO5/IOXHDI"; > > > bias-disable; > > > input-enable; > > > }; > > > gpio25o_pins: gpio25o-pins { > > > - pins = "GPIO25/IOXHDI"; > > > + pins = "GPIO25/HGPIO5/IOXHDI"; > > > bias-disable; > > > output-high; > > > }; > > > gpio25ol_pins: gpio25ol-pins { > > > - pins = "GPIO25/IOXHDI"; > > > + pins = "GPIO25/HGPIO5/IOXHDI"; > > > bias-disable; > > > output-low; > > > }; > > > @@ -523,32 +523,32 @@ gpio58ol_pins: gpio58ol-pins { > > > output-low; > > > }; > > > gpio59_pins: gpio59-pins { > > > - pins = "GPIO59/SMB3DSDA"; > > > + pins = "GPIO59/HGPIO6/SMB3DSDA"; > > > bias-disable; > > > input-enable; > > > }; > > > gpio59o_pins: gpio59o-pins { > > > - pins = "GPIO59/SMB3DSDA"; > > > + pins = "GPIO59/HGPIO6/SMB3DSDA"; > > > bias-disable; > > > output-high; > > > }; > > > gpio59ol_pins: gpio59ol-pins { > > > - pins = "GPIO59/SMB3DSDA"; > > > + pins = "GPIO59/HGPIO6/SMB3DSDA"; > > > bias-disable; > > > output-low; > > > }; > > > gpio60_pins: gpio60-pins { > > > - pins = "GPIO60/SMB3DSCL"; > > > + pins = "GPIO60/HGPIO7/SMB3DSCL"; > > > bias-disable; > > > input-enable; > > > }; > > > gpio60o_pins: gpio60o-pins { > > > - pins = "GPIO60/SMB3DSCL"; > > > + pins = "GPIO60/HGPIO7/SMB3DSCL"; > > > bias-disable; > > > output-high; > > > }; > > > gpio60ol_pins: gpio60ol-pins { > > > - pins = "GPIO60/SMB3DSCL"; > > > + pins = "GPIO60/HGPIO7/SMB3DSCL"; > > > bias-disable; > > > output-low; > > > }; > > > -- > > > 2.34.0.rc1.387.gb447b232ab-goog > > >
diff --git a/arch/arm/boot/dts/nuvoton-npcm750-gpio.dtsi b/arch/arm/boot/dts/nuvoton-npcm750-gpio.dtsi index 444ea403547b..7c7942cdfd08 100644 --- a/arch/arm/boot/dts/nuvoton-npcm750-gpio.dtsi +++ b/arch/arm/boot/dts/nuvoton-npcm750-gpio.dtsi @@ -219,77 +219,77 @@ gpio19ol_pins: gpio19ol-pins { output-low; }; gpio20_pins: gpio20-pins { - pins = "GPIO20/SMB4CSDA/SMB15SDA"; + pins = "GPIO20/HGPIO0/SMB4CSDA/SMB15SDA"; bias-disable; input-enable; }; gpio20o_pins: gpio20o-pins { - pins = "GPIO20/SMB4CSDA/SMB15SDA"; + pins = "GPIO20/HGPIO0/SMB4CSDA/SMB15SDA"; bias-disable; output-high; }; gpio20ol_pins: gpio20ol-pins { - pins = "GPIO20/SMB4CSDA/SMB15SDA"; + pins = "GPIO20/HGPIO0/SMB4CSDA/SMB15SDA"; bias-disable; output-low; }; gpio21_pins: gpio21-pins { - pins = "GPIO21/SMB4CSCL/SMB15SCL"; + pins = "GPIO21/HGPIO1/SMB4CSCL/SMB15SCL"; bias-disable; input-enable; }; gpio21ol_pins: gpio21ol-pins { - pins = "GPIO21/SMB4CSCL/SMB15SCL"; + pins = "GPIO21/HGPIO1/SMB4CSCL/SMB15SCL"; bias-disable; output-low; }; gpio22_pins: gpio22-pins { - pins = "GPIO22/SMB4DSDA/SMB14SDA"; + pins = "GPIO22/HGPIO2/SMB4DSDA/SMB14SDA"; bias-disable; input-enable; }; gpio22ol_pins: gpio22ol-pins { - pins = "GPIO22/SMB4DSDA/SMB14SDA"; + pins = "GPIO22/HGPIO2/SMB4DSDA/SMB14SDA"; bias-disable; output-low; }; gpio23_pins: gpio23-pins { - pins = "GPIO23/SMB4DSCL/SMB14SCL"; + pins = "GPIO23/HGPIO3/SMB4DSCL/SMB14SCL"; bias-disable; input-enable; }; gpio23ol_pins: gpio23ol-pins { - pins = "GPIO23/SMB4DSCL/SMB14SCL"; + pins = "GPIO23/HGPIO3/SMB4DSCL/SMB14SCL"; bias-disable; output-low; }; gpio24_pins: gpio24-pins { - pins = "GPIO24/IOXHDO"; + pins = "GPIO24/HGPIO4/IOXHDO"; bias-disable; input-enable; }; gpio24o_pins: gpio24o-pins { - pins = "GPIO24/IOXHDO"; + pins = "GPIO24/HGPIO4/IOXHDO"; bias-disable; output-high; }; gpio24ol_pins: gpio24ol-pins { - pins = "GPIO24/IOXHDO"; + pins = "GPIO24/HGPIO4/IOXHDO"; bias-disable; output-low; }; gpio25_pins: gpio25-pins { - pins = "GPIO25/IOXHDI"; + pins = "GPIO25/HGPIO5/IOXHDI"; bias-disable; input-enable; }; gpio25o_pins: gpio25o-pins { - pins = "GPIO25/IOXHDI"; + pins = "GPIO25/HGPIO5/IOXHDI"; bias-disable; output-high; }; gpio25ol_pins: gpio25ol-pins { - pins = "GPIO25/IOXHDI"; + pins = "GPIO25/HGPIO5/IOXHDI"; bias-disable; output-low; }; @@ -523,32 +523,32 @@ gpio58ol_pins: gpio58ol-pins { output-low; }; gpio59_pins: gpio59-pins { - pins = "GPIO59/SMB3DSDA"; + pins = "GPIO59/HGPIO6/SMB3DSDA"; bias-disable; input-enable; }; gpio59o_pins: gpio59o-pins { - pins = "GPIO59/SMB3DSDA"; + pins = "GPIO59/HGPIO6/SMB3DSDA"; bias-disable; output-high; }; gpio59ol_pins: gpio59ol-pins { - pins = "GPIO59/SMB3DSDA"; + pins = "GPIO59/HGPIO6/SMB3DSDA"; bias-disable; output-low; }; gpio60_pins: gpio60-pins { - pins = "GPIO60/SMB3DSCL"; + pins = "GPIO60/HGPIO7/SMB3DSCL"; bias-disable; input-enable; }; gpio60o_pins: gpio60o-pins { - pins = "GPIO60/SMB3DSCL"; + pins = "GPIO60/HGPIO7/SMB3DSCL"; bias-disable; output-high; }; gpio60ol_pins: gpio60ol-pins { - pins = "GPIO60/SMB3DSCL"; + pins = "GPIO60/HGPIO7/SMB3DSCL"; bias-disable; output-low; };
The pinctrl driver for the NPCM7xx updated some of the pinctrl names to include HGPIO definitions, but the dts file remained unchanged. This breaks pinctrl parsing if the strings don't match. Signed-off-by: William A. Kennington III <wak@google.com> --- arch/arm/boot/dts/nuvoton-npcm750-gpio.dtsi | 42 ++++++++++----------- 1 file changed, 21 insertions(+), 21 deletions(-)