[4/7] ARM: dts: exynos5440: fix PCIe interrupt mapping

Commit Message

Jingoo Han March 3, 2014, 7:53 a.m. UTC

On Monday, March 03, 2014 4:41 PM, Jingoo Han wrote:
> On Saturday, March 01, 2014 2:29 AM, Lucas Stach wrote:
> >
> > So it actually works.
> >
> > Signed-off-by: Lucas Stach <[e-mail]>
> > ---
> >  arch/arm/boot/dts/exynos5440.dtsi | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/arch/arm/boot/dts/exynos5440.dtsi b/arch/arm/boot/dts/exynos5440.dtsi
> > index 02a0a1226cef..65d425d9ec27 100644
> > --- a/arch/arm/boot/dts/exynos5440.dtsi
> > +++ b/arch/arm/boot/dts/exynos5440.dtsi
> > @@ -274,7 +274,7 @@
> >  			  0x82000000 0 0x40011000 0x40011000 0 0x1ffef000>; /* non-prefetchable memory */
> >  		#interrupt-cells = <1>;
> >  		interrupt-map-mask = <0 0 0 0>;
> > -		interrupt-map = <0x0 0 &gic 53>;
> > +		interrupt-map = <0 0 0 0 &gic GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
> 
> It makes build errors as below:
> 
> DTC     arch/arm/boot/dts/exynos5440-ssdk5440.dtb
> Error: arch/arm/boot/dts/exynos5440.dtsi:289.33-34 syntax error
> FATAL ERROR: Unable to parse input tree
> make[1]: *** [arch/arm/boot/dts/exynos5440-ssdk5440.dtb] Error 1
> make: *** [exynos5440-ssdk5440.dtb] Error 2
> 
> Would you fix it?

I fixed build errors after including 'arm-gic.h' as below:


Best regards,
Jingoo Han

> 
> >  		num-lanes = <4>;
> >  		status = "disabled";
> >  	};
> > @@ -295,7 +295,7 @@
> >  			  0x82000000 0 0x60011000 0x60011000 0 0x1ffef000>; /* non-prefetchable memory */
> >  		#interrupt-cells = <1>;
> >  		interrupt-map-mask = <0 0 0 0>;
> > -		interrupt-map = <0x0 0 &gic 56>;
> > +		interrupt-map = <0 0 0 0 &gic GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
> >  		num-lanes = <4>;
> >  		status = "disabled";
> >  	};
> > --
> > 1.8.5.3

--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Lucas Stach March 3, 2014, 9:26 a.m. UTC | #1

Am Montag, den 03.03.2014, 16:53 +0900 schrieb Jingoo Han:
> On Monday, March 03, 2014 4:41 PM, Jingoo Han wrote:
> > On Saturday, March 01, 2014 2:29 AM, Lucas Stach wrote:
> > >
> > > So it actually works.
> > >
> > > Signed-off-by: Lucas Stach <[e-mail]>
> > > ---
> > >  arch/arm/boot/dts/exynos5440.dtsi | 4 ++--
> > >  1 file changed, 2 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/arch/arm/boot/dts/exynos5440.dtsi b/arch/arm/boot/dts/exynos5440.dtsi
> > > index 02a0a1226cef..65d425d9ec27 100644
> > > --- a/arch/arm/boot/dts/exynos5440.dtsi
> > > +++ b/arch/arm/boot/dts/exynos5440.dtsi
> > > @@ -274,7 +274,7 @@
> > >  			  0x82000000 0 0x40011000 0x40011000 0 0x1ffef000>; /* non-prefetchable memory */
> > >  		#interrupt-cells = <1>;
> > >  		interrupt-map-mask = <0 0 0 0>;
> > > -		interrupt-map = <0x0 0 &gic 53>;
> > > +		interrupt-map = <0 0 0 0 &gic GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
> > 
> > It makes build errors as below:
> > 
> > DTC     arch/arm/boot/dts/exynos5440-ssdk5440.dtb
> > Error: arch/arm/boot/dts/exynos5440.dtsi:289.33-34 syntax error
> > FATAL ERROR: Unable to parse input tree
> > make[1]: *** [arch/arm/boot/dts/exynos5440-ssdk5440.dtb] Error 1
> > make: *** [exynos5440-ssdk5440.dtb] Error 2
> > 
> > Would you fix it?
> 
> I fixed build errors after including 'arm-gic.h' as below:
> 
> --- a/arch/arm/boot/dts/exynos5440.dtsi
> +++ b/arch/arm/boot/dts/exynos5440.dtsi
> @@ -9,6 +9,8 @@
>   * published by the Free Software Foundation.
>  */
> 
> +#include <dt-bindings/interrupt-controller/arm-gic.h>
> +
>  #include "skeleton.dtsi"
> 
> Would you confirm this?

That's the right fix, I'll include this (together with the other
feedback I received) in v2 of the series.

Regards,
Lucas

Patch

--- a/arch/arm/boot/dts/exynos5440.dtsi
+++ b/arch/arm/boot/dts/exynos5440.dtsi
@@ -9,6 +9,8 @@ 
  * published by the Free Software Foundation.
 */

+#include <dt-bindings/interrupt-controller/arm-gic.h>
+
 #include "skeleton.dtsi"

Would you confirm this?