On 2015-01-08 14:39, Nishanth Menon wrote:

On 17:42-20150107, Marc Zyngier wrote:
[..]

quoted

diff --git a/arch/arm/boot/dts/dra7-evm.dts 

b/arch/arm/boot/dts/dra7-evm.dts
index 10b725c..048cfeb 100644

--- a/arch/arm/boot/dts/dra7-evm.dts
+++ b/arch/arm/boot/dts/dra7-evm.dts

@@ -423,7 +423,7 @@
 	status = "okay";
 	pinctrl-names = "default";
 	pinctrl-0 = <&uart1_pins>;
-	interrupts-extended = <&gic GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>,
+	interrupts-extended = <&crossbar_mpu GIC_SPI 67 

IRQ_TYPE_LEVEL_HIGH>,
 			      <&dra7_pmx_core 0x3e0>;

^^ interrrupt-extended for uart1 here
[..]

quoted

diff --git a/arch/arm/boot/dts/dra7.dtsi 

b/arch/arm/boot/dts/dra7.dtsi

[...]

quoted

@@ -344,7 +344,7 @@
 		uart1: serial at 4806a000 {
 			compatible = "ti,omap4-uart";
 			reg = <0x4806a000 0x100>;
-			interrupts-extended = <&gic GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>;
+			interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>;

^^ implies we will have both interrupts and interrupts-extended
properties for uart1 in dra7-evm.dtb

Documentation/devicetree/bindings/interrupt-controller/interrupts.txt
does not make it clear as to what the priority will be when both
properties are present.

Yup, good call. I don't think it matters (interrupts inherits the 
implicit irq-parent, but consistency is good.

Ah, thanks for the patch, I've folded this in.

Thanks,

         M.
-- 
Fast, cheap, reliable. Pick two.