diff mbox series

[13/20] ARM: dts: sun4i: Remove gpio-keys warnings

Message ID 247d527cb833713f487b97a2c95e30545273ac92.1507198895.git-series.maxime.ripard@free-electrons.com
State Accepted
Commit f42ff29980daa9c01915b30dbc6399b2a15c99f8
Headers show
Series sunxi: Cleanup DT warnings for the A10 and A80 | expand

Commit Message

Maxime Ripard Oct. 5, 2017, 10:49 a.m. UTC 
Some gpio-keys definitions in our DTs were having buttons defined with a
unit-address and that would generate a DTC warning.

Change the buttons node names to remove the warnings.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>

---
 arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts | 40 ++++++++++-----------
 arch/arm/boot/dts/sun4i-a10-pcduino.dts      |  6 +--
 2 files changed, 23 insertions(+), 23 deletions(-)

-- 
git-series 0.9.1

Comments

Chen-Yu Tsai Oct. 5, 2017, 3:51 p.m. UTC | #1 
On Thu, Oct 5, 2017 at 6:49 PM, Maxime Ripard
<maxime.ripard@free-electrons.com> wrote:
> Some gpio-keys definitions in our DTs were having buttons defined with a

> unit-address and that would generate a DTC warning.

>

> Change the buttons node names to remove the warnings.

>

> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>

> ---

>  arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts | 40 ++++++++++-----------

>  arch/arm/boot/dts/sun4i-a10-pcduino.dts      |  6 +--

>  2 files changed, 23 insertions(+), 23 deletions(-)

>

> diff --git a/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts b/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts

> index 7c7f12132ea3..13224f5ac166 100644

> --- a/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts

> +++ b/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts

> @@ -67,7 +67,7 @@

>                 #size-cells = <0>;

>                 poll-interval = <20>;

>

