diff options
| author | Graeme Gregory <graeme.gregory@linaro.org> | 2016-02-01 10:10:49 +0000 |
|---|---|---|
| committer | Graeme Gregory <graeme.gregory@linaro.org> | 2016-02-01 10:10:49 +0000 |
| commit | 8dc96ffb33aa83cf4a4703517e43cfcdaee4dbce (patch) | |
| tree | d0990001885cc28ad57937f466fb27a5ba9658b1 /arch | |
| parent | e7e675ea55004477fe8c61ef947e4c4f8c06c255 (diff) | |
| parent | 76649b1fb139fdf34941f17092ddfc013fd1d01c (diff) | |
Merge tag 'topic-sbsa-watchdog-20160122.0' into leg-kernel
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/boot/dts/amd/amd-seattle-soc.dtsi | 8 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/arm/foundation-v8.dts | 7 |
2 files changed, 15 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/amd/amd-seattle-soc.dtsi b/arch/arm64/boot/dts/amd/amd-seattle-soc.dtsi index 2874d92881fd..f62d60c1a9ca 100644 --- a/arch/arm64/boot/dts/amd/amd-seattle-soc.dtsi +++ b/arch/arm64/boot/dts/amd/amd-seattle-soc.dtsi @@ -84,6 +84,14 @@ clock-names = "uartclk", "apb_pclk"; }; + watchdog0: watchdog@e0bb0000 { + compatible = "arm,sbsa-gwdt"; + reg = <0x0 0xe0bc0000 0 0x1000>, + <0x0 0xe0bb0000 0 0x1000>; + interrupts = <0 337 4>; + timeout-sec = <60 30>; + }; + spi0: ssp@e1020000 { status = "disabled"; compatible = "arm,pl022", "arm,primecell"; diff --git a/arch/arm64/boot/dts/arm/foundation-v8.dts b/arch/arm64/boot/dts/arm/foundation-v8.dts index 4eac8dcea423..1a4fc40cbf0b 100644 --- a/arch/arm64/boot/dts/arm/foundation-v8.dts +++ b/arch/arm64/boot/dts/arm/foundation-v8.dts @@ -237,4 +237,11 @@ }; }; }; + watchdog@2a440000 { + compatible = "arm,sbsa-gwdt"; + reg = <0x0 0x2a440000 0 0x1000>, + <0x0 0x2a450000 0 0x1000>; + interrupts = <0 27 4>; + timeout-sec = <60 30>; + }; }; |