| Message ID | 1434195541-28368-3-git-send-email-noralf@tronnes.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 06/13/2015 05:39 AM, Noralf Trønnes wrote: > The Raspberry Pi uses a new value for halt in the PM_RSTS watchdog > register. Expand the compatible string to cover this. FWIW, the series, Tested-by: Stephen Warren <swarren@wwwdotorg.org> ... but that doesn't imply my ack for the patches.
diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi index 46780bb..feb1282 100644 --- a/arch/arm/boot/dts/bcm2835-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi @@ -16,6 +16,10 @@ }; }; +&watchdog { + compatible = "brcm,raspberrypi-pm-wdt", "brcm,bcm2835-pm-wdt"; +}; + &gpio { pinctrl-names = "default"; diff --git a/arch/arm/boot/dts/bcm2835.dtsi b/arch/arm/boot/dts/bcm2835.dtsi index 301c73f..3445bb3 100644 --- a/arch/arm/boot/dts/bcm2835.dtsi +++ b/arch/arm/boot/dts/bcm2835.dtsi @@ -52,7 +52,7 @@ #interrupt-cells = <2>; }; - watchdog@7e100000 { + watchdog: watchdog@7e100000 { compatible = "brcm,bcm2835-pm-wdt"; reg = <0x7e100000 0x28>; };
The Raspberry Pi uses a new value for halt in the PM_RSTS watchdog register. Expand the compatible string to cover this. Signed-off-by: Noralf Trønnes <noralf@tronnes.org> --- arch/arm/boot/dts/bcm2835-rpi.dtsi | 4 ++++ arch/arm/boot/dts/bcm2835.dtsi | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)