Unverified Commit b9cb6be0 authored Dec 19, 2022 by Arnd Bergmann

Merge tag 'v6.1-dts64-fixes' of...

Merge tag 'v6.1-dts64-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux into arm/fixes

MT8183: fix phandle for GPU clock
MT8195 demo: fix size of secmon reserved memory area

* tag 'v6.1-dts64-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux:
  arm64: dts: mt8183: Fix Mali GPU clock
  arm64: dts: mediatek: mt8195-demo: fix the memory size of node secmon

Link: https://lore.kernel.org/r/af4c45ce-a150-438f-dab4-e47b120c32c4@suse.com


Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parents ba4b4d02 ad2631b5

arch/arm64/boot/dts/mediatek/mt8183.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -1678,7 +1678,7 @@
		<GIC_SPI 278 IRQ_TYPE_LEVEL_LOW>;
		interrupt-names = "job", "mmu", "gpu";

		clocks = <&topckgen CLK_TOP_MFGPLL_CK>;
		clocks = <&mfgcfg CLK_MFG_BG3D>;

		power-domains =
		<&spm MT8183_POWER_DOMAIN_MFG_CORE0>,

arch/arm64/boot/dts/mediatek/mt8195-demo.dts

+2 −2

Original line number	Diff line number	Diff line
		@@ -56,10 +56,10 @@
		#size-cells = <2>;
		ranges;

		/* 192 KiB reserved for ARM Trusted Firmware (BL31) */
		/* 2 MiB reserved for ARM Trusted Firmware (BL31) */
		bl31_secmon_reserved: secmon@54600000 {
		no-map;
		reg = <0 0x54600000 0x0 0x30000>;
		reg = <0 0x54600000 0x0 0x200000>;
		};

		/* 12 MiB reserved for OP-TEE (BL32)