Subject: [PATCH v6 3/3] ARM: dts: vf610: add Miscellaneous System Control Module (MSCM)

From: [email-masked] (Shawn Guo)
Date: Wed, 11 Mar 2015 08:48:15 +0800

On Sun, Mar 01, 2015 at 11:41:29PM +0100, Stefan Agner wrote:
> Add the Miscellaneous System Control Module (MSCM) to the base
> device tree for Vybrid SoC's. This module contains registers
> to get information of the individual and current (accessing)
> CPU. In a second block, there is an interrupt router, which
> handles the routing of the interrupts between the two CPU cores
> on VF6xx variants of the SoC. However, also on single core
> variants the interrupt router needs to be configured in order
> to receive interrupts on the CPU's interrupt controller. Almost
> all peripheral interrupts are routed through the router, hence
> the MSCM module is the default interrupt parent for this SoC.
> 
> In a earlier commit the interrupt nodes were moved out of the
> peripheral nodes and specified in the CPU specific vf500.dtsi
> device tree. This allowed to use the base device tree vfxxx.dtsi
> also for a Cortex-M4 specific device tree, which uses different
> interrupt nodes due to the NVIC interrupt controller. However,
> since the interrupt parent for peripherals is the MSCM module
> independently which CPU the device tree is used for, we can move
> the interrupt nodes into the base device tree vfxxx.dtsi again.
> Depending on which CPU this base device tree will be used with,
> the correct parent interrupt controller has to be assigned to
> the MSCM-IR node (GIC or NVIC). The driver takes care of the
> parent interrupt controller specific needs (interrupt-cells).
> 
> Acked-by: Marc Zyngier <[email-masked]>
> Signed-off-by: Stefan Agner <[email-masked]>

Stefan,

I guess this patch has a run-time dependency on the first two in the
series, right?  Or put it another way, if I apply this single patch on
my branch, the dtb and kernel built from the same branch do not work
together, right?  If so, we will need to either wait for the first two
hit mainline or pull Jason's irqchip/vybrid branch into my tree as
prerequisite (irqchip/vybrid needs to be stable).

Shawn

