* [PATCH linux dev-5.3 0/2] More Tacoma devicetree updates @ 2019-10-03 22:24 Eddie James 2019-10-03 22:24 ` [PATCH linux dev-5.3 1/2] ARM: dts: Aspeed: Tacoma: Add gpio-key definitions Eddie James 2019-10-03 22:24 ` [PATCH linux dev-5.3 2/2] ARM: dts: Aspeed: Tacoma: Add watchdog definitions Eddie James 0 siblings, 2 replies; 5+ messages in thread From: Eddie James @ 2019-10-03 22:24 UTC (permalink / raw) To: openbmc; +Cc: joel, andrew, Eddie James Some updates for gpios and watchdogs. These have been tested on several Tacoma systems. Eddie James (2): ARM: dts: Aspeed: Tacoma: Add gpio-key definitions ARM: dts: Aspeed: Tacoma: Add watchdog definitions arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts | 74 +++++++++++++++++++++ 1 file changed, 74 insertions(+) -- 2.23.0 ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH linux dev-5.3 1/2] ARM: dts: Aspeed: Tacoma: Add gpio-key definitions 2019-10-03 22:24 [PATCH linux dev-5.3 0/2] More Tacoma devicetree updates Eddie James @ 2019-10-03 22:24 ` Eddie James 2019-10-08 0:17 ` Andrew Jeffery 2019-10-03 22:24 ` [PATCH linux dev-5.3 2/2] ARM: dts: Aspeed: Tacoma: Add watchdog definitions Eddie James 1 sibling, 1 reply; 5+ messages in thread From: Eddie James @ 2019-10-03 22:24 UTC (permalink / raw) To: openbmc; +Cc: joel, andrew, Eddie James Add gpio-keys for various signals on Tacoma. Signed-off-by: Eddie James <eajames@linux.ibm.com> --- arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts | 60 +++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts b/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts index 52c4374ce0d9..ea6e666d0caa 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts @@ -3,6 +3,7 @@ /dts-v1/; #include "aspeed-g6.dtsi" +#include <dt-bindings/gpio/aspeed-gpio.h> #include <dt-bindings/leds/leds-pca955x.h> / { @@ -33,6 +34,65 @@ reg = <0xba000000 0x2000000>; /* 32M */ }; }; + + gpio-keys { + compatible = "gpio-keys"; + + air-water { + label = "air-water"; + gpios = <&gpio0 ASPEED_GPIO(Q, 7) GPIO_ACTIVE_LOW>; + linux,code = <ASPEED_GPIO(Q, 7)>; + }; + + checkstop { + label = "checkstop"; + gpios = <&gpio0 ASPEED_GPIO(E, 3) GPIO_ACTIVE_LOW>; + linux,code = <ASPEED_GPIO(E, 3)>; + }; + + ps0-presence { + label = "ps0-presence"; + gpios = <&gpio0 ASPEED_GPIO(H, 3) GPIO_ACTIVE_LOW>; + linux,code = <ASPEED_GPIO(H, 3)>; + }; + + ps1-presence { + label = "ps1-presence"; + gpios = <&gpio0 ASPEED_GPIO(E, 5) GPIO_ACTIVE_LOW>; + linux,code = <ASPEED_GPIO(E, 5)>; + }; + }; + + gpio-keys-polled { + compatible = "gpio-keys-polled"; + #address-cells = <1>; + #size-cells = <0>; + poll-interval = <1000>; + + fan0-presence { + label = "fan0-presence"; + gpios = <&pca0 4 GPIO_ACTIVE_LOW>; + linux,code = <4>; + }; + + fan1-presence { + label = "fan1-presence"; + gpios = <&pca0 5 GPIO_ACTIVE_LOW>; + linux,code = <5>; + }; + + fan2-presence { + label = "fan2-presence"; + gpios = <&pca0 6 GPIO_ACTIVE_LOW>; + linux,code = <6>; + }; + + fan3-presence { + label = "fan3-presence"; + gpios = <&pca0 7 GPIO_ACTIVE_LOW>; + linux,code = <7>; + }; + }; }; &fmc { -- 2.23.0 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH linux dev-5.3 1/2] ARM: dts: Aspeed: Tacoma: Add gpio-key definitions 2019-10-03 22:24 ` [PATCH linux dev-5.3 1/2] ARM: dts: Aspeed: Tacoma: Add gpio-key definitions Eddie James @ 2019-10-08 0:17 ` Andrew Jeffery 0 siblings, 0 replies; 5+ messages in thread From: Andrew Jeffery @ 2019-10-08 0:17 UTC (permalink / raw) To: Eddie James, openbmc On Fri, 4 Oct 2019, at 07:54, Eddie James wrote: > Add gpio-keys for various signals on Tacoma. > > Signed-off-by: Eddie James <eajames@linux.ibm.com> Acked-by: Andrew Jeffery <andrew@aj.id.au> > --- > arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts | 60 +++++++++++++++++++++ > 1 file changed, 60 insertions(+) > > diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts > b/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts > index 52c4374ce0d9..ea6e666d0caa 100644 > --- a/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts > +++ b/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts > @@ -3,6 +3,7 @@ > /dts-v1/; > > #include "aspeed-g6.dtsi" > +#include <dt-bindings/gpio/aspeed-gpio.h> > #include <dt-bindings/leds/leds-pca955x.h> > > / { > @@ -33,6 +34,65 @@ > reg = <0xba000000 0x2000000>; /* 32M */ > }; > }; > + > + gpio-keys { > + compatible = "gpio-keys"; > + > + air-water { > + label = "air-water"; > + gpios = <&gpio0 ASPEED_GPIO(Q, 7) GPIO_ACTIVE_LOW>; > + linux,code = <ASPEED_GPIO(Q, 7)>; > + }; > + > + checkstop { > + label = "checkstop"; > + gpios = <&gpio0 ASPEED_GPIO(E, 3) GPIO_ACTIVE_LOW>; > + linux,code = <ASPEED_GPIO(E, 3)>; > + }; > + > + ps0-presence { > + label = "ps0-presence"; > + gpios = <&gpio0 ASPEED_GPIO(H, 3) GPIO_ACTIVE_LOW>; > + linux,code = <ASPEED_GPIO(H, 3)>; > + }; > + > + ps1-presence { > + label = "ps1-presence"; > + gpios = <&gpio0 ASPEED_GPIO(E, 5) GPIO_ACTIVE_LOW>; > + linux,code = <ASPEED_GPIO(E, 5)>; > + }; > + }; > + > + gpio-keys-polled { > + compatible = "gpio-keys-polled"; > + #address-cells = <1>; > + #size-cells = <0>; > + poll-interval = <1000>; > + > + fan0-presence { > + label = "fan0-presence"; > + gpios = <&pca0 4 GPIO_ACTIVE_LOW>; > + linux,code = <4>; > + }; > + > + fan1-presence { > + label = "fan1-presence"; > + gpios = <&pca0 5 GPIO_ACTIVE_LOW>; > + linux,code = <5>; > + }; > + > + fan2-presence { > + label = "fan2-presence"; > + gpios = <&pca0 6 GPIO_ACTIVE_LOW>; > + linux,code = <6>; > + }; > + > + fan3-presence { > + label = "fan3-presence"; > + gpios = <&pca0 7 GPIO_ACTIVE_LOW>; > + linux,code = <7>; > + }; > + }; > }; > > &fmc { > -- > 2.23.0 > > ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH linux dev-5.3 2/2] ARM: dts: Aspeed: Tacoma: Add watchdog definitions 2019-10-03 22:24 [PATCH linux dev-5.3 0/2] More Tacoma devicetree updates Eddie James 2019-10-03 22:24 ` [PATCH linux dev-5.3 1/2] ARM: dts: Aspeed: Tacoma: Add gpio-key definitions Eddie James @ 2019-10-03 22:24 ` Eddie James 2019-10-08 0:24 ` Andrew Jeffery 1 sibling, 1 reply; 5+ messages in thread From: Eddie James @ 2019-10-03 22:24 UTC (permalink / raw) To: openbmc; +Cc: joel, andrew, Eddie James The first watchdog on Tacoma is wired to the fans. Use the second watchdog as the kernel/system watchdog. Signed-off-by: Eddie James <eajames@linux.ibm.com> --- arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts b/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts index ea6e666d0caa..cdc14773ddda 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts @@ -524,3 +524,17 @@ memory-region = <&flash_memory>; flash = <&spi1>; }; + +&wdt1 { + aspeed,reset-type = "none"; + aspeed,external-signal; + aspeed,ext-push-pull; + aspeed,ext-active-high; + + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_wdtrst1_default>; +}; + +&wdt2 { + status = "okay"; +}; -- 2.23.0 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH linux dev-5.3 2/2] ARM: dts: Aspeed: Tacoma: Add watchdog definitions 2019-10-03 22:24 ` [PATCH linux dev-5.3 2/2] ARM: dts: Aspeed: Tacoma: Add watchdog definitions Eddie James @ 2019-10-08 0:24 ` Andrew Jeffery 0 siblings, 0 replies; 5+ messages in thread From: Andrew Jeffery @ 2019-10-08 0:24 UTC (permalink / raw) To: Eddie James, openbmc On Fri, 4 Oct 2019, at 07:54, Eddie James wrote: > The first watchdog on Tacoma is wired to the fans. Use the second > watchdog as the kernel/system watchdog. > > Signed-off-by: Eddie James <eajames@linux.ibm.com> Reviewed-by: Andrew Jeffery <andrew@aj.id.au> ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-10-08 0:23 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2019-10-03 22:24 [PATCH linux dev-5.3 0/2] More Tacoma devicetree updates Eddie James 2019-10-03 22:24 ` [PATCH linux dev-5.3 1/2] ARM: dts: Aspeed: Tacoma: Add gpio-key definitions Eddie James 2019-10-08 0:17 ` Andrew Jeffery 2019-10-03 22:24 ` [PATCH linux dev-5.3 2/2] ARM: dts: Aspeed: Tacoma: Add watchdog definitions Eddie James 2019-10-08 0:24 ` Andrew Jeffery
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.