| Message ID | 20220616005333.18491-19-krzysztof.kozlowski@linaro.org (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | dt-bindings: input: gpio-keys: rework matching children | expand |
On Wed, Jun 15, 2022 at 05:53:12PM -0700, Krzysztof Kozlowski wrote: [...] > diff --git a/arch/arm64/boot/dts/nvidia/tegra132-norrin.dts b/arch/arm64/boot/dts/nvidia/tegra132-norrin.dts > index f16acb4cabaa..62d58221ad3c 100644 > --- a/arch/arm64/boot/dts/nvidia/tegra132-norrin.dts > +++ b/arch/arm64/boot/dts/nvidia/tegra132-norrin.dts > @@ -1030,7 +1030,7 @@ clk32k_in: clock-32k { > gpio-keys { > compatible = "gpio-keys"; > > - lid { > + switch-lid { > label = "Lid"; > gpios = <&gpio TEGRA_GPIO(R, 4) GPIO_ACTIVE_LOW>; > linux,input-type = <5>; > @@ -1039,7 +1039,7 @@ lid { > wakeup-source; > }; > > - power { > + switch-power { This one is actually a key. [...] > diff --git a/arch/arm64/boot/dts/nvidia/tegra210-smaug.dts b/arch/arm64/boot/dts/nvidia/tegra210-smaug.dts > index a263d51882ee..8494c7b2961b 100644 > --- a/arch/arm64/boot/dts/nvidia/tegra210-smaug.dts > +++ b/arch/arm64/boot/dts/nvidia/tegra210-smaug.dts [...] > @@ -1772,7 +1772,7 @@ lid { > wakeup-source; > }; > > - tablet_mode { > + key-tablet-mode { > label = "Tablet Mode"; > gpios = <&gpio TEGRA_GPIO(Z, 2) GPIO_ACTIVE_HIGH>; > linux,input-type = <EV_SW>; And this one more like a switch since it's triggered by a magnet, as far as I understand. No need to resend, I can fix these up when I apply. Just let me know if you have any objections to me making those changes. Thierry
On 24/06/2022 18:08, Thierry Reding wrote: > On Wed, Jun 15, 2022 at 05:53:12PM -0700, Krzysztof Kozlowski wrote: > [...] >> diff --git a/arch/arm64/boot/dts/nvidia/tegra132-norrin.dts b/arch/arm64/boot/dts/nvidia/tegra132-norrin.dts >> index f16acb4cabaa..62d58221ad3c 100644 >> --- a/arch/arm64/boot/dts/nvidia/tegra132-norrin.dts >> +++ b/arch/arm64/boot/dts/nvidia/tegra132-norrin.dts >> @@ -1030,7 +1030,7 @@ clk32k_in: clock-32k { >> gpio-keys { >> compatible = "gpio-keys"; >> >> - lid { >> + switch-lid { >> label = "Lid"; >> gpios = <&gpio TEGRA_GPIO(R, 4) GPIO_ACTIVE_LOW>; >> linux,input-type = <5>; >> @@ -1039,7 +1039,7 @@ lid { >> wakeup-source; >> }; >> >> - power { >> + switch-power { > > This one is actually a key. > > [...] >> diff --git a/arch/arm64/boot/dts/nvidia/tegra210-smaug.dts b/arch/arm64/boot/dts/nvidia/tegra210-smaug.dts >> index a263d51882ee..8494c7b2961b 100644 >> --- a/arch/arm64/boot/dts/nvidia/tegra210-smaug.dts >> +++ b/arch/arm64/boot/dts/nvidia/tegra210-smaug.dts > [...] >> @@ -1772,7 +1772,7 @@ lid { >> wakeup-source; >> }; >> >> - tablet_mode { >> + key-tablet-mode { >> label = "Tablet Mode"; >> gpios = <&gpio TEGRA_GPIO(Z, 2) GPIO_ACTIVE_HIGH>; >> linux,input-type = <EV_SW>; > > And this one more like a switch since it's triggered by a magnet, as far > as I understand. > > No need to resend, I can fix these up when I apply. Just let me know if > you have any objections to me making those changes. Sounds good, thanks for catching these. Best regards, Krzysztof
On 24/06/2022 18:09, Krzysztof Kozlowski wrote: > On 24/06/2022 18:08, Thierry Reding wrote: >> On Wed, Jun 15, 2022 at 05:53:12PM -0700, Krzysztof Kozlowski wrote: >> [...] >>> diff --git a/arch/arm64/boot/dts/nvidia/tegra132-norrin.dts b/arch/arm64/boot/dts/nvidia/tegra132-norrin.dts >>> index f16acb4cabaa..62d58221ad3c 100644 >>> --- a/arch/arm64/boot/dts/nvidia/tegra132-norrin.dts >>> +++ b/arch/arm64/boot/dts/nvidia/tegra132-norrin.dts >>> @@ -1030,7 +1030,7 @@ clk32k_in: clock-32k { >>> gpio-keys { >>> compatible = "gpio-keys"; >>> >>> - lid { >>> + switch-lid { >>> label = "Lid"; >>> gpios = <&gpio TEGRA_GPIO(R, 4) GPIO_ACTIVE_LOW>; >>> linux,input-type = <5>; >>> @@ -1039,7 +1039,7 @@ lid { >>> wakeup-source; >>> }; >>> >>> - power { >>> + switch-power { >> >> This one is actually a key. >> >> [...] >>> diff --git a/arch/arm64/boot/dts/nvidia/tegra210-smaug.dts b/arch/arm64/boot/dts/nvidia/tegra210-smaug.dts >>> index a263d51882ee..8494c7b2961b 100644 >>> --- a/arch/arm64/boot/dts/nvidia/tegra210-smaug.dts >>> +++ b/arch/arm64/boot/dts/nvidia/tegra210-smaug.dts >> [...] >>> @@ -1772,7 +1772,7 @@ lid { >>> wakeup-source; >>> }; >>> >>> - tablet_mode { >>> + key-tablet-mode { >>> label = "Tablet Mode"; >>> gpios = <&gpio TEGRA_GPIO(Z, 2) GPIO_ACTIVE_HIGH>; >>> linux,input-type = <EV_SW>; >> >> And this one more like a switch since it's triggered by a magnet, as far >> as I understand. >> >> No need to resend, I can fix these up when I apply. Just let me know if >> you have any objections to me making those changes. > > Sounds good, thanks for catching these. Hi Thierry, To be more explicit - no objects for taking these, please apply. Best regards, Krzysztof
diff --git a/arch/arm64/boot/dts/nvidia/tegra132-norrin.dts b/arch/arm64/boot/dts/nvidia/tegra132-norrin.dts index f16acb4cabaa..62d58221ad3c 100644 --- a/arch/arm64/boot/dts/nvidia/tegra132-norrin.dts +++ b/arch/arm64/boot/dts/nvidia/tegra132-norrin.dts @@ -1030,7 +1030,7 @@ clk32k_in: clock-32k { gpio-keys { compatible = "gpio-keys"; - lid { + switch-lid { label = "Lid"; gpios = <&gpio TEGRA_GPIO(R, 4) GPIO_ACTIVE_LOW>; linux,input-type = <5>; @@ -1039,7 +1039,7 @@ lid { wakeup-source; }; - power { + switch-power { label = "Power"; gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>; linux,code = <KEY_POWER>; diff --git a/arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts b/arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts index bd1897707fcc..47cf2013afcc 100644 --- a/arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts +++ b/arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts @@ -2478,7 +2478,7 @@ sata@3507000 { gpio-keys { compatible = "gpio-keys"; - power { + key-power { label = "Power"; gpios = <&gpio_aon TEGRA186_AON_GPIO(FF, 0) GPIO_ACTIVE_LOW>; @@ -2489,7 +2489,7 @@ power { wakeup-source; }; - volume-up { + key-volume-up { label = "Volume Up"; gpios = <&gpio_aon TEGRA186_AON_GPIO(FF, 1) GPIO_ACTIVE_LOW>; @@ -2498,7 +2498,7 @@ volume-up { debounce-interval = <10>; }; - volume-down { + key-volume-down { label = "Volume Down"; gpios = <&gpio_aon TEGRA186_AON_GPIO(FF, 2) GPIO_ACTIVE_LOW>; diff --git a/arch/arm64/boot/dts/nvidia/tegra186-p3509-0000+p3636-0001.dts b/arch/arm64/boot/dts/nvidia/tegra186-p3509-0000+p3636-0001.dts index 7e9aad9ff177..3e83a4d52eb1 100644 --- a/arch/arm64/boot/dts/nvidia/tegra186-p3509-0000+p3636-0001.dts +++ b/arch/arm64/boot/dts/nvidia/tegra186-p3509-0000+p3636-0001.dts @@ -360,7 +360,7 @@ fan: pwm-fan { gpio-keys { compatible = "gpio-keys"; - power { + key-power { label = "Power"; gpios = <&gpio_aon TEGRA186_AON_GPIO(FF, 0) GPIO_ACTIVE_LOW>; @@ -371,7 +371,7 @@ power { wakeup-source; }; - volume-up { + key-volume-up { label = "Volume Up"; gpios = <&gpio_aon TEGRA186_AON_GPIO(FF, 1) GPIO_ACTIVE_LOW>; @@ -380,7 +380,7 @@ volume-up { debounce-interval = <10>; }; - volume-down { + key-volume-down { label = "Volume Down"; gpios = <&gpio_aon TEGRA186_AON_GPIO(FF, 2) GPIO_ACTIVE_LOW>; diff --git a/arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts b/arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts index fafd7073d18c..bc1041d11f6d 100644 --- a/arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts +++ b/arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts @@ -2258,7 +2258,7 @@ fan: pwm-fan { gpio-keys { compatible = "gpio-keys"; - force-recovery { + key-force-recovery { label = "Force Recovery"; gpios = <&gpio TEGRA194_MAIN_GPIO(G, 0) GPIO_ACTIVE_LOW>; @@ -2267,7 +2267,7 @@ force-recovery { debounce-interval = <10>; }; - power { + key-power { label = "Power"; gpios = <&gpio_aon TEGRA194_AON_GPIO(EE, 4) GPIO_ACTIVE_LOW>; diff --git a/arch/arm64/boot/dts/nvidia/tegra194-p3509-0000.dtsi b/arch/arm64/boot/dts/nvidia/tegra194-p3509-0000.dtsi index 4cee935e44a5..273a1ef716b6 100644 --- a/arch/arm64/boot/dts/nvidia/tegra194-p3509-0000.dtsi +++ b/arch/arm64/boot/dts/nvidia/tegra194-p3509-0000.dtsi @@ -2262,7 +2262,7 @@ fan: pwm-fan { gpio-keys { compatible = "gpio-keys"; - force-recovery { + key-force-recovery { label = "Force Recovery"; gpios = <&gpio TEGRA194_MAIN_GPIO(G, 0) GPIO_ACTIVE_LOW>; @@ -2271,7 +2271,7 @@ force-recovery { debounce-interval = <10>; }; - power { + key-power { label = "Power"; gpios = <&gpio_aon TEGRA194_AON_GPIO(EE, 4) GPIO_ACTIVE_LOW>; diff --git a/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi b/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi index 4b43b89a9651..a44c56c1e56e 100644 --- a/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi +++ b/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi @@ -1530,20 +1530,20 @@ gpio-keys { compatible = "gpio-keys"; label = "gpio-keys"; - power { + key-power { label = "Power"; gpios = <&gpio TEGRA_GPIO(X, 5) GPIO_ACTIVE_LOW>; linux,code = <KEY_POWER>; wakeup-source; }; - volume_down { + key-volume-down { label = "Volume Down"; gpios = <&gpio TEGRA_GPIO(Y, 0) GPIO_ACTIVE_LOW>; linux,code = <KEY_VOLUMEDOWN>; }; - volume_up { + key-volume-up { label = "Volume Up"; gpios = <&gpio TEGRA_GPIO(X, 6) GPIO_ACTIVE_LOW>; linux,code = <KEY_VOLUMEUP>; diff --git a/arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi b/arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi index 10347b6e6e84..8e657b10569d 100644 --- a/arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi +++ b/arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi @@ -1596,7 +1596,7 @@ gpio-keys { compatible = "gpio-keys"; status = "okay"; - power { + key-power { debounce-interval = <30>; gpios = <&gpio TEGRA_GPIO(X, 7) GPIO_ACTIVE_LOW>; label = "Power"; diff --git a/arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts b/arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts index 749b44cf3ffa..37678c337a34 100644 --- a/arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts +++ b/arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts @@ -1802,7 +1802,7 @@ cpu-passive { gpio-keys { compatible = "gpio-keys"; - power { + key-power { label = "Power"; gpios = <&gpio TEGRA_GPIO(X, 5) GPIO_ACTIVE_LOW>; linux,input-type = <EV_KEY>; @@ -1812,7 +1812,7 @@ power { wakeup-source; }; - force-recovery { + key-force-recovery { label = "Force Recovery"; gpios = <&gpio TEGRA_GPIO(X, 6) GPIO_ACTIVE_LOW>; linux,input-type = <EV_KEY>; diff --git a/arch/arm64/boot/dts/nvidia/tegra210-smaug.dts b/arch/arm64/boot/dts/nvidia/tegra210-smaug.dts index a263d51882ee..8494c7b2961b 100644 --- a/arch/arm64/boot/dts/nvidia/tegra210-smaug.dts +++ b/arch/arm64/boot/dts/nvidia/tegra210-smaug.dts @@ -1756,7 +1756,7 @@ cpu-sleep { gpio-keys { compatible = "gpio-keys"; - power { + key-power { label = "Power"; gpios = <&gpio TEGRA_GPIO(X, 5) GPIO_ACTIVE_LOW>; linux,code = <KEY_POWER>; @@ -1764,7 +1764,7 @@ power { wakeup-source; }; - lid { + switch-lid { label = "Lid"; gpios = <&gpio TEGRA_GPIO(B, 4) GPIO_ACTIVE_LOW>; linux,input-type = <EV_SW>; @@ -1772,7 +1772,7 @@ lid { wakeup-source; }; - tablet_mode { + key-tablet-mode { label = "Tablet Mode"; gpios = <&gpio TEGRA_GPIO(Z, 2) GPIO_ACTIVE_HIGH>; linux,input-type = <EV_SW>; @@ -1780,13 +1780,13 @@ tablet_mode { wakeup-source; }; - volume_down { + key-volume-down { label = "Volume Down"; gpios = <&gpio TEGRA_GPIO(X, 7) GPIO_ACTIVE_LOW>; linux,code = <KEY_VOLUMEDOWN>; }; - volume_up { + key-volume-up { label = "Volume Up"; gpios = <&gpio TEGRA_GPIO(M, 4) GPIO_ACTIVE_LOW>; linux,code = <KEY_VOLUMEUP>; diff --git a/arch/arm64/boot/dts/nvidia/tegra234-p3737-0000+p3701-0000.dts b/arch/arm64/boot/dts/nvidia/tegra234-p3737-0000+p3701-0000.dts index 3f6c399e3371..02a10bb38562 100644 --- a/arch/arm64/boot/dts/nvidia/tegra234-p3737-0000+p3701-0000.dts +++ b/arch/arm64/boot/dts/nvidia/tegra234-p3737-0000+p3701-0000.dts @@ -2021,14 +2021,14 @@ gpio-keys { compatible = "gpio-keys"; status = "okay"; - force-recovery { + key-force-recovery { label = "Force Recovery"; gpios = <&gpio TEGRA234_MAIN_GPIO(G, 0) GPIO_ACTIVE_LOW>; linux,input-type = <EV_KEY>; linux,code = <BTN_1>; }; - power-key { + key-power { label = "Power"; gpios = <&gpio_aon TEGRA234_AON_GPIO(EE, 4) GPIO_ACTIVE_LOW>; linux,input-type = <EV_KEY>; @@ -2037,7 +2037,7 @@ power-key { wakeup-source; }; - suspend { + key-suspend { label = "Suspend"; gpios = <&gpio TEGRA234_MAIN_GPIO(G, 2) GPIO_ACTIVE_LOW>; linux,input-type = <EV_KEY>;
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/arm64/boot/dts/nvidia/tegra132-norrin.dts | 4 ++-- arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts | 6 +++--- .../boot/dts/nvidia/tegra186-p3509-0000+p3636-0001.dts | 6 +++--- arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts | 4 ++-- arch/arm64/boot/dts/nvidia/tegra194-p3509-0000.dtsi | 4 ++-- arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi | 6 +++--- arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi | 2 +- arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts | 4 ++-- arch/arm64/boot/dts/nvidia/tegra210-smaug.dts | 10 +++++----- .../boot/dts/nvidia/tegra234-p3737-0000+p3701-0000.dts | 6 +++--- 10 files changed, 26 insertions(+), 26 deletions(-)