diff mbox series

[v2,45/48] ARM: dts: at91: correct gpio-keys properties

Message ID 20220609114047.380793-6-krzysztof.kozlowski@linaro.org (mailing list archive)
State New, archived
Headers show
Series None | expand

Commit Message

Krzysztof Kozlowski June 9, 2022, 11:40 a.m. UTC 
gpio-keys children do not use unit addresses.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 arch/arm/boot/dts/at91-kizbox.dts             | 2 --
 arch/arm/boot/dts/at91-kizbox2-common.dtsi    | 2 --
 arch/arm/boot/dts/at91-kizboxmini-common.dtsi | 2 --
 arch/arm/boot/dts/at91-qil_a9260.dts          | 2 --
 arch/arm/boot/dts/at91-wb45n.dts              | 5 +----
 arch/arm/boot/dts/at91-wb50n.dts              | 8 ++------
 6 files changed, 3 insertions(+), 18 deletions(-)

Comments

Claudiu Beznea June 10, 2022, 7:12 a.m. UTC | #1 
On 09.06.2022 14:40, Krzysztof Kozlowski wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
> 
> gpio-keys children do not use unit addresses.
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>


> ---
>  arch/arm/boot/dts/at91-kizbox.dts             | 2 --
>  arch/arm/boot/dts/at91-kizbox2-common.dtsi    | 2 --
>  arch/arm/boot/dts/at91-kizboxmini-common.dtsi | 2 --
>  arch/arm/boot/dts/at91-qil_a9260.dts          | 2 --
>  arch/arm/boot/dts/at91-wb45n.dts              | 5 +----
>  arch/arm/boot/dts/at91-wb50n.dts              | 8 ++------
>  6 files changed, 3 insertions(+), 18 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/at91-kizbox.dts b/arch/arm/boot/dts/at91-kizbox.dts
> index 87e972eb2ba6..307663b4eec2 100644
> --- a/arch/arm/boot/dts/at91-kizbox.dts
> +++ b/arch/arm/boot/dts/at91-kizbox.dts
> @@ -30,8 +30,6 @@ main_xtal {
> 
>         gpio-keys {
>                 compatible = "gpio-keys";
> -               #address-cells = <1>;
> -               #size-cells = <0>;
> 
>                 button-reset {
>                         label = "PB_RST";
> diff --git a/arch/arm/boot/dts/at91-kizbox2-common.dtsi b/arch/arm/boot/dts/at91-kizbox2-common.dtsi
> index ed7146e23147..e5e21dff882f 100644
> --- a/arch/arm/boot/dts/at91-kizbox2-common.dtsi
> +++ b/arch/arm/boot/dts/at91-kizbox2-common.dtsi
> @@ -33,8 +33,6 @@ main_xtal {
> 
>         gpio-keys {
>                 compatible = "gpio-keys";
> -               #address-cells = <1>;
> -               #size-cells = <0>;
> 
>                 button-prog {
>                         label = "PB_PROG";
> diff --git a/arch/arm/boot/dts/at91-kizboxmini-common.dtsi b/arch/arm/boot/dts/at91-kizboxmini-common.dtsi
> index 8fb08e6fad7a..42640fe6b6d0 100644
> --- a/arch/arm/boot/dts/at91-kizboxmini-common.dtsi
> +++ b/arch/arm/boot/dts/at91-kizboxmini-common.dtsi
> @@ -36,8 +36,6 @@ adc_op_clk {
> 
>         gpio_keys {
>                 compatible = "gpio-keys";
> -               #address-cells = <1>;
> -               #size-cells = <0>;
> 
>                 key-prog {
>                         label = "PB_PROG";
> diff --git a/arch/arm/boot/dts/at91-qil_a9260.dts b/arch/arm/boot/dts/at91-qil_a9260.dts
> index d09b3d15a828..9d26f9996348 100644
> --- a/arch/arm/boot/dts/at91-qil_a9260.dts
> +++ b/arch/arm/boot/dts/at91-qil_a9260.dts
> @@ -198,8 +198,6 @@ user_led {
> 
>         gpio_keys {
>                 compatible = "gpio-keys";
> -               #address-cells = <1>;
> -               #size-cells = <0>;
> 
>                 button-user {
>                         label = "user_pb";
> diff --git a/arch/arm/boot/dts/at91-wb45n.dts b/arch/arm/boot/dts/at91-wb45n.dts
> index 3e46b29412d1..ef73f727f7bd 100644
> --- a/arch/arm/boot/dts/at91-wb45n.dts
> +++ b/arch/arm/boot/dts/at91-wb45n.dts
> @@ -14,11 +14,8 @@ / {
> 
>         gpio-keys {
>                 compatible = "gpio-keys";
> -               #address-cells = <1>;
> -               #size-cells = <0>;
> 
> -               irqbtn@18 {
> -                       reg = <18>;
> +               button {
>                         label = "IRQBTN";
>                         linux,code = <99>;
>                         gpios = <&pioB 18 GPIO_ACTIVE_LOW>;
> diff --git a/arch/arm/boot/dts/at91-wb50n.dts b/arch/arm/boot/dts/at91-wb50n.dts
> index e2195bd3e4b4..ec2becf6133b 100644
> --- a/arch/arm/boot/dts/at91-wb50n.dts
> +++ b/arch/arm/boot/dts/at91-wb50n.dts
> @@ -15,19 +15,15 @@ / {
> 
>         gpio-keys {
>                 compatible = "gpio-keys";
> -               #address-cells = <1>;
> -               #size-cells = <0>;
> 
> -               btn0@10 {
> -                       reg = <10>;
> +               button-0 {
>                         label = "BTNESC";
>                         linux,code = <1>; /* ESC button */
>                         gpios = <&pioA 10 GPIO_ACTIVE_LOW>;
>                         wakeup-source;
>                 };
> 
> -               irqbtn@31 {
> -                       reg = <31>;
> +               button-1 {
>                         label = "IRQBTN";
>                         linux,code = <99>; /* SysReq button */
>                         gpios = <&pioE 31 GPIO_ACTIVE_LOW>;
> --
> 2.34.1
>
diff mbox series

Patch

diff --git a/arch/arm/boot/dts/at91-kizbox.dts b/arch/arm/boot/dts/at91-kizbox.dts
index 87e972eb2ba6..307663b4eec2 100644
--- a/arch/arm/boot/dts/at91-kizbox.dts
+++ b/arch/arm/boot/dts/at91-kizbox.dts
@@ -30,8 +30,6 @@  main_xtal {
 
 	gpio-keys {
 		compatible = "gpio-keys";
-		#address-cells = <1>;
-		#size-cells = <0>;
 
 		button-reset {
 			label = "PB_RST";
diff --git a/arch/arm/boot/dts/at91-kizbox2-common.dtsi b/arch/arm/boot/dts/at91-kizbox2-common.dtsi
index ed7146e23147..e5e21dff882f 100644
--- a/arch/arm/boot/dts/at91-kizbox2-common.dtsi
+++ b/arch/arm/boot/dts/at91-kizbox2-common.dtsi
@@ -33,8 +33,6 @@  main_xtal {
 
 	gpio-keys {
 		compatible = "gpio-keys";
-		#address-cells = <1>;
-		#size-cells = <0>;
 
 		button-prog {
 			label = "PB_PROG";
diff --git a/arch/arm/boot/dts/at91-kizboxmini-common.dtsi b/arch/arm/boot/dts/at91-kizboxmini-common.dtsi
index 8fb08e6fad7a..42640fe6b6d0 100644
--- a/arch/arm/boot/dts/at91-kizboxmini-common.dtsi
+++ b/arch/arm/boot/dts/at91-kizboxmini-common.dtsi
@@ -36,8 +36,6 @@  adc_op_clk {
 
 	gpio_keys {
 		compatible = "gpio-keys";
-		#address-cells = <1>;
-		#size-cells = <0>;
 
 		key-prog {
 			label = "PB_PROG";
diff --git a/arch/arm/boot/dts/at91-qil_a9260.dts b/arch/arm/boot/dts/at91-qil_a9260.dts
index d09b3d15a828..9d26f9996348 100644
--- a/arch/arm/boot/dts/at91-qil_a9260.dts
+++ b/arch/arm/boot/dts/at91-qil_a9260.dts
@@ -198,8 +198,6 @@  user_led {
 
 	gpio_keys {
 		compatible = "gpio-keys";
-		#address-cells = <1>;
-		#size-cells = <0>;
 
 		button-user {
 			label = "user_pb";
diff --git a/arch/arm/boot/dts/at91-wb45n.dts b/arch/arm/boot/dts/at91-wb45n.dts
index 3e46b29412d1..ef73f727f7bd 100644
--- a/arch/arm/boot/dts/at91-wb45n.dts
+++ b/arch/arm/boot/dts/at91-wb45n.dts
@@ -14,11 +14,8 @@  / {
 
 	gpio-keys {
 		compatible = "gpio-keys";
-		#address-cells = <1>;
-		#size-cells = <0>;
 
-		irqbtn@18 {
-			reg = <18>;
+		button {
 			label = "IRQBTN";
 			linux,code = <99>;
 			gpios = <&pioB 18 GPIO_ACTIVE_LOW>;
diff --git a/arch/arm/boot/dts/at91-wb50n.dts b/arch/arm/boot/dts/at91-wb50n.dts
index e2195bd3e4b4..ec2becf6133b 100644
--- a/arch/arm/boot/dts/at91-wb50n.dts
+++ b/arch/arm/boot/dts/at91-wb50n.dts
@@ -15,19 +15,15 @@  / {
 
 	gpio-keys {
 		compatible = "gpio-keys";
-		#address-cells = <1>;
-		#size-cells = <0>;
 
-		btn0@10 {
-			reg = <10>;
+		button-0 {
 			label = "BTNESC";
 			linux,code = <1>; /* ESC button */
 			gpios = <&pioA 10 GPIO_ACTIVE_LOW>;
 			wakeup-source;
 		};
 
-		irqbtn@31 {
-			reg = <31>;
+		button-1 {
 			label = "IRQBTN";
 			linux,code = <99>; /* SysReq button */
 			gpios = <&pioE 31 GPIO_ACTIVE_LOW>;