1 From 64a33f1beb4afc4b1b382fdadd6ac79a837a5e6f Mon Sep 17 00:00:00 2001
2 From: Phil Elwell <phil@raspberrypi.org>
3 Date: Tue, 6 Feb 2018 11:48:17 +0000
4 Subject: [PATCH 194/454] BCM270X_DT: Minor cosmetic DT tidy
6 Deleting the timer node for all bcm27* DTBs than re-adding an identical
7 one for bcm2708 is wrong - just delete it where it isn't wanted.
9 Also change a #include to match the style of similar includes.
11 Signed-off-by: Phil Elwell <phil@raspberrypi.org>
13 arch/arm/boot/dts/bcm2708.dtsi | 9 ---------
14 arch/arm/boot/dts/bcm2709.dtsi | 2 ++
15 arch/arm/boot/dts/bcm270x.dtsi | 4 +---
16 arch/arm/boot/dts/bcm2710.dtsi | 2 ++
17 4 files changed, 5 insertions(+), 12 deletions(-)
19 --- a/arch/arm/boot/dts/bcm2708.dtsi
20 +++ b/arch/arm/boot/dts/bcm2708.dtsi
22 #include "bcm2708-rpi.dtsi"
27 - compatible = "brcm,bcm2835-system-timer";
28 - reg = <0x7e003000 0x1000>;
29 - interrupts = <1 0>, <1 1>, <1 2>, <1 3>;
30 - clock-frequency = <1000000>;
37 --- a/arch/arm/boot/dts/bcm2709.dtsi
38 +++ b/arch/arm/boot/dts/bcm2709.dtsi
41 ranges = <0x7e000000 0x3f000000 0x01000000>,
42 <0x40000000 0x40000000 0x00040000>;
44 + /delete-node/ timer@7e003000;
48 --- a/arch/arm/boot/dts/bcm270x.dtsi
49 +++ b/arch/arm/boot/dts/bcm270x.dtsi
51 /* Downstream bcm283x.dtsi diff */
52 -#include "dt-bindings/power/raspberrypi-power.h"
53 +#include <dt-bindings/power/raspberrypi-power.h>
61 - /delete-node/ timer@7e003000;
63 watchdog: watchdog@7e100000 {
66 --- a/arch/arm/boot/dts/bcm2710.dtsi
67 +++ b/arch/arm/boot/dts/bcm2710.dtsi
69 interrupt-parent = <&local_intc>;
73 + /delete-node/ timer@7e003000;