> ---
>  arch/arm/boot/dts/vf500.dtsi | 137 ++-----------------------------------------
>  arch/arm/boot/dts/vfxxx.dtsi |  49 ++++++++++++++++
>  2 files changed, 53 insertions(+), 133 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/vf500.dtsi b/arch/arm/boot/dts/vf500.dtsi
> index 1dbf8d2..e976d2f 100644
> --- a/arch/arm/boot/dts/vf500.dtsi
> +++ b/arch/arm/boot/dts/vf500.dtsi
> @@ -24,14 +24,13 @@
>  	};
>  
>  	soc {
> -		interrupt-parent = <&intc>;
> -
>  		aips-bus at 40000000 {
>  
>  			intc: interrupt-controller at 40002000 {
>  				compatible = "arm,cortex-a9-gic";
>  				#interrupt-cells = <3>;
>  				interrupt-controller;
> +				interrupt-parent = <&intc>;
>  				reg = <0x40003000 0x1000>,
>  				      <0x40002100 0x100>;
>  			};
> @@ -40,145 +39,17 @@
>  				compatible = "arm,cortex-a9-global-timer";
>  				reg = <0x40002200 0x20>;
>  				interrupts = <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>;
> +				interrupt-parent = <&intc>;
>  				clocks = <&clks VF610_CLK_PLATFORM_BUS>;
>  			};
>  		};
>  	};
>  };
>  
> -&adc0 {
> -	interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>;
> -};
> -
> -&adc1 {
> -	interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;
> -};
> -
> -&can0 {
> -	interrupts = <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>;
> -};
> -
> -&can1 {
> -	interrupts = <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>;
> -};
> -
> -&dspi0 {
> -	interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>;
> -};
> -
> -&edma0 {
> -	interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,
> -			<GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
> -	interrupt-names = "edma-tx", "edma-err";
> -};
> -
> -&edma1 {
> -	interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>,
> -			<GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
> -	interrupt-names = "edma-tx", "edma-err";
> -};
> -
> -&esdhc1 {
> -	interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
> -};
> -
> -&fec0 {
> -	interrupts = <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>;
> -};
> -
> -&fec1 {
> -	interrupts = <GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>;
> -};
> -
> -&ftm {
> -	interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>;
> -};
> -
> -&gpio0 {
> -	interrupts = <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;
> -};
> -
> -&gpio1 {
> -	interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
> -};
> -
> -&gpio2 {
> -	interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
> -};
> -
> -&gpio3 {
> -	interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
> -};
> -
> -&gpio4 {
> -	interrupts = <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>;
> -};
> -
> -&i2c0 {
> -	interrupts = <GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>;
> -};
> -
> -&pit {
> -	interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>;
> -};
> -
> -&qspi0 {
> -	interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
> -};
> -
> -&sai2 {
> -	interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
> -};
> -
> -&snvsrtc {
> -	interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
> -};
> -
> -&src {
> -	interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
> -};
> -
> -&uart0 {
> -	interrupts = <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>;
> -};
> -
> -&uart1 {
> -	interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;
> -};
> -
> -&uart2 {
> -	interrupts = <GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH>;
> -};
> -
> -&uart3 {
> -	interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>;
> -};
> -
> -&uart4 {
> -	interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>;
> -};
> -
> -&uart5 {
> -	interrupts = <GIC_SPI 66 IRQ_TYPE_LEVEL_HIGH>;
> -};
> -
> -&usbdev0 {
> -	interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>;
> -};
> -
> -&usbh1 {
> -	interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;
> -};
> -
> -&usbphy0 {
> -	interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;
> -};
> -
> -&usbphy1 {
> -	interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>;
> +&mscm_ir {
> +	interrupt-parent = <&intc>;
>  };
>  
>  &wdoga5 {
> -	interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
>  	status = "okay";
>  };
> diff --git a/arch/arm/boot/dts/vfxxx.dtsi b/arch/arm/boot/dts/vfxxx.dtsi
> index a29c7ce..32de809 100644
> --- a/arch/arm/boot/dts/vfxxx.dtsi
> +++ b/arch/arm/boot/dts/vfxxx.dtsi
> @@ -54,6 +54,7 @@
>  		#address-cells = <1>;
>  		#size-cells = <1>;
>  		compatible = "simple-bus";
> +		interrupt-parent = <&mscm_ir>;
>  		ranges;
>  
>  		aips0: aips-bus at 40000000 {
> @@ -62,6 +63,19 @@
>  			#size-cells = <1>;
>  			ranges;
>  
> +			mscm_cpucfg: cpucfg at 40001000 {
> +				compatible = "fsl,vf610-mscm-cpucfg", "syscon";
> +				reg = <0x40001000 0x800>;
> +			};
> +
> +			mscm_ir: interrupt-controller at 40001800 {
> +				compatible = "fsl,vf610-mscm-ir";
> +				reg = <0x40001800 0x400>;
> +				fsl,cpucfg = <&mscm_cpucfg>;
> +				interrupt-controller;
> +				#interrupt-cells = <2>;
> +			};
> +
>  			edma0: dma-controller at 40018000 {
>  				#dma-cells = <2>;
>  				compatible = "fsl,vf610-edma";
> @@ -69,6 +83,9 @@
>  					<0x40024000 0x1000>,
>  					<0x40025000 0x1000>;
>  				dma-channels = <32>;
> +				interrupts = <8 IRQ_TYPE_LEVEL_HIGH>,
> +						<9 IRQ_TYPE_LEVEL_HIGH>;
> +				interrupt-names = "edma-tx", "edma-err";
>  				clock-names = "dmamux0", "dmamux1";
>  				clocks = <&clks VF610_CLK_DMAMUX0>,
>  					<&clks VF610_CLK_DMAMUX1>;
> @@ -78,6 +95,7 @@
>  			can0: flexcan at 40020000 {
>  				compatible = "fsl,vf610-flexcan";
>  				reg = <0x40020000 0x4000>;
> +				interrupts = <58 IRQ_TYPE_LEVEL_HIGH>;
>  				clocks = <&clks VF610_CLK_FLEXCAN0>,
>  					 <&clks VF610_CLK_FLEXCAN0>;
>  				clock-names = "ipg", "per";
> @@ -87,6 +105,7 @@
>  			uart0: serial at 40027000 {
>  				compatible = "fsl,vf610-lpuart";
>  				reg = <0x40027000 0x1000>;
> +				interrupts = <61 IRQ_TYPE_LEVEL_HIGH>;
>  				clocks = <&clks VF610_CLK_UART0>;
>  				clock-names = "ipg";
>  				dmas = <&edma0 0 2>,
> @@ -98,6 +117,7 @@
>  			uart1: serial at 40028000 {
>  				compatible = "fsl,vf610-lpuart";
>  				reg = <0x40028000 0x1000>;
> +				interrupts = <62 IRQ_TYPE_LEVEL_HIGH>;
>  				clocks = <&clks VF610_CLK_UART1>;
>  				clock-names = "ipg";
>  				dmas = <&edma0 0 4>,
> @@ -109,6 +129,7 @@
>  			uart2: serial at 40029000 {
>  				compatible = "fsl,vf610-lpuart";
>  				reg = <0x40029000 0x1000>;
> +				interrupts = <63 IRQ_TYPE_LEVEL_HIGH>;
>  				clocks = <&clks VF610_CLK_UART2>;
>  				clock-names = "ipg";
>  				dmas = <&edma0 0 6>,
> @@ -120,6 +141,7 @@
>  			uart3: serial at 4002a000 {
>  				compatible = "fsl,vf610-lpuart";
>  				reg = <0x4002a000 0x1000>;
> +				interrupts = <64 IRQ_TYPE_LEVEL_HIGH>;
>  				clocks = <&clks VF610_CLK_UART3>;
>  				clock-names = "ipg";
>  				dmas = <&edma0 0 8>,
> @@ -133,6 +155,7 @@
>  				#size-cells = <0>;
>  				compatible = "fsl,vf610-dspi";
>  				reg = <0x4002c000 0x1000>;
> +				interrupts = <67 IRQ_TYPE_LEVEL_HIGH>;
>  				clocks = <&clks VF610_CLK_DSPI0>;
>  				clock-names = "dspi";
>  				spi-num-chipselects = <5>;
> @@ -142,6 +165,7 @@
>  			sai2: sai at 40031000 {
>  				compatible = "fsl,vf610-sai";
>  				reg = <0x40031000 0x1000>;
> +				interrupts = <86 IRQ_TYPE_LEVEL_HIGH>;
>  				clocks = <&clks VF610_CLK_SAI2>;
>  				clock-names = "sai";
>  				dma-names = "tx", "rx";
> @@ -153,6 +177,7 @@
>  			pit: pit at 40037000 {
>  				compatible = "fsl,vf610-pit";
>  				reg = <0x40037000 0x1000>;
> +				interrupts = <39 IRQ_TYPE_LEVEL_HIGH>;
>  				clocks = <&clks VF610_CLK_PIT>;
>  				clock-names = "pit";
>  			};
> @@ -186,6 +211,7 @@
>  			adc0: adc at 4003b000 {
>  				compatible = "fsl,vf610-adc";
>  				reg = <0x4003b000 0x1000>;
> +				interrupts = <53 IRQ_TYPE_LEVEL_HIGH>;
>  				clocks = <&clks VF610_CLK_ADC0>;
>  				clock-names = "adc";
>  				status = "disabled";
> @@ -194,6 +220,7 @@
>  			wdoga5: wdog at 4003e000 {
>  				compatible = "fsl,vf610-wdt", "fsl,imx21-wdt";
>  				reg = <0x4003e000 0x1000>;
> +				interrupts = <20 IRQ_TYPE_LEVEL_HIGH>;
>  				clocks = <&clks VF610_CLK_WDT>;
>  				clock-names = "wdog";
>  				status = "disabled";
> @@ -204,6 +231,7 @@
>  				#size-cells = <0>;
>  				compatible = "fsl,vf610-qspi";
>  				reg = <0x40044000 0x1000>;
> +				interrupts = <24 IRQ_TYPE_LEVEL_HIGH>;
>  				clocks = <&clks VF610_CLK_QSPI0_EN>,
>  					<&clks VF610_CLK_QSPI0>;
>  				clock-names = "qspi_en", "qspi";
> @@ -221,6 +249,7 @@
>  				reg = <0x40049000 0x1000 0x400ff000 0x40>;
>  				gpio-controller;
>  				#gpio-cells = <2>;
> +				interrupts = <107 IRQ_TYPE_LEVEL_HIGH>;
>  				interrupt-controller;
>  				#interrupt-cells = <2>;
>  				gpio-ranges = <&iomuxc 0 0 32>;
> @@ -231,6 +260,7 @@
>  				reg = <0x4004a000 0x1000 0x400ff040 0x40>;
>  				gpio-controller;
>  				#gpio-cells = <2>;
> +				interrupts = <108 IRQ_TYPE_LEVEL_HIGH>;
>  				interrupt-controller;
>  				#interrupt-cells = <2>;
>  				gpio-ranges = <&iomuxc 0 32 32>;
> @@ -241,6 +271,7 @@
>  				reg = <0x4004b000 0x1000 0x400ff080 0x40>;
>  				gpio-controller;
>  				#gpio-cells = <2>;
> +				interrupts = <109 IRQ_TYPE_LEVEL_HIGH>;
>  				interrupt-controller;
>  				#interrupt-cells = <2>;
>  				gpio-ranges = <&iomuxc 0 64 32>;
> @@ -251,6 +282,7 @@
>  				reg = <0x4004c000 0x1000 0x400ff0c0 0x40>;
>  				gpio-controller;
>  				#gpio-cells = <2>;
> +				interrupts = <110 IRQ_TYPE_LEVEL_HIGH>;
>  				interrupt-controller;
>  				#interrupt-cells = <2>;
>  				gpio-ranges = <&iomuxc 0 96 32>;
> @@ -261,6 +293,7 @@
>  				reg = <0x4004d000 0x1000 0x400ff100 0x40>;
>  				gpio-controller;
>  				#gpio-cells = <2>;
> +				interrupts = <111 IRQ_TYPE_LEVEL_HIGH>;
>  				interrupt-controller;
>  				#interrupt-cells = <2>;
>  				gpio-ranges = <&iomuxc 0 128 7>;
> @@ -274,6 +307,7 @@
>  			usbphy0: usbphy at 40050800 {
>  				compatible = "fsl,vf610-usbphy";
>  				reg = <0x40050800 0x400>;
> +				interrupts = <50 IRQ_TYPE_LEVEL_HIGH>;
>  				clocks = <&clks VF610_CLK_USBPHY0>;
>  				fsl,anatop = <&anatop>;
>  				status = "disabled";
> @@ -282,6 +316,7 @@
>  			usbphy1: usbphy at 40050c00 {
>  				compatible = "fsl,vf610-usbphy";
>  				reg = <0x40050c00 0x400>;
> +				interrupts = <51 IRQ_TYPE_LEVEL_HIGH>;
>  				clocks = <&clks VF610_CLK_USBPHY1>;
>  				fsl,anatop = <&anatop>;
>  				status = "disabled";
> @@ -292,6 +327,7 @@
>  				#size-cells = <0>;
>  				compatible = "fsl,vf610-i2c";
>  				reg = <0x40066000 0x1000>;
> +				interrupts = <71 IRQ_TYPE_LEVEL_HIGH>;
>  				clocks = <&clks VF610_CLK_I2C0>;
>  				clock-names = "ipg";
>  				dmas = <&edma0 0 50>,
> @@ -311,6 +347,7 @@
>  			usbdev0: usb at 40034000 {
>  				compatible = "fsl,vf610-usb", "fsl,imx27-usb";
>  				reg = <0x40034000 0x800>;
> +				interrupts = <75 IRQ_TYPE_LEVEL_HIGH>;
>  				clocks = <&clks VF610_CLK_USBC0>;
>  				fsl,usbphy = <&usbphy0>;
>  				fsl,usbmisc = <&usbmisc0 0>;
> @@ -345,6 +382,9 @@
>  					<0x400a1000 0x1000>,
>  					<0x400a2000 0x1000>;
>  				dma-channels = <32>;
> +				interrupts = <10 IRQ_TYPE_LEVEL_HIGH>,
> +						<11 IRQ_TYPE_LEVEL_HIGH>;
> +				interrupt-names = "edma-tx", "edma-err";
>  				clock-names = "dmamux0", "dmamux1";
>  				clocks = <&clks VF610_CLK_DMAMUX2>,
>  					<&clks VF610_CLK_DMAMUX3>;
> @@ -368,6 +408,7 @@
>  			uart4: serial at 400a9000 {
>  				compatible = "fsl,vf610-lpuart";
>  				reg = <0x400a9000 0x1000>;
> +				interrupts = <65 IRQ_TYPE_LEVEL_HIGH>;
>  				clocks = <&clks VF610_CLK_UART4>;
>  				clock-names = "ipg";
>  				status = "disabled";
> @@ -376,6 +417,7 @@
>  			uart5: serial at 400aa000 {
>  				compatible = "fsl,vf610-lpuart";
>  				reg = <0x400aa000 0x1000>;
> +				interrupts = <66 IRQ_TYPE_LEVEL_HIGH>;
>  				clocks = <&clks VF610_CLK_UART5>;
>  				clock-names = "ipg";
>  				status = "disabled";
> @@ -384,6 +426,7 @@
>  			adc1: adc at 400bb000 {
>  				compatible = "fsl,vf610-adc";
>  				reg = <0x400bb000 0x1000>;
> +				interrupts = <54 IRQ_TYPE_LEVEL_HIGH>;
>  				clocks = <&clks VF610_CLK_ADC1>;
>  				clock-names = "adc";
>  				status = "disabled";
> @@ -392,6 +435,7 @@
>  			esdhc1: esdhc at 400b2000 {
>  				compatible = "fsl,imx53-esdhc";
>  				reg = <0x400b2000 0x1000>;
> +				interrupts = <28 IRQ_TYPE_LEVEL_HIGH>;
>  				clocks = <&clks VF610_CLK_IPG_BUS>,
>  					<&clks VF610_CLK_PLATFORM_BUS>,
>  					<&clks VF610_CLK_ESDHC1>;
> @@ -402,6 +446,7 @@
>  			usbh1: usb at 400b4000 {
>  				compatible = "fsl,vf610-usb", "fsl,imx27-usb";
>  				reg = <0x400b4000 0x800>;
> +				interrupts = <76 IRQ_TYPE_LEVEL_HIGH>;
>  				clocks = <&clks VF610_CLK_USBC1>;
>  				fsl,usbphy = <&usbphy1>;
>  				fsl,usbmisc = <&usbmisc1 0>;
> @@ -420,6 +465,7 @@
>  			ftm: ftm at 400b8000 {
>  				compatible = "fsl,ftm-timer";
>  				reg = <0x400b8000 0x1000 0x400b9000 0x1000>;
> +				interrupts = <44 IRQ_TYPE_LEVEL_HIGH>;
>  				clock-names = "ftm-evt", "ftm-src",
>  					"ftm-evt-counter-en", "ftm-src-counter-en";
>  				clocks = <&clks VF610_CLK_FTM2>,
> @@ -432,6 +478,7 @@
>  			fec0: ethernet at 400d0000 {
>  				compatible = "fsl,mvf600-fec";
>  				reg = <0x400d0000 0x1000>;
> +				interrupts = <78 IRQ_TYPE_LEVEL_HIGH>;
>  				clocks = <&clks VF610_CLK_ENET0>,
>  					<&clks VF610_CLK_ENET0>,
>  					<&clks VF610_CLK_ENET>;
> @@ -442,6 +489,7 @@
>  			fec1: ethernet at 400d1000 {
>  				compatible = "fsl,mvf600-fec";
>  				reg = <0x400d1000 0x1000>;
> +				interrupts = <79 IRQ_TYPE_LEVEL_HIGH>;
>  				clocks = <&clks VF610_CLK_ENET1>,
>  					<&clks VF610_CLK_ENET1>,
>  					<&clks VF610_CLK_ENET>;
> @@ -452,6 +500,7 @@
>  			can1: flexcan at 400d4000 {
>  				compatible = "fsl,vf610-flexcan";
>  				reg = <0x400d4000 0x4000>;
> +				interrupts = <59 IRQ_TYPE_LEVEL_HIGH>;
>  				clocks = <&clks VF610_CLK_FLEXCAN1>,
>  					 <&clks VF610_CLK_FLEXCAN1>;
>  				clock-names = "ipg", "per";
> -- 
> 2.3.0
>