1 From 021d54e3ae67e2b02310b9e3e871876a2c3b7eee Mon Sep 17 00:00:00 2001
2 From: Phil Elwell <phil@raspberrypi.org>
3 Date: Wed, 29 May 2019 15:19:21 +0100
4 Subject: [PATCH] BCM270X_DT: Minor tidy up
6 Move arm_pmu out of soc on bcm2710, and labels aren't aliases.
8 Signed-off-by: Phil Elwell <phil@raspberrypi.org>
10 arch/arm/boot/dts/bcm270x.dtsi | 14 +++++++-------
11 arch/arm/boot/dts/bcm2710.dtsi | 13 +++++--------
12 2 files changed, 12 insertions(+), 15 deletions(-)
14 --- a/arch/arm/boot/dts/bcm270x.dtsi
15 +++ b/arch/arm/boot/dts/bcm270x.dtsi
19 watchdog: watchdog@7e100000 {
24 random: rng@7e104000 {
29 gpio@7e200000 { /* gpio */
36 dmas = <&dma 6>, <&dma 7>;
37 dma-names = "tx", "rx";
40 pixelvalve0: pixelvalve@7e206000 {
46 pixelvalve1: pixelvalve@7e207000 {
64 pixelvalve2: pixelvalve@7e807000 {
70 --- a/arch/arm/boot/dts/bcm2710.dtsi
71 +++ b/arch/arm/boot/dts/bcm2710.dtsi
74 compatible = "brcm,bcm2837", "brcm,bcm2836";
81 - compatible = "arm,armv8-pmuv3", "arm,cortex-a7-pmu";
82 + compatible = "arm,armv8-pmuv3", "arm,cortex-a7-pmu";
84 - compatible = "arm,cortex-a7-pmu";
85 + compatible = "arm,cortex-a7-pmu";
87 - interrupt-parent = <&local_intc>;
88 - interrupts = <9 IRQ_TYPE_LEVEL_HIGH>;
93 /delete-node/ timer@7e003000;