From: arnd@arndb.de (Arnd Bergmann) Date: Mon, 15 Apr 2013 10:36:35 +0200 Subject: [PATCH 3/7] ARM: exynos: add missing properties for combiner IRQs In-Reply-To: References: <1365775405-115297-1-git-send-email-arnd@arndb.de> <1365775405-115297-4-git-send-email-arnd@arndb.de> Message-ID: <201304151036.35228.arnd@arndb.de> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Monday 15 April 2013, Thomas Abraham wrote: > On 12 April 2013 19:33, Arnd Bergmann wrote: > > The exynos combiner irqchip needs to find the parent interrupts > > and needs to know their number, so add the missing properties > > for exynos4 as they were already present for exynos5. > > > > Signed-off-by: Arnd Bergmann > > --- > > arch/arm/boot/dts/exynos4210.dtsi | 1 + > > arch/arm/boot/dts/exynos4212.dtsi | 9 +++++++++ > > arch/arm/boot/dts/exynos4412.dtsi | 9 +++++++++ > > 3 files changed, 19 insertions(+) > > > > diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi > > index 15143bd..c102869 100644 > > --- a/arch/arm/boot/dts/exynos4210.dtsi > > +++ b/arch/arm/boot/dts/exynos4210.dtsi > > @@ -41,6 +41,7 @@ > > }; > > > > combiner:interrupt-controller at 10440000 { > > + combiner-nr = <16>; > > The default value of the combiner-nr is case it is not specified is > 16. The default value is documented in the bindings documentation. Unfortunately, the driver now warns about a missing attribute, which seems right. I also made the default "20" instead of "16" to cover the other exynos4 chips. I'd say it's best to keep this one explicitly listed even if it's optional. > > + interrupt-controller at 10440000 { > > + combiner-nr = <20>; > > + 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>; > > Extra '>' for <0 108 0> can be removed. > > Reviewed-by: Thomas Abraham