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-sld8.dtsi | |
parent | 111689e744e638fb29c74003719fe03891866742 (diff) |
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-sld8.dtsi')
-rw-r--r-- | arch/arm/dts/uniphier-sld8.dtsi | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/dts/uniphier-sld8.dtsi b/arch/arm/dts/uniphier-sld8.dtsi index 7d6370f6af..a3de26b40c 100644 --- a/arch/arm/dts/uniphier-sld8.dtsi +++ b/arch/arm/dts/uniphier-sld8.dtsi @@ -424,9 +424,11 @@ interrupt-controller; }; - aidet@61830000 { - compatible = "simple-mfd", "syscon"; + aidet: aidet@61830000 { + compatible = "socionext,uniphier-sld8-aidet"; reg = <0x61830000 0x200>; + interrupt-controller; + #interrupt-cells = <2>; }; sysctrl@61840000 { @@ -452,11 +454,10 @@ reg = <0x68000000 0x20>, <0x68100000 0x1000>; interrupts = <0 65 4>; pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_nand>; + pinctrl-0 = <&pinctrl_nand2cs>; clocks = <&sys_clk 2>; - nand-ecc-strength = <8>; }; }; }; -/include/ "uniphier-pinctrl.dtsi" +#include "uniphier-pinctrl.dtsi" |