devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [v4.14-stable] arm64: dts: stratix10: Fix SPI IRQ for Stratix10
@ 2018-07-05 22:18 thor.thayer
  2018-07-10 13:50 ` Greg KH
  0 siblings, 1 reply; 2+ messages in thread
From: thor.thayer @ 2018-07-05 22:18 UTC (permalink / raw)
  To: dinguyen
  Cc: robh+dt, mark.rutland, catalin.marinas, will.deacon, devicetree,
	linux-arm-kernel, Thor Thayer, # 4 . 9 . x

From: Thor Thayer <thor.thayer@linux.intel.com>

Fix the SPI interrupt numbers for Stratix10.

This is a backport for stable 4.9.x and 4.14.x branches.
(original includes other changes that are not relevant
to this branch):

[backport 'commit 889d15090420 ("arm64: dts: stratix10:
    fix SPI settings")']

Cc: <stable@vger.kernel.org>  # 4.9.x
Cc: <stable@vger.kernel.org>  # 4.14.x
Fixes: 78cd6a9d8e154 ("arm64: dts: Add base stratix 10 dtsi")
Signed-off-by: Thor Thayer <thor.thayer@linux.intel.com>
---
 arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
index 57f75453ee93..5db972c0492f 100644
--- a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
+++ b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
@@ -230,7 +230,7 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <0xffda4000 0x1000>;
-			interrupts = <0 101 4>;
+			interrupts = <0 99 4>;
 			num-cs = <4>;
 			status = "disabled";
 		};
@@ -240,7 +240,7 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <0xffda5000 0x1000>;
-			interrupts = <0 102 4>;
+			interrupts = <0 100 4>;
 			num-cs = <4>;
 			status = "disabled";
 		};
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [v4.14-stable] arm64: dts: stratix10: Fix SPI IRQ for Stratix10
  2018-07-05 22:18 [v4.14-stable] arm64: dts: stratix10: Fix SPI IRQ for Stratix10 thor.thayer
@ 2018-07-10 13:50 ` Greg KH
  0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2018-07-10 13:50 UTC (permalink / raw)
  To: thor.thayer
  Cc: dinguyen, robh+dt, mark.rutland, catalin.marinas, will.deacon,
	devicetree, linux-arm-kernel, # 4 . 9 . x

On Thu, Jul 05, 2018 at 05:18:34PM -0500, thor.thayer@linux.intel.com wrote:
> From: Thor Thayer <thor.thayer@linux.intel.com>
> 
> Fix the SPI interrupt numbers for Stratix10.
> 
> This is a backport for stable 4.9.x and 4.14.x branches.
> (original includes other changes that are not relevant
> to this branch):
> 
> [backport 'commit 889d15090420 ("arm64: dts: stratix10:
>     fix SPI settings")']
> 
> Cc: <stable@vger.kernel.org>  # 4.9.x
> Cc: <stable@vger.kernel.org>  # 4.14.x
> Fixes: 78cd6a9d8e154 ("arm64: dts: Add base stratix 10 dtsi")
> Signed-off-by: Thor Thayer <thor.thayer@linux.intel.com>
> ---
>  arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
> index 57f75453ee93..5db972c0492f 100644
> --- a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
> +++ b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
> @@ -230,7 +230,7 @@
>  			#address-cells = <1>;
>  			#size-cells = <0>;
>  			reg = <0xffda4000 0x1000>;
> -			interrupts = <0 101 4>;
> +			interrupts = <0 99 4>;
>  			num-cs = <4>;
>  			status = "disabled";
>  		};
> @@ -240,7 +240,7 @@
>  			#address-cells = <1>;
>  			#size-cells = <0>;
>  			reg = <0xffda5000 0x1000>;
> -			interrupts = <0 102 4>;
> +			interrupts = <0 100 4>;
>  			num-cs = <4>;
>  			status = "disabled";
>  		};
> -- 
> 2.7.4

This patch does not apply at all to 4.14.y :(

Please fix up and resend.  Same for 4.9.

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2018-07-10 13:50 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-07-05 22:18 [v4.14-stable] arm64: dts: stratix10: Fix SPI IRQ for Stratix10 thor.thayer
2018-07-10 13:50 ` Greg KH

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).