2021-03-06 20:38:56

by Jernej Skrabec

[permalink] [raw]
Subject: [PATCH] ARM: dts: sun8i: h3: beelink-x2: Add power button

Beelink X2 has power button. Add node for it.

Signed-off-by: Jernej Skrabec <[email protected]>
---
arch/arm/boot/dts/sun8i-h3-beelink-x2.dts | 11 +++++++++++
1 file changed, 11 insertions(+)

diff --git a/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts b/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts
index 62b5280ec093..4a2cb072ecf6 100644
--- a/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts
+++ b/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts
@@ -111,6 +111,17 @@ spdif_out: spdif-out {
#sound-dai-cells = <0>;
compatible = "linux,spdif-dit";
};
+
+ r_gpio_keys {
+ compatible = "gpio-keys";
+
+ power {
+ label = "power";
+ linux,code = <KEY_POWER>;
+ gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>;
+ wakeup-source;
+ };
+ };
};

&de {
--
2.30.1


2021-03-08 13:07:12

by Maxime Ripard

[permalink] [raw]
Subject: Re: [PATCH] ARM: dts: sun8i: h3: beelink-x2: Add power button

Hi

On Sat, Mar 06, 2021 at 09:36:11PM +0100, Jernej Skrabec wrote:
> Beelink X2 has power button. Add node for it.
>
> Signed-off-by: Jernej Skrabec <[email protected]>
> ---
> arch/arm/boot/dts/sun8i-h3-beelink-x2.dts | 11 +++++++++++
> 1 file changed, 11 insertions(+)
>
> diff --git a/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts b/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts
> index 62b5280ec093..4a2cb072ecf6 100644
> --- a/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts
> +++ b/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts
> @@ -111,6 +111,17 @@ spdif_out: spdif-out {
> #sound-dai-cells = <0>;
> compatible = "linux,spdif-dit";
> };
> +
> + r_gpio_keys {

Underscores are not valid for node names (and will trigger a dtc warning
when running with W=1).

> + compatible = "gpio-keys";
> +
> + power {
> + label = "power";

IIRC the node name is used as a fallback when the label isn't there?

Maxime


Attachments:
(No filename) (948.00 B)
signature.asc (235.00 B)
Download all attachments

2021-03-11 22:01:34

by Jernej Skrabec

[permalink] [raw]
Subject: Re: Re: [PATCH] ARM: dts: sun8i: h3: beelink-x2: Add power button

Hi!

Dne ponedeljek, 08. marec 2021 ob 14:05:06 CET je Maxime Ripard napisal(a):
> Hi
>
> On Sat, Mar 06, 2021 at 09:36:11PM +0100, Jernej Skrabec wrote:
> > Beelink X2 has power button. Add node for it.
> >
> > Signed-off-by: Jernej Skrabec <[email protected]>
> > ---
> > arch/arm/boot/dts/sun8i-h3-beelink-x2.dts | 11 +++++++++++
> > 1 file changed, 11 insertions(+)
> >
> > diff --git a/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts b/arch/arm/boot/dts/
sun8i-h3-beelink-x2.dts
> > index 62b5280ec093..4a2cb072ecf6 100644
> > --- a/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts
> > +++ b/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts
> > @@ -111,6 +111,17 @@ spdif_out: spdif-out {
> > #sound-dai-cells = <0>;
> > compatible = "linux,spdif-dit";
> > };
> > +
> > + r_gpio_keys {
>
> Underscores are not valid for node names (and will trigger a dtc warning
> when running with W=1).

Unless I'm doing something wrong, I didn't get any warning with "make dtbs
W=1". In fact many H3 boards have a node with this name and not a single
warning is produced with this command for underscores (there are other
warnings though).

Actually, several H3 DT files have nodes like "sound_spdif" or "wifi_pwrseq". It
seems like warnings are triggered only for children of soc node.

>
> > + compatible = "gpio-keys";
> > +
> > + power {
> > + label = "power";
>
> IIRC the node name is used as a fallback when the label isn't there?

Binding doesn't say anything about what happens if label is missing. Driver
sets generic description "gpio_keys" in such case, which is not something that
we want.

Best regards,
Jernej

>
> Maxime
>


2021-03-15 15:05:46

by Maxime Ripard

[permalink] [raw]
Subject: Re: [PATCH] ARM: dts: sun8i: h3: beelink-x2: Add power button

Hi,

On Thu, Mar 11, 2021 at 10:59:35PM +0100, Jernej Škrabec wrote:
> Hi!
>
> Dne ponedeljek, 08. marec 2021 ob 14:05:06 CET je Maxime Ripard napisal(a):
> > Hi
> >
> > On Sat, Mar 06, 2021 at 09:36:11PM +0100, Jernej Skrabec wrote:
> > > Beelink X2 has power button. Add node for it.
> > >
> > > Signed-off-by: Jernej Skrabec <[email protected]>
> > > ---
> > > arch/arm/boot/dts/sun8i-h3-beelink-x2.dts | 11 +++++++++++
> > > 1 file changed, 11 insertions(+)
> > >
> > > diff --git a/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts b/arch/arm/boot/dts/
> sun8i-h3-beelink-x2.dts
> > > index 62b5280ec093..4a2cb072ecf6 100644
> > > --- a/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts
> > > +++ b/arch/arm/boot/dts/sun8i-h3-beelink-x2.dts
> > > @@ -111,6 +111,17 @@ spdif_out: spdif-out {
> > > #sound-dai-cells = <0>;
> > > compatible = "linux,spdif-dit";
> > > };
> > > +
> > > + r_gpio_keys {
> >
> > Underscores are not valid for node names (and will trigger a dtc warning
> > when running with W=1).
>
> Unless I'm doing something wrong, I didn't get any warning with "make dtbs
> W=1". In fact many H3 boards have a node with this name and not a single
> warning is produced with this command for underscores (there are other
> warnings though).

It looks like I've been remembering it wrong, and it's actually W=2 that
reports it, but it's here nonetheless :)

Maxime


Attachments:
(No filename) (1.40 kB)
signature.asc (235.00 B)
Download all attachments