| Message ID | 20220616005333.18491-18-krzysztof.kozlowski@linaro.org (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | dt-bindings: input: gpio-keys: rework matching children | expand |
On 16/06/2022 02:53, 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 <krzysztof.kozlowski@linaro.org> Applied, thanks! > --- > arch/arm/boot/dts/mt7623a-rfb-emmc.dts | 4 ++-- > arch/arm/boot/dts/mt7623a-rfb-nand.dts | 4 ++-- > arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts | 4 ++-- > arch/arm/boot/dts/mt7623n-rfb-emmc.dts | 4 ++-- > arch/arm/boot/dts/mt7629-rfb.dts | 4 ++-- > 5 files changed, 10 insertions(+), 10 deletions(-) > > diff --git a/arch/arm/boot/dts/mt7623a-rfb-emmc.dts b/arch/arm/boot/dts/mt7623a-rfb-emmc.dts > index 13c86936d1c8..e8b4b6d30d19 100644 > --- a/arch/arm/boot/dts/mt7623a-rfb-emmc.dts > +++ b/arch/arm/boot/dts/mt7623a-rfb-emmc.dts > @@ -45,13 +45,13 @@ gpio-keys { > pinctrl-names = "default"; > pinctrl-0 = <&key_pins_a>; > > - factory { > + button-factory { > label = "factory"; > linux,code = <BTN_0>; > gpios = <&pio 256 GPIO_ACTIVE_LOW>; > }; > > - wps { > + button-wps { > label = "wps"; > linux,code = <KEY_WPS_BUTTON>; > gpios = <&pio 257 GPIO_ACTIVE_HIGH>; > diff --git a/arch/arm/boot/dts/mt7623a-rfb-nand.dts b/arch/arm/boot/dts/mt7623a-rfb-nand.dts > index 88d8f0b2f4c2..61f5da68d4b0 100644 > --- a/arch/arm/boot/dts/mt7623a-rfb-nand.dts > +++ b/arch/arm/boot/dts/mt7623a-rfb-nand.dts > @@ -45,13 +45,13 @@ gpio-keys { > pinctrl-names = "default"; > pinctrl-0 = <&key_pins_a>; > > - factory { > + button-factory { > label = "factory"; > linux,code = <BTN_0>; > gpios = <&pio 256 GPIO_ACTIVE_LOW>; > }; > > - wps { > + button-wps { > label = "wps"; > linux,code = <KEY_WPS_BUTTON>; > gpios = <&pio 257 GPIO_ACTIVE_HIGH>; > diff --git a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts > index 027c1b0c6a98..5008115d2494 100644 > --- a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts > +++ b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts > @@ -91,13 +91,13 @@ gpio-keys { > pinctrl-names = "default"; > pinctrl-0 = <&key_pins_a>; > > - factory { > + button-factory { > label = "factory"; > linux,code = <BTN_0>; > gpios = <&pio 256 GPIO_ACTIVE_LOW>; > }; > > - wps { > + button-wps { > label = "wps"; > linux,code = <KEY_WPS_BUTTON>; > gpios = <&pio 257 GPIO_ACTIVE_HIGH>; > diff --git a/arch/arm/boot/dts/mt7623n-rfb-emmc.dts b/arch/arm/boot/dts/mt7623n-rfb-emmc.dts > index 1b9b9a8145a7..bf67a8e9be59 100644 > --- a/arch/arm/boot/dts/mt7623n-rfb-emmc.dts > +++ b/arch/arm/boot/dts/mt7623n-rfb-emmc.dts > @@ -60,13 +60,13 @@ gpio-keys { > pinctrl-names = "default"; > pinctrl-0 = <&key_pins_a>; > > - factory { > + button-factory { > label = "factory"; > linux,code = <BTN_0>; > gpios = <&pio 256 GPIO_ACTIVE_LOW>; > }; > > - wps { > + button-wps { > label = "wps"; > linux,code = <KEY_WPS_BUTTON>; > gpios = <&pio 257 GPIO_ACTIVE_HIGH>; > diff --git a/arch/arm/boot/dts/mt7629-rfb.dts b/arch/arm/boot/dts/mt7629-rfb.dts > index eb536cbebd9b..84e14bee7235 100644 > --- a/arch/arm/boot/dts/mt7629-rfb.dts > +++ b/arch/arm/boot/dts/mt7629-rfb.dts > @@ -23,13 +23,13 @@ chosen { > gpio-keys { > compatible = "gpio-keys"; > > - reset { > + button-reset { > label = "factory"; > linux,code = <KEY_RESTART>; > gpios = <&pio 60 GPIO_ACTIVE_LOW>; > }; > > - wps { > + button-wps { > label = "wps"; > linux,code = <KEY_WPS_BUTTON>; > gpios = <&pio 58 GPIO_ACTIVE_LOW>;
diff --git a/arch/arm/boot/dts/mt7623a-rfb-emmc.dts b/arch/arm/boot/dts/mt7623a-rfb-emmc.dts index 13c86936d1c8..e8b4b6d30d19 100644 --- a/arch/arm/boot/dts/mt7623a-rfb-emmc.dts +++ b/arch/arm/boot/dts/mt7623a-rfb-emmc.dts @@ -45,13 +45,13 @@ gpio-keys { pinctrl-names = "default"; pinctrl-0 = <&key_pins_a>; - factory { + button-factory { label = "factory"; linux,code = <BTN_0>; gpios = <&pio 256 GPIO_ACTIVE_LOW>; }; - wps { + button-wps { label = "wps"; linux,code = <KEY_WPS_BUTTON>; gpios = <&pio 257 GPIO_ACTIVE_HIGH>; diff --git a/arch/arm/boot/dts/mt7623a-rfb-nand.dts b/arch/arm/boot/dts/mt7623a-rfb-nand.dts index 88d8f0b2f4c2..61f5da68d4b0 100644 --- a/arch/arm/boot/dts/mt7623a-rfb-nand.dts +++ b/arch/arm/boot/dts/mt7623a-rfb-nand.dts @@ -45,13 +45,13 @@ gpio-keys { pinctrl-names = "default"; pinctrl-0 = <&key_pins_a>; - factory { + button-factory { label = "factory"; linux,code = <BTN_0>; gpios = <&pio 256 GPIO_ACTIVE_LOW>; }; - wps { + button-wps { label = "wps"; linux,code = <KEY_WPS_BUTTON>; gpios = <&pio 257 GPIO_ACTIVE_HIGH>; diff --git a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts index 027c1b0c6a98..5008115d2494 100644 --- a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts +++ b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts @@ -91,13 +91,13 @@ gpio-keys { pinctrl-names = "default"; pinctrl-0 = <&key_pins_a>; - factory { + button-factory { label = "factory"; linux,code = <BTN_0>; gpios = <&pio 256 GPIO_ACTIVE_LOW>; }; - wps { + button-wps { label = "wps"; linux,code = <KEY_WPS_BUTTON>; gpios = <&pio 257 GPIO_ACTIVE_HIGH>; diff --git a/arch/arm/boot/dts/mt7623n-rfb-emmc.dts b/arch/arm/boot/dts/mt7623n-rfb-emmc.dts index 1b9b9a8145a7..bf67a8e9be59 100644 --- a/arch/arm/boot/dts/mt7623n-rfb-emmc.dts +++ b/arch/arm/boot/dts/mt7623n-rfb-emmc.dts @@ -60,13 +60,13 @@ gpio-keys { pinctrl-names = "default"; pinctrl-0 = <&key_pins_a>; - factory { + button-factory { label = "factory"; linux,code = <BTN_0>; gpios = <&pio 256 GPIO_ACTIVE_LOW>; }; - wps { + button-wps { label = "wps"; linux,code = <KEY_WPS_BUTTON>; gpios = <&pio 257 GPIO_ACTIVE_HIGH>; diff --git a/arch/arm/boot/dts/mt7629-rfb.dts b/arch/arm/boot/dts/mt7629-rfb.dts index eb536cbebd9b..84e14bee7235 100644 --- a/arch/arm/boot/dts/mt7629-rfb.dts +++ b/arch/arm/boot/dts/mt7629-rfb.dts @@ -23,13 +23,13 @@ chosen { gpio-keys { compatible = "gpio-keys"; - reset { + button-reset { label = "factory"; linux,code = <KEY_RESTART>; gpios = <&pio 60 GPIO_ACTIVE_LOW>; }; - wps { + button-wps { label = "wps"; linux,code = <KEY_WPS_BUTTON>; gpios = <&pio 58 GPIO_ACTIVE_LOW>;
The node names should be generic and DT schema expects certain pattern (e.g. with key/button/switch). Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> --- arch/arm/boot/dts/mt7623a-rfb-emmc.dts | 4 ++-- arch/arm/boot/dts/mt7623a-rfb-nand.dts | 4 ++-- arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts | 4 ++-- arch/arm/boot/dts/mt7623n-rfb-emmc.dts | 4 ++-- arch/arm/boot/dts/mt7629-rfb.dts | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-)