Skip to content

Commit 33acea2

Browse files
Zebra345superna9999
authored andcommitted
arm64: dts: meson-g12-common: resolve conflict between canvas & pmu
According to S905X2 Datasheet - Revision 07: DMC_MON area spans 0xff638080-0xff6380c0 DDR_PLL area spans 0xff638c00-0xff638c34 Round DDR_PLL area size up to 0x40 Fixes: 90cf8e2 ("arm64: dts: meson: Add DDR PMU node") Signed-off-by: Marc Gonzalez <[email protected]> Reviewed-by: Neil Armstrong <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Neil Armstrong <[email protected]>
1 parent aec4353 commit 33acea2

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1579,6 +1579,12 @@
15791579
compatible = "amlogic,canvas";
15801580
reg = <0x0 0x48 0x0 0x14>;
15811581
};
1582+
1583+
pmu: pmu@80 {
1584+
reg = <0x0 0x80 0x0 0x40>,
1585+
<0x0 0xc00 0x0 0x40>;
1586+
interrupts = <GIC_SPI 52 IRQ_TYPE_EDGE_RISING>;
1587+
};
15821588
};
15831589

15841590
usb2_phy1: phy@3a000 {
@@ -1704,12 +1710,6 @@
17041710
};
17051711
};
17061712

1707-
pmu: pmu@ff638000 {
1708-
reg = <0x0 0xff638000 0x0 0x100>,
1709-
<0x0 0xff638c00 0x0 0x100>;
1710-
interrupts = <GIC_SPI 52 IRQ_TYPE_EDGE_RISING>;
1711-
};
1712-
17131713
aobus: bus@ff800000 {
17141714
compatible = "simple-bus";
17151715
reg = <0x0 0xff800000 0x0 0x100000>;

0 commit comments

Comments
 (0)