> -               button@0 {

> +               left-joystick-left {


Does this fit the naming scheme? Should we have "-button" suffices?

Otherwise,

Acked-by: Chen-Yu Tsai <wens@csie.org>
Maxime Ripard Oct. 6, 2017, 9:27 a.m. UTC | #2 
On Thu, Oct 05, 2017 at 03:51:02PM +0000, Chen-Yu Tsai wrote:
> On Thu, Oct 5, 2017 at 6:49 PM, Maxime Ripard

> <maxime.ripard@free-electrons.com> wrote:

> > Some gpio-keys definitions in our DTs were having buttons defined with a

> > unit-address and that would generate a DTC warning.

> >

> > Change the buttons node names to remove the warnings.

> >

> > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>

> > ---

> >  arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts | 40 ++++++++++-----------

> >  arch/arm/boot/dts/sun4i-a10-pcduino.dts      |  6 +--

> >  2 files changed, 23 insertions(+), 23 deletions(-)

> >

> > diff --git a/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts b/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts

> > index 7c7f12132ea3..13224f5ac166 100644

> > --- a/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts

> > +++ b/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts

> > @@ -67,7 +67,7 @@

> >                 #size-cells = <0>;

> >                 poll-interval = <20>;

> >

> > -               button@0 {

> > +               left-joystick-left {

> 

> Does this fit the naming scheme? Should we have "-button" suffices?


The example binding of gpio-keys just have the key name as node name,
just like most of the DT out there I could find.

Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
Chen-Yu Tsai Oct. 6, 2017, 10:25 a.m. UTC | #3 
On Fri, Oct 6, 2017 at 5:27 PM, Maxime Ripard
<maxime.ripard@free-electrons.com> wrote:
> On Thu, Oct 05, 2017 at 03:51:02PM +0000, Chen-Yu Tsai wrote:

>> On Thu, Oct 5, 2017 at 6:49 PM, Maxime Ripard

>> <maxime.ripard@free-electrons.com> wrote:

>> > Some gpio-keys definitions in our DTs were having buttons defined with a

>> > unit-address and that would generate a DTC warning.

>> >

>> > Change the buttons node names to remove the warnings.

>> >

>> > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>

>> > ---

>> >  arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts | 40 ++++++++++-----------

>> >  arch/arm/boot/dts/sun4i-a10-pcduino.dts      |  6 +--

>> >  2 files changed, 23 insertions(+), 23 deletions(-)

>> >

>> > diff --git a/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts b/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts

>> > index 7c7f12132ea3..13224f5ac166 100644

>> > --- a/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts

>> > +++ b/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts

>> > @@ -67,7 +67,7 @@

>> >                 #size-cells = <0>;

>> >                 poll-interval = <20>;

>> >

>> > -               button@0 {

>> > +               left-joystick-left {

>>

>> Does this fit the naming scheme? Should we have "-button" suffices?

>

> The example binding of gpio-keys just have the key name as node name,

> just like most of the DT out there I could find.


OK. Then

Acked-by: Chen-Yu Tsai <wens@csie.org>


On the topic of having the class in the node name, I'm not aware of
any rules governing it. It feels like I made it up along the way.
I'm not even sure if it is supposed to be context-specific, like
if the node is the pin controller, then all child nodes would be
pin mux settings, and don't need to have "pins" in their names.

So I'm not so sure about this anymore. Feel free to ignore these
types of comments. :)

ChenYu
diff mbox series

Patch

diff --git a/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts b/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts
index 7c7f12132ea3..13224f5ac166 100644
--- a/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts
+++ b/arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts
@@ -67,7 +67,7 @@ 
 		#size-cells = <0>;
 		poll-interval = <20>;
 
-		button@0 {
+		left-joystick-left {
 			label = "Left Joystick Left";
 			linux,code = <ABS_X>;
 			linux,input-type = <EV_ABS>;
@@ -75,7 +75,7 @@ 
 			gpios = <&pio 0 6 GPIO_ACTIVE_LOW>; /* PA6 */
 		};
 
-		button@1 {
+		left-joystick-right {
 			label = "Left Joystick Right";
 			linux,code = <ABS_X>;
 			linux,input-type = <EV_ABS>;
@@ -83,7 +83,7 @@ 
 			gpios = <&pio 0 5 GPIO_ACTIVE_LOW>; /* PA5 */
 		};
 
-		button@2 {
+		left-joystick-up {
 			label = "Left Joystick Up";
 			linux,code = <ABS_Y>;
 			linux,input-type = <EV_ABS>;
@@ -91,7 +91,7 @@ 
 			gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */
 		};
 
-		button@3 {
+		left-joystick-down {
 			label = "Left Joystick Down";
 			linux,code = <ABS_Y>;
 			linux,input-type = <EV_ABS>;
@@ -99,7 +99,7 @@ 
 			gpios = <&pio 0 9 GPIO_ACTIVE_LOW>; /* PA9 */
 		};
 
-		button@4 {
+		right-joystick-left {
 			label = "Right Joystick Left";
 			linux,code = <ABS_Z>;
 			linux,input-type = <EV_ABS>;
@@ -107,7 +107,7 @@ 
 			gpios = <&pio 0 1 GPIO_ACTIVE_LOW>; /* PA1 */
 		};
 
-		button@5 {
+		right-joystick-right {
 			label = "Right Joystick Right";
 			linux,code = <ABS_Z>;
 			linux,input-type = <EV_ABS>;
@@ -115,7 +115,7 @@ 
 			gpios = <&pio 0 0 GPIO_ACTIVE_LOW>; /* PA0 */
 		};
 
-		button@6 {
+		right-joystick-up {
 			label = "Right Joystick Up";
 			linux,code = <ABS_RZ>;
 			linux,input-type = <EV_ABS>;
@@ -123,7 +123,7 @@ 
 			gpios = <&pio 0 3 GPIO_ACTIVE_LOW>; /* PA3 */
 		};
 
-		button@7 {
+		right-joystick-down {
 			label = "Right Joystick Down";
 			linux,code = <ABS_RZ>;
 			linux,input-type = <EV_ABS>;
@@ -131,7 +131,7 @@ 
 			gpios = <&pio 0 4 GPIO_ACTIVE_LOW>; /* PA4 */
 		};
 
-		button@8 {
+		dpad-left {
 			label = "DPad Left";
 			linux,code = <ABS_HAT0X>;
 			linux,input-type = <EV_ABS>;
@@ -139,7 +139,7 @@ 
 			gpios = <&pio 7 23 GPIO_ACTIVE_LOW>; /* PH23 */
 		};
 
-		button@9 {
+		dpad-right {
 			label = "DPad Right";
 			linux,code = <ABS_HAT0X>;
 			linux,input-type = <EV_ABS>;
@@ -147,7 +147,7 @@ 
 			gpios = <&pio 7 24 GPIO_ACTIVE_LOW>; /* PH24 */
 		};
 
-		button@10 {
+		dpad-up {
 			label = "DPad Up";
 			linux,code = <ABS_HAT0Y>;
 			linux,input-type = <EV_ABS>;
@@ -155,7 +155,7 @@ 
 			gpios = <&pio 7 25 GPIO_ACTIVE_LOW>; /* PH25 */
 		};
 
-		button@11 {
+		dpad-down {
 			label = "DPad Down";
 			linux,code = <ABS_HAT0Y>;
 			linux,input-type = <EV_ABS>;
@@ -163,49 +163,49 @@ 
 			gpios = <&pio 7 26 GPIO_ACTIVE_LOW>; /* PH26 */
 		};
 
-		button@12 {
+		x {
 			label = "Button X";
 			linux,code = <BTN_X>;
 			gpios = <&pio 0 16 GPIO_ACTIVE_LOW>; /* PA16 */
 		};
 
-		button@13 {
+		y {
 			label = "Button Y";
 			linux,code = <BTN_Y>;
 			gpios = <&pio 0 14 GPIO_ACTIVE_LOW>; /* PA14 */
 		};
 
-		button@14 {
+		a {
 			label = "Button A";
 			linux,code = <BTN_A>;
 			gpios = <&pio 0 17 GPIO_ACTIVE_LOW>; /* PA17 */
 		};
 
-		button@15 {
+		b {
 			label = "Button B";
 			linux,code = <BTN_B>;
 			gpios = <&pio 0 15 GPIO_ACTIVE_LOW>; /* PA15 */
 		};
 
-		button@16 {
+		select {
 			label = "Select Button";
 			linux,code = <BTN_SELECT>;
 			gpios = <&pio 0 11 GPIO_ACTIVE_LOW>; /* PA11 */
 		};
 
-		button@17 {
+		start {
 			label = "Start Button";
 			linux,code = <BTN_START>;
 			gpios = <&pio 0 12 GPIO_ACTIVE_LOW>; /* PA12 */
 		};
 
-		button@18 {
+		top-left {
 			label = "Top Left Button";
 			linux,code = <BTN_TL>;
 			gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 */
 		};
 
-		button@19 {
+		top-right {
 			label = "Top Right Button";
 			linux,code = <BTN_TR>;
 			gpios = <&pio 0 13 GPIO_ACTIVE_LOW>; /* PA13 */
diff --git a/arch/arm/boot/dts/sun4i-a10-pcduino.dts b/arch/arm/boot/dts/sun4i-a10-pcduino.dts
index be7508cecd2e..6e140547b638 100644
--- a/arch/arm/boot/dts/sun4i-a10-pcduino.dts
+++ b/arch/arm/boot/dts/sun4i-a10-pcduino.dts
@@ -79,19 +79,19 @@ 
 		#address-cells = <1>;
 		#size-cells = <0>;
 
-		button@0 {
+		back {
 			label = "Key Back";
 			linux,code = <KEY_BACK>;
 			gpios = <&pio 7 17 GPIO_ACTIVE_LOW>;
 		};
 
-		button@1 {
+		home {
 			label = "Key Home";
 			linux,code = <KEY_HOME>;
 			gpios = <&pio 7 18 GPIO_ACTIVE_LOW>;
 		};
 
-		button@2 {
+		menu {
 			label = "Key Menu";
 			linux,code = <KEY_MENU>;
 			gpios = <&pio 7 19 GPIO_ACTIVE_LOW>;