BCM270X_DT: Minor cosmetic DT tidy

Deleting the timer node for all bcm27* DTBs than re-adding an identical
one for bcm2708 is wrong - just delete it where it isn't wanted.

Also change a #include to match the style of similar includes.

Signed-off-by: Phil Elwell <phil@raspberrypi.org>

diff --git a/arch/arm/boot/dts/bcm2708.dtsi b/arch/arm/boot/dts/bcm2708.dtsi
index 0f72bd90c591a2e8752d7437fa7e8c6308bd8c3f..d3bd39bbd5e414eab3008e95b3536b20464fafb9 100644 (file)
--- a/arch/arm/boot/dts/bcm2708.dtsi
+++ b/arch/arm/boot/dts/bcm2708.dtsi
@@ -3,14 +3,5 @@
 #include "bcm2708-rpi.dtsi"
 
 / {
-       soc {
-               timer@7e003000 {
-                       compatible = "brcm,bcm2835-system-timer";
-                       reg = <0x7e003000 0x1000>;
-                       interrupts = <1 0>, <1 1>, <1 2>, <1 3>;
-                       clock-frequency = <1000000>;
-               };
-       };
-
        /delete-node/ cpus;
 };

diff --git a/arch/arm/boot/dts/bcm2709.dtsi b/arch/arm/boot/dts/bcm2709.dtsi
index c3aedc6541ad00c9c4312bd2ac5882c19608b76b..715f5aca753e515d4ddd0557fb5157bdf175ff2b 100644 (file)
--- a/arch/arm/boot/dts/bcm2709.dtsi
+++ b/arch/arm/boot/dts/bcm2709.dtsi
@@ -6,6 +6,8 @@
        soc {
                ranges = <0x7e000000 0x3f000000 0x01000000>,
                         <0x40000000 0x40000000 0x00040000>;
+
+               /delete-node/ timer@7e003000;
        };
 
        __overrides__ {

diff --git a/arch/arm/boot/dts/bcm270x.dtsi b/arch/arm/boot/dts/bcm270x.dtsi
index cf8564bbe2b0bfd31b6bc1e929db293526d24e5e..8fba2e245a094bfabf7133707edb32f8167a3412 100644 (file)
--- a/arch/arm/boot/dts/bcm270x.dtsi
+++ b/arch/arm/boot/dts/bcm270x.dtsi
@@ -1,5 +1,5 @@
 /* Downstream bcm283x.dtsi diff */
-#include "dt-bindings/power/raspberrypi-power.h"
+#include <dt-bindings/power/raspberrypi-power.h>
 
 / {
        chosen {
@@ -8,8 +8,6 @@
 
        soc: soc {
 
-               /delete-node/ timer@7e003000;
-
                watchdog: watchdog@7e100000 {
                        /* Add alias */
                };

diff --git a/arch/arm/boot/dts/bcm2710.dtsi b/arch/arm/boot/dts/bcm2710.dtsi
index 3f2a2a259754535234994486f5c8a8b71119f600..2671731ff440b34da5af52637be451ad53eeffb2 100644 (file)
--- a/arch/arm/boot/dts/bcm2710.dtsi
+++ b/arch/arm/boot/dts/bcm2710.dtsi
@@ -29,6 +29,8 @@
                        interrupts = <9>;
                };
 
+               /delete-node/ timer@7e003000;
+
                timer {
 #ifdef RPI364
                        compatible = "arm,armv8-timer", "arm,armv7-timer";