Re: [PATCH] arm64: dts: qcom: fix pm8150 gpio interrupts

[Bjorn Andersson]

On Mon 20 Apr 08:35 PDT 2020, Jonathan Marek wrote:

> This was mistakenly copied from the downstream dts, however the upstream
> driver works differently.
> 
> I only tested this with the pm8150_gpios node (used with volume button),
> but the 2 others should be the same.
> 
> Signed-off-by: Jonathan Marek <jonathan@xxxxxxxx>

Applied, thanks Jonathan

Regards,
Bjorn

> ---
>  arch/arm64/boot/dts/qcom/pm8150.dtsi  | 14 ++------------
>  arch/arm64/boot/dts/qcom/pm8150b.dtsi | 14 ++------------
>  arch/arm64/boot/dts/qcom/pm8150l.dtsi | 14 ++------------
>  3 files changed, 6 insertions(+), 36 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/qcom/pm8150.dtsi b/arch/arm64/boot/dts/qcom/pm8150.dtsi
> index b6e304748a57..c0b197458665 100644
> --- a/arch/arm64/boot/dts/qcom/pm8150.dtsi
> +++ b/arch/arm64/boot/dts/qcom/pm8150.dtsi
> @@ -73,18 +73,8 @@ pm8150_gpios: gpio@c000 {
>  			reg = <0xc000>;
>  			gpio-controller;
>  			#gpio-cells = <2>;
> -			interrupts = <0x0 0xc0 0x0 IRQ_TYPE_NONE>,
> -				     <0x0 0xc1 0x0 IRQ_TYPE_NONE>,
> -				     <0x0 0xc2 0x0 IRQ_TYPE_NONE>,
> -				     <0x0 0xc3 0x0 IRQ_TYPE_NONE>,
> -				     <0x0 0xc4 0x0 IRQ_TYPE_NONE>,
> -				     <0x0 0xc5 0x0 IRQ_TYPE_NONE>,
> -				     <0x0 0xc6 0x0 IRQ_TYPE_NONE>,
> -				     <0x0 0xc7 0x0 IRQ_TYPE_NONE>,
> -				     <0x0 0xc8 0x0 IRQ_TYPE_NONE>,
> -				     <0x0 0xc9 0x0 IRQ_TYPE_NONE>,
> -				     <0x0 0xca 0x0 IRQ_TYPE_NONE>,
> -				     <0x0 0xcb 0x0 IRQ_TYPE_NONE>;
> +			interrupt-controller;
> +			#interrupt-cells = <2>;
>  		};
>  	};
>  
> diff --git a/arch/arm64/boot/dts/qcom/pm8150b.dtsi b/arch/arm64/boot/dts/qcom/pm8150b.dtsi
> index 322379d5c31f..40b5d75a4a1d 100644
> --- a/arch/arm64/boot/dts/qcom/pm8150b.dtsi
> +++ b/arch/arm64/boot/dts/qcom/pm8150b.dtsi
> @@ -62,18 +62,8 @@ pm8150b_gpios: gpio@c000 {
>  			reg = <0xc000>;
>  			gpio-controller;
>  			#gpio-cells = <2>;
> -			interrupts = <0x2 0xc0 0x0 IRQ_TYPE_NONE>,
> -				     <0x2 0xc1 0x0 IRQ_TYPE_NONE>,
> -				     <0x2 0xc2 0x0 IRQ_TYPE_NONE>,
> -				     <0x2 0xc3 0x0 IRQ_TYPE_NONE>,
> -				     <0x2 0xc4 0x0 IRQ_TYPE_NONE>,
> -				     <0x2 0xc5 0x0 IRQ_TYPE_NONE>,
> -				     <0x2 0xc6 0x0 IRQ_TYPE_NONE>,
> -				     <0x2 0xc7 0x0 IRQ_TYPE_NONE>,
> -				     <0x2 0xc8 0x0 IRQ_TYPE_NONE>,
> -				     <0x2 0xc9 0x0 IRQ_TYPE_NONE>,
> -				     <0x2 0xca 0x0 IRQ_TYPE_NONE>,
> -				     <0x2 0xcb 0x0 IRQ_TYPE_NONE>;
> +			interrupt-controller;
> +			#interrupt-cells = <2>;
>  		};
>  	};
>  
> diff --git a/arch/arm64/boot/dts/qcom/pm8150l.dtsi b/arch/arm64/boot/dts/qcom/pm8150l.dtsi
> index eb0e9a090e42..cf05e0685d10 100644
> --- a/arch/arm64/boot/dts/qcom/pm8150l.dtsi
> +++ b/arch/arm64/boot/dts/qcom/pm8150l.dtsi
> @@ -56,18 +56,8 @@ pm8150l_gpios: gpio@c000 {
>  			reg = <0xc000>;
>  			gpio-controller;
>  			#gpio-cells = <2>;
> -			interrupts = <0x4 0xc0 0x0 IRQ_TYPE_NONE>,
> -				     <0x4 0xc1 0x0 IRQ_TYPE_NONE>,
> -				     <0x4 0xc2 0x0 IRQ_TYPE_NONE>,
> -				     <0x4 0xc3 0x0 IRQ_TYPE_NONE>,
> -				     <0x4 0xc4 0x0 IRQ_TYPE_NONE>,
> -				     <0x4 0xc5 0x0 IRQ_TYPE_NONE>,
> -				     <0x4 0xc6 0x0 IRQ_TYPE_NONE>,
> -				     <0x4 0xc7 0x0 IRQ_TYPE_NONE>,
> -				     <0x4 0xc8 0x0 IRQ_TYPE_NONE>,
> -				     <0x4 0xc9 0x0 IRQ_TYPE_NONE>,
> -				     <0x4 0xca 0x0 IRQ_TYPE_NONE>,
> -				     <0x4 0xcb 0x0 IRQ_TYPE_NONE>;
> +			interrupt-controller;
> +			#interrupt-cells = <2>;
>  		};
>  	};
>  
> -- 
> 2.26.1
>