|
 |
958e60d |
From 8b213eacdfbf67978a94f28f52481ea611e83f15 Mon Sep 17 00:00:00 2001
|
|
|
958e60d |
From: Peter Robinson <pbrobinson@gmail.com>
|
|
|
958e60d |
Date: Wed, 3 Jul 2019 12:34:19 +0100
|
|
|
958e60d |
Subject: [PATCH 2/2] Revert "ARM: bcm283x: Extend the WDT DT node out to cover
|
|
|
958e60d |
the whole PM block. (v4)"
|
|
|
958e60d |
|
|
|
958e60d |
This reverts commit 81fc035f07d230c0f687ef09d5ecf2c885dba8ae.
|
|
|
958e60d |
---
|
|
|
958e60d |
arch/arm/boot/dts/bcm283x.dtsi | 13 ++-----------
|
|
|
958e60d |
1 file changed, 2 insertions(+), 11 deletions(-)
|
|
|
958e60d |
|
|
|
958e60d |
diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi
|
|
|
958e60d |
index 20ed8b1da11b..31b29646b14c 100644
|
|
|
958e60d |
--- a/arch/arm/boot/dts/bcm283x.dtsi
|
|
|
958e60d |
+++ b/arch/arm/boot/dts/bcm283x.dtsi
|
|
|
958e60d |
@@ -121,17 +121,8 @@
|
|
|
958e60d |
};
|
|
|
958e60d |
|
|
|
958e60d |
watchdog@7e100000 {
|
|
|
958e60d |
- compatible = "brcm,bcm2835-pm", "brcm,bcm2835-pm-wdt";
|
|
|
958e60d |
- #power-domain-cells = <1>;
|
|
|
958e60d |
- #reset-cells = <1>;
|
|
|
958e60d |
- reg = <0x7e100000 0x114>,
|
|
|
958e60d |
- <0x7e00a000 0x24>;
|
|
|
958e60d |
- clocks = <&clocks BCM2835_CLOCK_V3D>,
|
|
|
958e60d |
- <&clocks BCM2835_CLOCK_PERI_IMAGE>,
|
|
|
958e60d |
- <&clocks BCM2835_CLOCK_H264>,
|
|
|
958e60d |
- <&clocks BCM2835_CLOCK_ISP>;
|
|
|
958e60d |
- clock-names = "v3d", "peri_image", "h264", "isp";
|
|
|
958e60d |
- system-power-controller;
|
|
|
958e60d |
+ compatible = "brcm,bcm2835-pm-wdt";
|
|
|
958e60d |
+ reg = <0x7e100000 0x28>;
|
|
|
958e60d |
};
|
|
|
958e60d |
|
|
|
958e60d |
clocks: cprman@7e101000 {
|
|
|
958e60d |
--
|
|
|
958e60d |
2.21.0
|
|
|
958e60d |
|