Skip to content

Commit 94cdfe3

Browse files
committed
Merge tag 'juno-updates-7.0' of https://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into soc/dt
Armv8 Juno/Vexpress updates for v7.0 This contains a small set of DT updates: 1. Align DTS node naming with established coding style by replacing underscores with hyphens in node names. This is a safe change and does not affect ABI. 2. Add support for the CMN PMU on the Arm Morello platform, exposing the CMN-Skeena (CMN-600 r3p1–compatible) PMU via the standard CMN-600 binding. This enables PMU access on real Morello SDP hardware, where the registers are functional. * tag 'juno-updates-7.0' of https://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux: arm64: dts: arm: Use hyphen in node names arm64: dts: morello: Add CMN PMU Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
2 parents aa5f91c + f0d0f08 commit 94cdfe3

2 files changed

Lines changed: 11 additions & 4 deletions

File tree

arch/arm64/boot/dts/arm/morello-fvp.dts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,25 +25,25 @@
2525
clock-output-names = "bp:clock24mhz";
2626
};
2727

28-
block_0: virtio_block@1c170000 {
28+
block_0: virtio-block@1c170000 {
2929
compatible = "virtio,mmio";
3030
reg = <0x0 0x1c170000 0x0 0x200>;
3131
interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
3232
};
3333

34-
net_0: virtio_net@1c180000 {
34+
net_0: virtio-net@1c180000 {
3535
compatible = "virtio,mmio";
3636
reg = <0x0 0x1c180000 0x0 0x200>;
3737
interrupts = <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>;
3838
};
3939

40-
rng_0: virtio_rng@1c190000 {
40+
rng_0: virtio-rng@1c190000 {
4141
compatible = "virtio,mmio";
4242
reg = <0x0 0x1c190000 0x0 0x200>;
4343
interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>;
4444
};
4545

46-
p9_0: virtio_p9@1c1a0000 {
46+
p9_0: virtio-p9@1c1a0000 {
4747
compatible = "virtio,mmio";
4848
reg = <0x0 0x1c1a0000 0x0 0x200>;
4949
interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;

arch/arm64/boot/dts/arm/morello-sdp.dts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,13 @@
108108
dma-coherent;
109109
};
110110

111+
pmu@50000000 {
112+
compatible = "arm,cmn-600";
113+
reg = <0x0 0x50000000 0x0 0x4000000>;
114+
interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>;
115+
arm,root-node = <0x804000>;
116+
};
117+
111118
pcie_ctlr: pcie@28c0000000 {
112119
device_type = "pci";
113120
compatible = "pci-host-ecam-generic";

0 commit comments

Comments
 (0)