Commit 8c1a1f48 authored by Anson Huang's avatar Anson Huang Committed by Shawn Guo
Browse files

ARM: dts: imx6ul: move GIC to right location in DT 



GIC is inside of SoC from architecture perspective, it should
be located inside of soc node in DT.

Signed-off-by: default avatarAnson Huang <Anson.Huang@nxp.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent b051589c

arch/arm/boot/dts/imx6ul.dtsi

+12 −12
Original line number Diff line number Diff line
@@ -93,18 +93,6 @@ 
		};

	};



	intc: interrupt-controller@a01000 {

		compatible = "arm,gic-400", "arm,cortex-a7-gic";

		interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_HIGH)>;

		#interrupt-cells = <3>;

		interrupt-controller;

		interrupt-parent = <&intc>;

		reg = <0x00a01000 0x1000>,

		      <0x00a02000 0x2000>,

		      <0x00a04000 0x2000>,

		      <0x00a06000 0x2000>;

	};



	timer {

		compatible = "arm,armv7-timer";

		interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_LOW)>,
@@ -171,6 +159,18 @@ 
			reg = <0x00900000 0x20000>;

		};



		intc: interrupt-controller@a01000 {

			compatible = "arm,gic-400", "arm,cortex-a7-gic";

			interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_HIGH)>;

			#interrupt-cells = <3>;

			interrupt-controller;

			interrupt-parent = <&intc>;

			reg = <0x00a01000 0x1000>,

			      <0x00a02000 0x2000>,

			      <0x00a04000 0x2000>,

			      <0x00a06000 0x2000>;

		};



		dma_apbh: dma-apbh@1804000 {

			compatible = "fsl,imx6q-dma-apbh", "fsl,imx28-dma-apbh";

			reg = <0x01804000 0x2000>;