2022-06-24 17:28:16

by Krzysztof Kozlowski

Subject: [PATCH 2/2] MIPS: dts: align gpio-key node names with dtschema

The node names should be generic and DT schema expects certain pattern
(e.g. with key/button/switch).

Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
arch/mips/boot/dts/ingenic/ci20.dts | 2 +-
arch/mips/boot/dts/ralink/gardena_smart_gateway_mt7688.dts | 2 +-
arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc1.dts | 2 +-
arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc2.dts | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/mips/boot/dts/ingenic/ci20.dts b/arch/mips/boot/dts/ingenic/ci20.dts
index ab6e3dc0bc1d..37c46720c719 100644
--- a/arch/mips/boot/dts/ingenic/ci20.dts
+++ b/arch/mips/boot/dts/ingenic/ci20.dts
@@ -31,7 +31,7 @@ memory {
gpio-keys {
compatible = "gpio-keys";

- sw1 {
+ switch {
label = "ci20:sw1";
linux,code = <KEY_F13>;
gpios = <&gpd 17 GPIO_ACTIVE_HIGH>;
diff --git a/arch/mips/boot/dts/ralink/gardena_smart_gateway_mt7688.dts b/arch/mips/boot/dts/ralink/gardena_smart_gateway_mt7688.dts
index 826e91b840a3..179558161f85 100644
--- a/arch/mips/boot/dts/ralink/gardena_smart_gateway_mt7688.dts
+++ b/arch/mips/boot/dts/ralink/gardena_smart_gateway_mt7688.dts
@@ -26,7 +26,7 @@ gpio-keys {
pinctrl-names = "default";
pinctrl-0 = <&pinmux_gpio_gpio>; /* GPIO11 */

- user_btn1 {
+ button {
label = "USER_BTN1";
gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
linux,code =<KEY_PROG1> ;
diff --git a/arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc1.dts b/arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc1.dts
index 37037e4f3c3b..24eebc5a85b1 100644
--- a/arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc1.dts
+++ b/arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc1.dts
@@ -29,7 +29,7 @@ i2c@900 {
gpio-keys {
compatible = "gpio-keys";

- reset {
+ key-reset {
label = "reset";
gpios = <&gpio 18 GPIO_ACTIVE_HIGH>;
linux,code = <KEY_RESTART>;
diff --git a/arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc2.dts b/arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc2.dts
index a6201a119a1f..34006e667780 100644
--- a/arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc2.dts
+++ b/arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc2.dts
@@ -29,7 +29,7 @@ i2c@900 {
gpio-keys {
compatible = "gpio-keys";

- reset {
+ key-reset {
label = "reset";
gpios = <&gpio 18 GPIO_ACTIVE_HIGH>;
linux,code = <KEY_RESTART>;
--
2.34.1

2022-06-29 12:43:30

by Arınç ÜNAL

Subject: Re: [PATCH 2/2] MIPS: dts: align gpio-key node names with dtschema

On 24.06.2022 20:07, Krzysztof Kozlowski wrote:
> The node names should be generic and DT schema expects certain pattern
> (e.g. with key/button/switch).
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>

Acked-by: Arınç ÜNAL <[email protected]>

Cheers.
Arınç

2022-07-14 10:15:30

by Thomas Bogendoerfer

Subject: Re: [PATCH 2/2] MIPS: dts: align gpio-key node names with dtschema

On Fri, Jun 24, 2022 at 07:07:40PM +0200, Krzysztof Kozlowski wrote:
> The node names should be generic and DT schema expects certain pattern
> (e.g. with key/button/switch).
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> ---
> arch/mips/boot/dts/ingenic/ci20.dts | 2 +-
> arch/mips/boot/dts/ralink/gardena_smart_gateway_mt7688.dts | 2 +-
> arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc1.dts | 2 +-
> arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc2.dts | 2 +-
> 4 files changed, 4 insertions(+), 4 deletions(-)

applied to mips-next.

Thomas.

--
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea. [ RFC1925, 2.3 ]