openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge tag 'meson-wdt-dt-3.18' of https://github.com/carlocaione/linux-meson into next/dt 

Merge "Meson6 WDT support" from Carlo Caione:

This patch adds the support for the Meson6 watchdog in the DTSI

* tag 'meson-wdt-dt-3.18' of https://github.com/carlocaione/linux-meson:
  ARM: DTS: meson: update DTSI to add watchdog node

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2014-10-08 21:19:21 +02:00
parent 4394a00145 d4ac2cfea7
commit ee48874d4a
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/boot/dts/meson.dtsi
View File

@ -70,6 +70,11 @@ soc {
#size-cells = <1>;
ranges;
wdt: watchdog@c1109900 {
compatible = "amlogic,meson6-wdt";
reg = <0xc1109900 0x8>;
};
uart_AO: serial@c81004c0 {
compatible = "amlogic,meson-uart";
reg = <0xc81004c0 0x14>;