diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-08-29 12:20:52 +0900 |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-08-30 09:07:04 +0900 |
| commit | 6c9e46efaed5855e4ee60a770eb27b92683b0a67 (patch) | |
| tree | 1289d69400d14a61e941776f783068f319de01c5 /arch/arm/dts/uniphier-ld11.dtsi | |
| parent | 111689e744e638fb29c74003719fe03891866742 (diff) | |
| download | u-boot-6c9e46efaed5855e4ee60a770eb27b92683b0a67.tar.gz u-boot-6c9e46efaed5855e4ee60a770eb27b92683b0a67.tar.xz u-boot-6c9e46efaed5855e4ee60a770eb27b92683b0a67.zip | |
ARM: dts: uniphier: sync with Linux
Import updates queued up for Linux 4.14-rc1.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'arch/arm/dts/uniphier-ld11.dtsi')
| -rw-r--r-- | arch/arm/dts/uniphier-ld11.dtsi | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/arch/arm/dts/uniphier-ld11.dtsi b/arch/arm/dts/uniphier-ld11.dtsi index 74f8f721a8..0f172c31db 100644 --- a/arch/arm/dts/uniphier-ld11.dtsi +++ b/arch/arm/dts/uniphier-ld11.dtsi @@ -348,9 +348,11 @@ }; }; - aidet@5fc20000 { - compatible = "simple-mfd", "syscon"; + aidet: aidet@5fc20000 { + compatible = "socionext,uniphier-ld11-aidet"; reg = <0x5fc20000 0x200>; + interrupt-controller; + #interrupt-cells = <2>; }; gic: interrupt-controller@5fe00000 { @@ -376,6 +378,10 @@ compatible = "socionext,uniphier-ld11-reset"; #reset-cells = <1>; }; + + watchdog { + compatible = "socionext,uniphier-wdt"; + }; }; nand: nand@68000000 { @@ -387,9 +393,8 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_nand>; clocks = <&sys_clk 2>; - nand-ecc-strength = <8>; }; }; }; -/include/ "uniphier-pinctrl.dtsi" +#include "uniphier-pinctrl.dtsi" |