| Message ID | 20170629033446.10782-1-joel@jms.id.au |
|---|---|
| State | Accepted, archived |
| Headers | show |
On Thu, Jun 29, 2017 at 1:04 PM, Joel Stanley <joel@jms.id.au> wrote: > There was a bug in the definition of the heartbeat LED that meant we > were selecting the wrong GPIO for the driver. This fails now that we > have the correct pinmux settings for the Ethernet MAC. > > When looking at the schematic for the correct number I found that the > other LEDs were mislabeled, and in the case of the power LED not > present at all. > > Finally, the keep property is reinstated. This was present in an older > version of the dts as it is the required behaviour. > > The LEDs are now accurate according to the Ingrasys document > 0101DAW00-000-G, dated Wednesday, April 20, 2016, rev A00. The file > name is BARRELEYE-IO_BOARD-MP-HW-SCH-A00_20160419_FINAL.pdf > > Signed-off-by: Joel Stanley <joel@jms.id.au> I got a: Reviewed-by: Andrew Jeffery <andrew@aj.id.au> off the list, so I will apply this fix. Cheers, Joel > --- > arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts | 16 ++++++++++++++-- > 1 file changed, 14 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts b/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts > index e4e853d0f561..2060831e579c 100644 > --- a/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts > +++ b/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts > @@ -34,16 +34,28 @@ > leds { > compatible = "gpio-leds"; > > + /* BMC_HEARTBRAT_LED_N */ > heartbeat { > - gpios = <&gpio ASPEED_GPIO(R, 17) GPIO_ACTIVE_HIGH>; > + gpios = <&gpio ASPEED_GPIO(R, 4) GPIO_ACTIVE_LOW>; > + default-state = "keep"; > }; > > + /* BMC_SYS_PWROK_IDLED_N */ > identify { > - gpios = <&gpio ASPEED_GPIO(R, 2) GPIO_ACTIVE_LOW>; > + gpios = <&gpio ASPEED_GPIO(H, 2) GPIO_ACTIVE_LOW>; > + default-state = "keep"; > }; > > + /* BMC_BEEP */ > beep { > gpios = <&gpio ASPEED_GPIO(N, 7) GPIO_ACTIVE_HIGH>; > + default-state = "keep"; > + }; > + > + /* BMC_PWR_LED_N */ > + power { > + gpios = <&gpio ASPEED_GPIO(R, 5) GPIO_ACTIVE_LOW>; > + default-state = "keep"; > }; > }; > }; > -- > 2.13.2 >
diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts b/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts index e4e853d0f561..2060831e579c 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts @@ -34,16 +34,28 @@ leds { compatible = "gpio-leds"; + /* BMC_HEARTBRAT_LED_N */ heartbeat { - gpios = <&gpio ASPEED_GPIO(R, 17) GPIO_ACTIVE_HIGH>; + gpios = <&gpio ASPEED_GPIO(R, 4) GPIO_ACTIVE_LOW>; + default-state = "keep"; }; + /* BMC_SYS_PWROK_IDLED_N */ identify { - gpios = <&gpio ASPEED_GPIO(R, 2) GPIO_ACTIVE_LOW>; + gpios = <&gpio ASPEED_GPIO(H, 2) GPIO_ACTIVE_LOW>; + default-state = "keep"; }; + /* BMC_BEEP */ beep { gpios = <&gpio ASPEED_GPIO(N, 7) GPIO_ACTIVE_HIGH>; + default-state = "keep"; + }; + + /* BMC_PWR_LED_N */ + power { + gpios = <&gpio ASPEED_GPIO(R, 5) GPIO_ACTIVE_LOW>; + default-state = "keep"; }; }; };
There was a bug in the definition of the heartbeat LED that meant we were selecting the wrong GPIO for the driver. This fails now that we have the correct pinmux settings for the Ethernet MAC. When looking at the schematic for the correct number I found that the other LEDs were mislabeled, and in the case of the power LED not present at all. Finally, the keep property is reinstated. This was present in an older version of the dts as it is the required behaviour. The LEDs are now accurate according to the Ingrasys document 0101DAW00-000-G, dated Wednesday, April 20, 2016, rev A00. The file name is BARRELEYE-IO_BOARD-MP-HW-SCH-A00_20160419_FINAL.pdf Signed-off-by: Joel Stanley <joel@jms.id.au> --- arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)