Commit 11ebc47c authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski
Browse files

ARM: dts: exynos: Fix invalid GIC interrupt flags in exynos4x12 



Interrupt of type IRQ_TYPE_NONE is not allowed for GIC interrupts and
generates an error:
	genirq: Setting trigger mode 0 for irq 16 failed (gic_set_type+0x0/0x68)

The GIC requires shared interrupts to be edge rising or level high.
Platform declares support for both.  Arbitrarily choose level high
everywhere hoping it will work on each platform.

Reported-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Reported-by: default avatarAlban Browaeys <alban.browaeys@gmail.com>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Reviewed-by: default avatarAlim Akhtar <alim.akhtar@samsung.com>
parent 71990ea3

arch/arm/boot/dts/exynos4x12-pinctrl.dtsi

+16 −4
Original line number Diff line number Diff line
@@ -572,8 +572,14 @@ gpx0: gpx0 { 


			interrupt-controller;

			interrupt-parent = <&gic>;

			interrupts = <0 16 0>, <0 17 0>, <0 18 0>, <0 19 0>,

				     <0 20 0>, <0 21 0>, <0 22 0>, <0 23 0>;

			interrupts = <0 16 IRQ_TYPE_LEVEL_HIGH>,

				     <0 17 IRQ_TYPE_LEVEL_HIGH>,

				     <0 18 IRQ_TYPE_LEVEL_HIGH>,

				     <0 19 IRQ_TYPE_LEVEL_HIGH>,

				     <0 20 IRQ_TYPE_LEVEL_HIGH>,

				     <0 21 IRQ_TYPE_LEVEL_HIGH>,

				     <0 22 IRQ_TYPE_LEVEL_HIGH>,

				     <0 23 IRQ_TYPE_LEVEL_HIGH>;

			#interrupt-cells = <2>;

		};
@@ -583,8 +589,14 @@ gpx1: gpx1 { 


			interrupt-controller;

			interrupt-parent = <&gic>;

			interrupts = <0 24 0>, <0 25 0>, <0 26 0>, <0 27 0>,

				     <0 28 0>, <0 29 0>, <0 30 0>, <0 31 0>;

			interrupts = <0 24 IRQ_TYPE_LEVEL_HIGH>,

				     <0 25 IRQ_TYPE_LEVEL_HIGH>,

				     <0 26 IRQ_TYPE_LEVEL_HIGH>,

				     <0 27 IRQ_TYPE_LEVEL_HIGH>,

				     <0 28 IRQ_TYPE_LEVEL_HIGH>,

				     <0 29 IRQ_TYPE_LEVEL_HIGH>,

				     <0 30 IRQ_TYPE_LEVEL_HIGH>,

				     <0 31 IRQ_TYPE_LEVEL_HIGH>;

			#interrupt-cells = <2>;

		};

arch/arm/boot/dts/exynos4x12.dtsi

+32 −16
Original line number Diff line number Diff line
@@ -88,11 +88,11 @@ mct_map: mct-map { 
			#interrupt-cells = <1>;

			#address-cells = <0>;

			#size-cells = <0>;

			interrupt-map = <0 &gic 0 57 0>,

			interrupt-map = <0 &gic 0 57 IRQ_TYPE_LEVEL_HIGH>,

					<1 &combiner 12 5>,

					<2 &combiner 12 6>,

					<3 &combiner 12 7>,

					<4 &gic 1 12 0>;

					<4 &gic 1 12 IRQ_TYPE_LEVEL_HIGH>;

		};

	};
