From: Olof Johansson <olof@lixom.net>
Date: Sat, 19 Nov 2016 02:01:09 +0000 (-0800)
Subject: Merge tag 'samsung-dt-gic-flags-4.10' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v4.14-rc1~1853^2~22
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b4cf33e96aea01225797da0f7f50df2ebfc830a3;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'samsung-dt-gic-flags-4.10' of git://git./linux/kernel/git/krzk/linux into next/dt

Topic branch with DT changes for v4.10.

Fix invalid GIC interrupt flags - type IRQ_TYPE_NONE is not allowed for GIC
interrupts.  Although this was working but with error messages like:
	genirq: Setting trigger mode 0 for irq 16 failed

Use level high interrupt instead of type none.  The choice of level high was
rather an arbitrary decision hoping it will work on each platform.  Tests shown
no issues so far.

* tag 'samsung-dt-gic-flags-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: exynos: Use human-friendly symbols for interrupt properties in exynos5440
  ARM: dts: exynos: Use human-friendly symbols for interrupt properties in exynos5260
  ARM: dts: exynos: Use human-friendly symbols for interrupt properties in exynos5
  ARM: dts: exynos: Use human-friendly symbols for interrupt properties in exynos4
  ARM: dts: exynos: Use human-friendly symbols for interrupt properties in exynos3250
  ARM: dts: exynos: Fix invalid GIC interrupt flags in exynos5440
  ARM: dts: exynos: Fix invalid GIC interrupt flags in exynos5260
  ARM: dts: exynos: Fix invalid GIC interrupt flags in exynos5410/exynos542x
  ARM: dts: exynos: Fix invalid GIC interrupt flags in exynos5250
  ARM: dts: exynos: Fix invalid GIC interrupt flags in exynos5
  ARM: dts: exynos: Fix invalid GIC interrupt flags in exynos3250
  ARM: dts: exynos: Fix invalid GIC interrupt flags in exynos4x12
  ARM: dts: exynos: Fix invalid GIC interrupt flags in exynos4210
  ARM: dts: exynos: Fix invalid GIC interrupt flags in exynos4

Signed-off-by: Olof Johansson <olof@lixom.net>
---

b4cf33e96aea01225797da0f7f50df2ebfc830a3
diff --cc arch/arm/boot/dts/exynos4x12.dtsi
index 0074f56,505f047..85a7122
--- a/arch/arm/boot/dts/exynos4x12.dtsi
+++ b/arch/arm/boot/dts/exynos4x12.dtsi
@@@ -147,9 -147,10 +147,10 @@@
  		};
  
  		fimc_is: fimc-is@12000000 {
 -			compatible = "samsung,exynos4212-fimc-is", "simple-bus";
 +			compatible = "samsung,exynos4212-fimc-is";
  			reg = <0x12000000 0x260000>;
- 			interrupts = <0 90 0>, <0 95 0>;
+ 			interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>,
+ 				     <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>;
  			power-domains = <&pd_isp>;
  			clocks = <&clock CLK_FIMC_LITE0>,
  				 <&clock CLK_FIMC_LITE1>, <&clock CLK_PPMUISPX>,
diff --cc arch/arm/boot/dts/exynos5410.dtsi
index 9a91685,2501249..bb90bbd
--- a/arch/arm/boot/dts/exynos5410.dtsi
+++ b/arch/arm/boot/dts/exynos5410.dtsi
@@@ -190,58 -181,8 +190,58 @@@
  		pinctrl_3: pinctrl@03860000 {
  			compatible = "samsung,exynos5410-pinctrl";
  			reg = <0x03860000 0x1000>;
- 			interrupts = <0 47 0>;
+ 			interrupts = <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>;
  		};
 +
 +		amba {
 +			#address-cells = <1>;
 +			#size-cells = <1>;
 +			compatible = "simple-bus";
 +			interrupt-parent = <&gic>;
 +			ranges;
 +
 +			pdma0: pdma@12680000 {
 +				compatible = "arm,pl330", "arm,primecell";
 +				reg = <0x121A0000 0x1000>;
 +				interrupts = <GIC_SPI 34 IRQ_TYPE_NONE>;
 +				clocks = <&clock CLK_PDMA0>;
 +				clock-names = "apb_pclk";
 +				#dma-cells = <1>;
 +				#dma-channels = <8>;
 +				#dma-requests = <32>;
 +			};
 +
 +			pdma1: pdma@12690000 {
 +				compatible = "arm,pl330", "arm,primecell";
 +				reg = <0x121B0000 0x1000>;
 +				interrupts = <GIC_SPI 35 IRQ_TYPE_NONE>;
 +				clocks = <&clock CLK_PDMA1>;
 +				clock-names = "apb_pclk";
 +				#dma-cells = <1>;
 +				#dma-channels = <8>;
 +				#dma-requests = <32>;
 +			};
 +		};
 +
 +		audi2s0: i2s@03830000 {
 +			compatible = "samsung,exynos5420-i2s";
 +			reg = <0x03830000 0x100>;
 +			dmas = <&pdma0 10
 +				&pdma0 9
 +				&pdma0 8>;
 +			dma-names = "tx", "rx", "tx-sec";
 +			clocks = <&clock_audss EXYNOS_I2S_BUS>,
 +				<&clock_audss EXYNOS_I2S_BUS>,
 +				<&clock_audss EXYNOS_SCLK_I2S>;
 +			clock-names = "iis", "i2s_opclk0", "i2s_opclk1";
 +			#clock-cells = <1>;
 +			clock-output-names = "i2s_cdclk0";
 +			#sound-dai-cells = <1>;
 +			samsung,idma-addr = <0x03000000>;
 +			pinctrl-names = "default";
 +			pinctrl-0 = <&audi2s0_bus>;
 +			status = "disabled";
 +		};
  	};
  
  	thermal-zones {