Re: [PATCH] ARM: dts: am335x/am57xx: replace gpio-key,wakeup with wakeup-source property

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 




* Sudeep Holla <sudeep.holla@xxxxxxx> [160208 13:57]:
> Commit 3efda00129bd ("ARM: dts: am335x: replace gpio-key,wakeup with
> wakeup-source property") replaces all the legacy "gpio-key,wakeup" with
> the unified  "wakeup-source" property to prevent any further copy-paste
> duplication.
> 
> However couple of use of these legacy property sneaked in during the
> merge window. This patch replaces them too.
> 
> Cc: "Benoît Cousson" <bcousson@xxxxxxxxxxxx>
> Cc: Tony Lindgren <tony@xxxxxxxxxxx>
> Cc: linux-omap@xxxxxxxxxxxxxxx
> Signed-off-by: Sudeep Holla <sudeep.holla@xxxxxxx>
> ---
>  arch/arm/boot/dts/am335x-shc.dts          | 4 ++--
>  arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> Hi Tony,
> 
> I see these files got introduced during v4.5 merge window and we could
> not stop the copy-paste from the earlier versions files from which they
> were copied.

OK thanks for checking, applying this into omap-for-v4.5/fixes.

Regards,

Tony

> diff --git a/arch/arm/boot/dts/am335x-shc.dts b/arch/arm/boot/dts/am335x-shc.dts
> index 1b5b044fcd91..865de8500f1c 100644
> --- a/arch/arm/boot/dts/am335x-shc.dts
> +++ b/arch/arm/boot/dts/am335x-shc.dts
> @@ -46,7 +46,7 @@
>  			gpios = <&gpio1 29 GPIO_ACTIVE_HIGH>;
>  			linux,code = <KEY_BACK>;
>  			debounce-interval = <1000>;
> -			gpio-key,wakeup;
> +			wakeup-source;
>  		};
>  
>  		front_button {
> @@ -54,7 +54,7 @@
>  			gpios = <&gpio1 25 GPIO_ACTIVE_HIGH>;
>  			linux,code = <KEY_FRONT>;
>  			debounce-interval = <1000>;
> -			gpio-key,wakeup;
> +			wakeup-source;
>  		};
>  	};
>  
> diff --git a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts
> index c53882643ae9..497eb07ced19 100644
> --- a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts
> +++ b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts
> @@ -545,7 +545,7 @@
>  		ti,debounce-tol = /bits/ 16 <10>;
>  		ti,debounce-rep = /bits/ 16 <1>;
>  
> -		linux,wakeup;
> +		wakeup-source;
>  	};
>  };
>  
> -- 
> 1.9.1
> 
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Device Tree Compilter]     [Device Tree Spec]     [Linux Driver Backports]     [Video for Linux]     [Linux USB Devel]     [Linux PCI Devel]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [XFree86]     [Yosemite Backpacking]
  Powered by Linux