| Message ID | 20220616005333.18491-15-krzysztof.kozlowski@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| 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 > --- > .../boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts | 4 ++-- > arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts | 4 ++-- > arch/arm64/boot/dts/mediatek/mt8173-elm-hana-rev7.dts | 6 +++--- > arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi | 10 +++++----- > arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi | 4 ++-- > arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu.dtsi | 2 +- > arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 2 +- > arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi | 4 ++-- > 8 files changed, 18 insertions(+), 18 deletions(-) > > diff --git a/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts > index 2b9bf8dd14ec..c2311733d2de 100644 > --- a/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts > +++ b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts > @@ -40,13 +40,13 @@ cpu@1 { > gpio-keys { > compatible = "gpio-keys"; > > - factory { > + factory-key { > label = "factory"; > linux,code = <BTN_0>; > gpios = <&pio 0 GPIO_ACTIVE_HIGH>; > }; > > - wps { > + wps-key { > label = "wps"; > linux,code = <KEY_WPS_BUTTON>; > gpios = <&pio 102 GPIO_ACTIVE_HIGH>; > diff --git a/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts b/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts > index 596c073d8b05..c28da9323a9c 100644 > --- a/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts > +++ b/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts > @@ -42,13 +42,13 @@ gpio-keys { > compatible = "gpio-keys"; > poll-interval = <100>; > > - factory { > + key-factory { > label = "factory"; > linux,code = <BTN_0>; > gpios = <&pio 0 0>; > }; > > - wps { > + key-wps { > label = "wps"; > linux,code = <KEY_WPS_BUTTON>; > gpios = <&pio 102 0>; > diff --git a/arch/arm64/boot/dts/mediatek/mt8173-elm-hana-rev7.dts b/arch/arm64/boot/dts/mediatek/mt8173-elm-hana-rev7.dts > index 44f6149c1307..28433b94f7c7 100644 > --- a/arch/arm64/boot/dts/mediatek/mt8173-elm-hana-rev7.dts > +++ b/arch/arm64/boot/dts/mediatek/mt8173-elm-hana-rev7.dts > @@ -21,7 +21,7 @@ cpu_crit: cpu_crit0 { > }; > > &gpio_keys { > - /delete-node/tablet_mode; > - /delete-node/volume_down; > - /delete-node/volume_up; > + /delete-node/switch-tablet-mode; > + /delete-node/switch-volume-down; > + /delete-node/switch-volume-up; > }; > diff --git a/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi b/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi > index 9c75fbb31f98..d20378758213 100644 > --- a/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi > +++ b/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi > @@ -53,7 +53,7 @@ gpio_keys: gpio-keys { > pinctrl-names = "default"; > pinctrl-0 = <&gpio_keys_pins>; > > - lid { > + switch-lid { > label = "Lid"; > gpios = <&pio 69 GPIO_ACTIVE_LOW>; > linux,code = <SW_LID>; > @@ -61,7 +61,7 @@ lid { > gpio-key,wakeup; > }; > > - power { > + switch-power { > label = "Power"; > gpios = <&pio 14 GPIO_ACTIVE_HIGH>; > linux,code = <KEY_POWER>; > @@ -69,7 +69,7 @@ power { > gpio-key,wakeup; > }; > > - tablet_mode { > + switch-tablet-mode { > label = "Tablet_mode"; > gpios = <&pio 121 GPIO_ACTIVE_HIGH>; > linux,code = <SW_TABLET_MODE>; > @@ -77,13 +77,13 @@ tablet_mode { > gpio-key,wakeup; > }; > > - volume_down { > + switch-volume-down { > label = "Volume_down"; > gpios = <&pio 123 GPIO_ACTIVE_LOW>; > linux,code = <KEY_VOLUMEDOWN>; > }; > > - volume_up { > + switch-volume-up { > label = "Volume_up"; > gpios = <&pio 124 GPIO_ACTIVE_LOW>; > linux,code = <KEY_VOLUMEUP>; > diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi > index 2d7a193272ae..3ac83be53627 100644 > --- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi > +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi > @@ -73,7 +73,7 @@ volume_buttons: volume-buttons { > pinctrl-names = "default"; > pinctrl-0 = <&volume_button_pins>; > > - volume_down { > + button-volume-down { > label = "Volume Down"; > linux,code = <KEY_VOLUMEDOWN>; > debounce-interval = <100>; > @@ -81,7 +81,7 @@ volume_down { > gpios = <&pio 6 GPIO_ACTIVE_LOW>; > }; > > - volume_up { > + button-volume-up { > label = "Volume Up"; > linux,code = <KEY_VOLUMEUP>; > debounce-interval = <100>; > diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu.dtsi b/arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu.dtsi > index 28966a65391b..50a0dd36b5fb 100644 > --- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu.dtsi > +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu.dtsi > @@ -45,7 +45,7 @@ gpio-keys { > pinctrl-names = "default"; > pinctrl-0 = <&pen_eject>; > > - pen-insert { > + switch-pen-insert { > label = "Pen Insert"; > /* Insert = low, eject = high */ > gpios = <&pio 6 GPIO_ACTIVE_LOW>; > diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi b/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi > index b035e06840e6..b50261e8b9ed 100644 > --- a/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi > +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi > @@ -144,7 +144,7 @@ wifi_wakeup: wifi-wakeup { > pinctrl-names = "default"; > pinctrl-0 = <&wifi_pins_wakeup>; > > - wowlan { > + button-wowlan { > label = "Wake on WiFi"; > gpios = <&pio 113 GPIO_ACTIVE_HIGH>; > linux,code = <KEY_WAKEUP>; > diff --git a/arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi b/arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi > index 7a717f926929..8ee1529683a3 100644 > --- a/arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi > +++ b/arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi > @@ -28,7 +28,7 @@ gpio-keys { > pinctrl-names = "default"; > pinctrl-0 = <&gpio_keys_default>; > > - volume-up { > + key-volume-up { > gpios = <&pio 42 GPIO_ACTIVE_LOW>; > label = "volume_up"; > linux,code = <115>; > @@ -36,7 +36,7 @@ volume-up { > debounce-interval = <15>; > }; > > - volume-down { > + key-volume-down { > gpios = <&pio 43 GPIO_ACTIVE_LOW>; > label = "volume_down"; > linux,code = <114>;
diff --git a/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts index 2b9bf8dd14ec..c2311733d2de 100644 --- a/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts +++ b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts @@ -40,13 +40,13 @@ cpu@1 { gpio-keys { compatible = "gpio-keys"; - factory { + factory-key { label = "factory"; linux,code = <BTN_0>; gpios = <&pio 0 GPIO_ACTIVE_HIGH>; }; - wps { + wps-key { label = "wps"; linux,code = <KEY_WPS_BUTTON>; gpios = <&pio 102 GPIO_ACTIVE_HIGH>; diff --git a/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts b/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts index 596c073d8b05..c28da9323a9c 100644 --- a/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts +++ b/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts @@ -42,13 +42,13 @@ gpio-keys { compatible = "gpio-keys"; poll-interval = <100>; - factory { + key-factory { label = "factory"; linux,code = <BTN_0>; gpios = <&pio 0 0>; }; - wps { + key-wps { label = "wps"; linux,code = <KEY_WPS_BUTTON>; gpios = <&pio 102 0>; diff --git a/arch/arm64/boot/dts/mediatek/mt8173-elm-hana-rev7.dts b/arch/arm64/boot/dts/mediatek/mt8173-elm-hana-rev7.dts index 44f6149c1307..28433b94f7c7 100644 --- a/arch/arm64/boot/dts/mediatek/mt8173-elm-hana-rev7.dts +++ b/arch/arm64/boot/dts/mediatek/mt8173-elm-hana-rev7.dts @@ -21,7 +21,7 @@ cpu_crit: cpu_crit0 { }; &gpio_keys { - /delete-node/tablet_mode; - /delete-node/volume_down; - /delete-node/volume_up; + /delete-node/switch-tablet-mode; + /delete-node/switch-volume-down; + /delete-node/switch-volume-up; }; diff --git a/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi b/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi index 9c75fbb31f98..d20378758213 100644 --- a/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi @@ -53,7 +53,7 @@ gpio_keys: gpio-keys { pinctrl-names = "default"; pinctrl-0 = <&gpio_keys_pins>; - lid { + switch-lid { label = "Lid"; gpios = <&pio 69 GPIO_ACTIVE_LOW>; linux,code = <SW_LID>; @@ -61,7 +61,7 @@ lid { gpio-key,wakeup; }; - power { + switch-power { label = "Power"; gpios = <&pio 14 GPIO_ACTIVE_HIGH>; linux,code = <KEY_POWER>; @@ -69,7 +69,7 @@ power { gpio-key,wakeup; }; - tablet_mode { + switch-tablet-mode { label = "Tablet_mode"; gpios = <&pio 121 GPIO_ACTIVE_HIGH>; linux,code = <SW_TABLET_MODE>; @@ -77,13 +77,13 @@ tablet_mode { gpio-key,wakeup; }; - volume_down { + switch-volume-down { label = "Volume_down"; gpios = <&pio 123 GPIO_ACTIVE_LOW>; linux,code = <KEY_VOLUMEDOWN>; }; - volume_up { + switch-volume-up { label = "Volume_up"; gpios = <&pio 124 GPIO_ACTIVE_LOW>; linux,code = <KEY_VOLUMEUP>; diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi index 2d7a193272ae..3ac83be53627 100644 --- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi @@ -73,7 +73,7 @@ volume_buttons: volume-buttons { pinctrl-names = "default"; pinctrl-0 = <&volume_button_pins>; - volume_down { + button-volume-down { label = "Volume Down"; linux,code = <KEY_VOLUMEDOWN>; debounce-interval = <100>; @@ -81,7 +81,7 @@ volume_down { gpios = <&pio 6 GPIO_ACTIVE_LOW>; }; - volume_up { + button-volume-up { label = "Volume Up"; linux,code = <KEY_VOLUMEUP>; debounce-interval = <100>; diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu.dtsi b/arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu.dtsi index 28966a65391b..50a0dd36b5fb 100644 --- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu.dtsi @@ -45,7 +45,7 @@ gpio-keys { pinctrl-names = "default"; pinctrl-0 = <&pen_eject>; - pen-insert { + switch-pen-insert { label = "Pen Insert"; /* Insert = low, eject = high */ gpios = <&pio 6 GPIO_ACTIVE_LOW>; diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi b/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi index b035e06840e6..b50261e8b9ed 100644 --- a/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi @@ -144,7 +144,7 @@ wifi_wakeup: wifi-wakeup { pinctrl-names = "default"; pinctrl-0 = <&wifi_pins_wakeup>; - wowlan { + button-wowlan { label = "Wake on WiFi"; gpios = <&pio 113 GPIO_ACTIVE_HIGH>; linux,code = <KEY_WAKEUP>; diff --git a/arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi b/arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi index 7a717f926929..8ee1529683a3 100644 --- a/arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi +++ b/arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi @@ -28,7 +28,7 @@ gpio-keys { pinctrl-names = "default"; pinctrl-0 = <&gpio_keys_default>; - volume-up { + key-volume-up { gpios = <&pio 42 GPIO_ACTIVE_LOW>; label = "volume_up"; linux,code = <115>; @@ -36,7 +36,7 @@ volume-up { debounce-interval = <15>; }; - volume-down { + key-volume-down { gpios = <&pio 43 GPIO_ACTIVE_LOW>; label = "volume_down"; linux,code = <114>;
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> --- .../boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts | 4 ++-- arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts | 4 ++-- arch/arm64/boot/dts/mediatek/mt8173-elm-hana-rev7.dts | 6 +++--- arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi | 10 +++++----- arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi | 4 ++-- arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu.dtsi | 2 +- arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 2 +- arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi | 4 ++-- 8 files changed, 18 insertions(+), 18 deletions(-)