diff options
| author | Tom Rini <trini@konsulko.com> | 2017-09-01 10:32:35 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-09-01 10:32:35 -0400 |
| commit | e4adc8ed3c684f41a307fde275e683a391f2a7ce (patch) | |
| tree | fb6f32cbdce3cd231c7b5e4ab0aceed2198da499 /arch/arm/dts/uniphier-ld11.dtsi | |
| parent | 9ec61dbc801761374466e0c8393faaa1e7705520 (diff) | |
| parent | 0cc0c544bc317548885721d2312c90185642f98c (diff) | |
Merge git://git.denx.de/u-boot-uniphier
- add {ofnode,dev}_read_resource_byname
- provide DT probe hook to Denali NAND driver
- update clk/reset driver
- update DT
- misc cleanups
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" |