Skip to content

Commit b9cb6be

Browse files
committed
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/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents ba4b4d0 + ad2631b commit b9cb6be

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1678,7 +1678,7 @@
16781678
<GIC_SPI 278 IRQ_TYPE_LEVEL_LOW>;
16791679
interrupt-names = "job", "mmu", "gpu";
16801680

1681-
clocks = <&topckgen CLK_TOP_MFGPLL_CK>;
1681+
clocks = <&mfgcfg CLK_MFG_BG3D>;
16821682

16831683
power-domains =
16841684
<&spm MT8183_POWER_DOMAIN_MFG_CORE0>,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@
5656
#size-cells = <2>;
5757
ranges;
5858

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

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

0 commit comments

Comments
 (0)