@@ -112,7 +112,7 @@ adc: adc@126C0000 { 
	g2d: g2d@10800000 {

		compatible = "samsung,exynos4212-g2d";

		reg = <0x10800000 0x1000>;

		interrupts = <0 89 0>;

		interrupts = <0 89 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&clock CLK_SCLK_FIMG2D>, <&clock CLK_G2D>;

		clock-names = "sclk_fimg2d", "fimg2d";

		iommus = <&sysmmu_g2d>;
@@ -127,7 +127,7 @@ camera { 
		fimc_lite_0: fimc-lite@12390000 {

			compatible = "samsung,exynos4212-fimc-lite";

			reg = <0x12390000 0x1000>;

			interrupts = <0 105 0>;

			interrupts = <0 105 IRQ_TYPE_LEVEL_HIGH>;

			power-domains = <&pd_isp>;

			clocks = <&clock CLK_FIMC_LITE0>;

			clock-names = "flite";
@@ -138,7 +138,7 @@ fimc_lite_0: fimc-lite@12390000 { 
		fimc_lite_1: fimc-lite@123A0000 {

			compatible = "samsung,exynos4212-fimc-lite";

			reg = <0x123A0000 0x1000>;

			interrupts = <0 106 0>;

			interrupts = <0 106 IRQ_TYPE_LEVEL_HIGH>;

			power-domains = <&pd_isp>;

			clocks = <&clock CLK_FIMC_LITE1>;

			clock-names = "flite";
@@ -149,7 +149,8 @@ fimc_lite_1: fimc-lite@123A0000 { 
		fimc_is: fimc-is@12000000 {

			compatible = "samsung,exynos4212-fimc-is", "simple-bus";

			reg = <0x12000000 0x260000>;

			interrupts = <0 90 0>, <0 95 0>;

			interrupts = <0 90 IRQ_TYPE_LEVEL_HIGH>,

				     <0 95 IRQ_TYPE_LEVEL_HIGH>;

			power-domains = <&pd_isp>;

			clocks = <&clock CLK_FIMC_LITE0>,

				 <&clock CLK_FIMC_LITE1>, <&clock CLK_PPMUISPX>,
@@ -200,7 +201,7 @@ i2c1_isp: i2c-isp@12140000 { 
	mshc_0: mmc@12550000 {

		compatible = "samsung,exynos4412-dw-mshc";

		reg = <0x12550000 0x1000>;

		interrupts = <0 77 0>;

		interrupts = <0 77 IRQ_TYPE_LEVEL_HIGH>;

		#address-cells = <1>;

		#size-cells = <0>;

		fifo-depth = <0x80>;
@@ -461,11 +462,26 @@ opp@100000000 { 
};



&combiner {

	interrupts = <0 0 0>, <0 1 0>, <0 2 0>, <0 3 0>,

		     <0 4 0>, <0 5 0>, <0 6 0>, <0 7 0>,

		     <0 8 0>, <0 9 0>, <0 10 0>, <0 11 0>,

		     <0 12 0>, <0 13 0>, <0 14 0>, <0 15 0>,

		     <0 107 0>, <0 108 0>, <0 48 0>, <0 42 0>;

	interrupts = <0 0 IRQ_TYPE_LEVEL_HIGH>,

		     <0 1 IRQ_TYPE_LEVEL_HIGH>,

		     <0 2 IRQ_TYPE_LEVEL_HIGH>,

		     <0 3 IRQ_TYPE_LEVEL_HIGH>,

		     <0 4 IRQ_TYPE_LEVEL_HIGH>,

		     <0 5 IRQ_TYPE_LEVEL_HIGH>,

		     <0 6 IRQ_TYPE_LEVEL_HIGH>,

		     <0 7 IRQ_TYPE_LEVEL_HIGH>,

		     <0 8 IRQ_TYPE_LEVEL_HIGH>,

		     <0 9 IRQ_TYPE_LEVEL_HIGH>,

		     <0 10 IRQ_TYPE_LEVEL_HIGH>,

		     <0 11 IRQ_TYPE_LEVEL_HIGH>,

		     <0 12 IRQ_TYPE_LEVEL_HIGH>,

		     <0 13 IRQ_TYPE_LEVEL_HIGH>,

		     <0 14 IRQ_TYPE_LEVEL_HIGH>,

		     <0 15 IRQ_TYPE_LEVEL_HIGH>,

		     <0 107 IRQ_TYPE_LEVEL_HIGH>,

		     <0 108 IRQ_TYPE_LEVEL_HIGH>,

		     <0 48 IRQ_TYPE_LEVEL_HIGH>,

		     <0 42 IRQ_TYPE_LEVEL_HIGH>;

};



&exynos_usbphy {
@@ -529,18 +545,18 @@ &mixer { 
&pinctrl_0 {

	compatible = "samsung,exynos4x12-pinctrl";

	reg = <0x11400000 0x1000>;

	interrupts = <0 47 0>;

	interrupts = <0 47 IRQ_TYPE_LEVEL_HIGH>;

};



&pinctrl_1 {

	compatible = "samsung,exynos4x12-pinctrl";

	reg = <0x11000000 0x1000>;

	interrupts = <0 46 0>;

	interrupts = <0 46 IRQ_TYPE_LEVEL_HIGH>;



	wakup_eint: wakeup-interrupt-controller {

		compatible = "samsung,exynos4210-wakeup-eint";

		interrupt-parent = <&gic>;

		interrupts = <0 32 0>;

		interrupts = <0 32 IRQ_TYPE_LEVEL_HIGH>;

	};

};
@@ -554,7 +570,7 @@ &pinctrl_2 { 
&pinctrl_3 {

	compatible = "samsung,exynos4x12-pinctrl";

	reg = <0x106E0000 0x1000>;

	interrupts = <0 72 0>;

	interrupts = <0 72 IRQ_TYPE_LEVEL_HIGH>;

};



&pmu_system_controller {