diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-01-05 12:08:20 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-01-05 12:08:20 +0100 |
commit | 4797aa72b8e4f7696627f2459a0732d1ca51b37d (patch) | |
tree | d59f35402120e399fbb54b985c329d0d2d0cbd8f /arch/mips/dts | |
parent | 3dbe78ab5c0be677b142a6c111942557ba761f1c (diff) | |
parent | a41fc5eba7719dad32e1024a0b1743cbbce3def3 (diff) | |
download | barebox-4797aa72b8e4f7696627f2459a0732d1ca51b37d.tar.gz barebox-4797aa72b8e4f7696627f2459a0732d1ca51b37d.tar.xz |
Merge branch 'for-next/wd'
Diffstat (limited to 'arch/mips/dts')
-rw-r--r-- | arch/mips/dts/ar9331.dtsi | 6 | ||||
-rw-r--r-- | arch/mips/dts/ar9344-tl-wdr4300-v1.7.dts | 4 | ||||
-rw-r--r-- | arch/mips/dts/ar9344.dtsi | 7 |
3 files changed, 17 insertions, 0 deletions
diff --git a/arch/mips/dts/ar9331.dtsi b/arch/mips/dts/ar9331.dtsi index b4b8b766b9..42baae1e89 100644 --- a/arch/mips/dts/ar9331.dtsi +++ b/arch/mips/dts/ar9331.dtsi @@ -1,5 +1,11 @@ / { ahb { + wdt0: wdt@18060008 { + compatible = "qca,ar9331-wdt", "qca,ar9344-wdt"; + reg = <0x18060008 0x8>; + clocks = <&pll ATH79_CLK_CPU>; + }; + mac0: mac@19000000 { compatible = "qca,ar9331-ge0"; reg = <0x18070000 0x00000100>, diff --git a/arch/mips/dts/ar9344-tl-wdr4300-v1.7.dts b/arch/mips/dts/ar9344-tl-wdr4300-v1.7.dts index d16cab0052..5216cdc1e2 100644 --- a/arch/mips/dts/ar9344-tl-wdr4300-v1.7.dts +++ b/arch/mips/dts/ar9344-tl-wdr4300-v1.7.dts @@ -38,6 +38,10 @@ clock-frequency = <40000000>; }; +&wdt0 { + status = "okay"; +}; + &spi { num-chipselects = <1>; status = "okay"; diff --git a/arch/mips/dts/ar9344.dtsi b/arch/mips/dts/ar9344.dtsi index 0a7171b8dc..009ff6f87a 100644 --- a/arch/mips/dts/ar9344.dtsi +++ b/arch/mips/dts/ar9344.dtsi @@ -58,6 +58,13 @@ #clock-cells = <1>; }; + wdt0: wdt@18060008 { + compatible = "qca,ar9344-wdt"; + reg = <0x18060008 0x8>; + clocks = <&pll ATH79_CLK_CPU>; + status = "disabled"; + }; + spi: spi@1f000000 { compatible = "qca,ar7100-spi", "qca,ar9344-spi"; reg = <0x1f000000 0x1c>; |