diff mbox series

ARM: dts: sun8i: h3: beelink-x2: Add power button

Message ID 20210306203611.15534-1-jernej.skrabec@siol.net
State Superseded
Headers show
Series ARM: dts: sun8i: h3: beelink-x2: Add power button | expand

Commit Message

Jernej Škrabec March 6, 2021, 8:36 p.m. UTC
Beelink X2 has power button. Add node for it.

Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
---
 arch/arm/boot/dts/sun8i-h3-beelink-x2.dts | 11 +++++++++++
 1 file changed, 11 insertions(+)

Comments

Maxime Ripard March 8, 2021, 1:05 p.m. UTC | #1
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 <jernej.skrabec@siol.net>

> ---

>  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
Jernej Škrabec March 11, 2021, 9:59 p.m. UTC | #2
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 <jernej.skrabec@siol.net>

> > ---

> >  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

>
Maxime Ripard March 15, 2021, 3:03 p.m. UTC | #3
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 <jernej.skrabec@siol.net>

> > > ---

> > >  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
diff mbox series

Patch

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 {