Commit 32f714d3 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'hisi-arm64-dt-for-5.5' of git://github.com/hisilicon/linux-hisi into arm/dt

ARM64: DT: Hisilicon SoCs DT updates for 5.5

- add Mali450 MP4 GPU node in the hi6220 SoC

* tag 'hisi-arm64-dt-for-5.5' of git://github.com/hisilicon/linux-hisi:
  arm64: dts: hisilicon: Add Mali-450 MP4 GPU DT entry

Link: https://lore.kernel.org/r/5DB95AAB.8060405@hisilicon.com


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents a1094a7c 37a92df9
Loading
Loading
Loading
Loading
+38 −0
Original line number Diff line number Diff line
@@ -260,6 +260,7 @@
			compatible = "hisilicon,hi6220-aoctrl", "syscon";
			reg = <0x0 0xf7800000 0x0 0x2000>;
			#clock-cells = <1>;
			#reset-cells = <1>;
		};

		sys_ctrl: sys_ctrl@f7030000 {
@@ -1021,6 +1022,43 @@
			clock-names = "apb_pclk";
			cpu = <&cpu7>;
		};

		mali: gpu@f4080000 {
			compatible = "hisilicon,hi6220-mali", "arm,mali-450";
			reg = <0x0 0xf4080000 0x0 0x00040000>;
			interrupt-parent = <&gic>;
			interrupts =	<GIC_PPI 126 IRQ_TYPE_LEVEL_HIGH>,
					<GIC_PPI 126 IRQ_TYPE_LEVEL_HIGH>,
					<GIC_PPI 126 IRQ_TYPE_LEVEL_HIGH>,
					<GIC_PPI 126 IRQ_TYPE_LEVEL_HIGH>,
					<GIC_PPI 126 IRQ_TYPE_LEVEL_HIGH>,
					<GIC_PPI 126 IRQ_TYPE_LEVEL_HIGH>,
					<GIC_PPI 126 IRQ_TYPE_LEVEL_HIGH>,
					<GIC_PPI 126 IRQ_TYPE_LEVEL_HIGH>,
					<GIC_PPI 126 IRQ_TYPE_LEVEL_HIGH>,
					<GIC_PPI 126 IRQ_TYPE_LEVEL_HIGH>,
					<GIC_PPI 126 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "gp",
					  "gpmmu",
					  "pp",
					  "pp0",
					  "ppmmu0",
					  "pp1",
					  "ppmmu1",
					  "pp2",
					  "ppmmu2",
					  "pp3",
					  "ppmmu3";
			clocks = <&media_ctrl HI6220_G3D_CLK>,
				 <&media_ctrl HI6220_G3D_PCLK>;
			clock-names = "core", "bus";
			assigned-clocks = <&media_ctrl HI6220_G3D_CLK>,
					  <&media_ctrl HI6220_G3D_PCLK>;
			assigned-clock-rates = <500000000>, <144000000>;
			reset-names = "ao_g3d", "media_g3d";
			resets = <&ao_ctrl AO_G3D>, <&media_ctrl MEDIA_G3D>;
		};
	};
};