From 631bacefb33bc50d9b1146215bdc7f0ba36915e7 Mon Sep 17 00:00:00 2001 From: Jaehoon Chung Date: Fri, 12 Jan 2018 20:07:02 +0900 Subject: [PATCH 1/2] ARM: dts: exynos5: remove the duplicated nodes Remove the duplicated gic and combiner nodes in exynos5.dtsi. Signed-off-by: Jaehoon Chung Reviewed-by: Anand Moon Signed-off-by: Minkyu Kang --- arch/arm/dts/exynos5.dtsi | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/arch/arm/dts/exynos5.dtsi b/arch/arm/dts/exynos5.dtsi index 2db1be8..058794e 100644 --- a/arch/arm/dts/exynos5.dtsi +++ b/arch/arm/dts/exynos5.dtsi @@ -44,33 +44,6 @@ #size-cells = <0>; }; - combiner: interrupt-controller@10440000 { - compatible = "samsung,exynos4210-combiner"; - #interrupt-cells = <2>; - interrupt-controller; - samsung,combiner-nr = <32>; - reg = <0x10440000 0x1000>; - 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 16 0>, <0 17 0>, <0 18 0>, <0 19 0>, - <0 20 0>, <0 21 0>, <0 22 0>, <0 23 0>, - <0 24 0>, <0 25 0>, <0 26 0>, <0 27 0>, - <0 28 0>, <0 29 0>, <0 30 0>, <0 31 0>; - }; - - gic: interrupt-controller@10481000 { - compatible = "arm,cortex-a15-gic", "arm,cortex-a9-gic"; - #interrupt-cells = <3>; - interrupt-controller; - reg = <0x10481000 0x1000>, - <0x10482000 0x1000>, - <0x10484000 0x2000>, - <0x10486000 0x2000>; - interrupts = <1 9 0xf04>; - }; - i2c_0: i2c@12C60000 { compatible = "samsung,s3c2440-i2c"; reg = <0x12C60000 0x100>; From 105e3d84e5683c590b04f8677f80797a1d0dce36 Mon Sep 17 00:00:00 2001 From: Jaehoon Chung Date: Fri, 12 Jan 2018 20:07:03 +0900 Subject: [PATCH 2/2] ARM: dts: exynos5: add the interrupt-parent property Add the interrupt-parent property as gic. Signed-off-by: Jaehoon Chung Reviewed-by: Anand Moon Signed-off-by: Minkyu Kang --- arch/arm/dts/exynos5.dtsi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/dts/exynos5.dtsi b/arch/arm/dts/exynos5.dtsi index 058794e..6102978 100644 --- a/arch/arm/dts/exynos5.dtsi +++ b/arch/arm/dts/exynos5.dtsi @@ -10,6 +10,8 @@ / { compatible = "samsung,exynos5"; + interrupt-parent = <&gic>; + combiner: interrupt-controller@10440000 { compatible = "samsung,exynos4210-combiner"; #interrupt-cells = <2>;