Message ID | 20240409150215.2497778-11-patrice.chotard@foss.st.com |
---|---|
State | Accepted |
Commit | bebe5b69964e30b194621b77a91fdd4f339848af |
Delegated to: | Patrick Delaunay |
Headers | show |
Series | stm32mp: Fix keys & leds management | expand |
Hi, On 4/9/24 17:02, Patrice Chotard wrote: > Instead of using "st,fastboot-gpios" and "st,stm32prog-gpios", declare > 2 gpio-keys. > > Signed-off-by: Patrice Chotard <patrice.chotard@foss.st.com> > --- > > arch/arm/dts/stm32mp157a-dk1-scmi-u-boot.dtsi | 19 +++++++++++++++++-- > 1 file changed, 17 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/dts/stm32mp157a-dk1-scmi-u-boot.dtsi b/arch/arm/dts/stm32mp157a-dk1-scmi-u-boot.dtsi > index 20728f27ee1..5d49b09c35d 100644 > --- a/arch/arm/dts/stm32mp157a-dk1-scmi-u-boot.dtsi > +++ b/arch/arm/dts/stm32mp157a-dk1-scmi-u-boot.dtsi > @@ -3,6 +3,7 @@ > * Copyright : STMicroelectronics 2022 > */ > > +#include <dt-bindings/input/linux-event-codes.h> > #include "stm32mp15-scmi-u-boot.dtsi" > > / { > @@ -16,8 +17,22 @@ > u-boot,error-led = "error"; > u-boot,mmc-env-partition = "u-boot-env"; > st,adc_usb_pd = <&adc1 18>, <&adc1 19>; > - st,fastboot-gpios = <&gpioa 13 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; > - st,stm32prog-gpios = <&gpioa 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; > + }; > + > + gpio-keys { > + compatible = "gpio-keys"; > + > + button-user-1 { > + label = "User-1"; > + linux,code = <BTN_1>; > + gpios = <&gpioa 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; > + }; > + > + button-user-2 { > + label = "User-2"; > + linux,code = <BTN_2>; > + gpios = <&gpioa 13 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; > + }; > }; > > led { Reviewed-by: Patrick Delaunay <patrick.delaunay@foss.st.com> Thanks Patrick
On 4/17/24 11:07, Patrick DELAUNAY wrote: > Hi, > > On 4/9/24 17:02, Patrice Chotard wrote: >> Instead of using "st,fastboot-gpios" and "st,stm32prog-gpios", declare >> 2 gpio-keys. >> >> Signed-off-by: Patrice Chotard <patrice.chotard@foss.st.com> >> --- >> >> arch/arm/dts/stm32mp157a-dk1-scmi-u-boot.dtsi | 19 +++++++++++++++++-- >> 1 file changed, 17 insertions(+), 2 deletions(-) >> >> diff --git a/arch/arm/dts/stm32mp157a-dk1-scmi-u-boot.dtsi b/arch/arm/dts/stm32mp157a-dk1-scmi-u-boot.dtsi >> index 20728f27ee1..5d49b09c35d 100644 >> --- a/arch/arm/dts/stm32mp157a-dk1-scmi-u-boot.dtsi >> +++ b/arch/arm/dts/stm32mp157a-dk1-scmi-u-boot.dtsi >> @@ -3,6 +3,7 @@ >> * Copyright : STMicroelectronics 2022 >> */ >> +#include <dt-bindings/input/linux-event-codes.h> >> #include "stm32mp15-scmi-u-boot.dtsi" >> / { >> @@ -16,8 +17,22 @@ >> u-boot,error-led = "error"; >> u-boot,mmc-env-partition = "u-boot-env"; >> st,adc_usb_pd = <&adc1 18>, <&adc1 19>; >> - st,fastboot-gpios = <&gpioa 13 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; >> - st,stm32prog-gpios = <&gpioa 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; >> + }; >> + >> + gpio-keys { >> + compatible = "gpio-keys"; >> + >> + button-user-1 { >> + label = "User-1"; >> + linux,code = <BTN_1>; >> + gpios = <&gpioa 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; >> + }; >> + >> + button-user-2 { >> + label = "User-2"; >> + linux,code = <BTN_2>; >> + gpios = <&gpioa 13 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; >> + }; >> }; >> led { > > > > Reviewed-by: Patrick Delaunay <patrick.delaunay@foss.st.com> > > Thanks > Patrick > Applied on u-boot-stm32/master
diff --git a/arch/arm/dts/stm32mp157a-dk1-scmi-u-boot.dtsi b/arch/arm/dts/stm32mp157a-dk1-scmi-u-boot.dtsi index 20728f27ee1..5d49b09c35d 100644 --- a/arch/arm/dts/stm32mp157a-dk1-scmi-u-boot.dtsi +++ b/arch/arm/dts/stm32mp157a-dk1-scmi-u-boot.dtsi @@ -3,6 +3,7 @@ * Copyright : STMicroelectronics 2022 */ +#include <dt-bindings/input/linux-event-codes.h> #include "stm32mp15-scmi-u-boot.dtsi" / { @@ -16,8 +17,22 @@ u-boot,error-led = "error"; u-boot,mmc-env-partition = "u-boot-env"; st,adc_usb_pd = <&adc1 18>, <&adc1 19>; - st,fastboot-gpios = <&gpioa 13 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; - st,stm32prog-gpios = <&gpioa 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; + }; + + gpio-keys { + compatible = "gpio-keys"; + + button-user-1 { + label = "User-1"; + linux,code = <BTN_1>; + gpios = <&gpioa 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; + }; + + button-user-2 { + label = "User-2"; + linux,code = <BTN_2>; + gpios = <&gpioa 13 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; + }; }; led {
Instead of using "st,fastboot-gpios" and "st,stm32prog-gpios", declare 2 gpio-keys. Signed-off-by: Patrice Chotard <patrice.chotard@foss.st.com> --- arch/arm/dts/stm32mp157a-dk1-scmi-u-boot.dtsi | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)