diff options
| author | Olof Johansson <olof@lixom.net> | 2017-08-29 22:41:34 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-08-29 22:41:34 -0700 |
| commit | 983d7c4570dfd08990fbb8fe9ad6686214173af1 (patch) | |
| tree | 47edea28f861891299994e51a0fb8b11a17ad297 /arch/arm/boot/dts/uniphier-pro4.dtsi | |
| parent | 940bf1d6f7433b654899c94ea9bdccc70e4d4622 (diff) | |
| parent | 8a7a516afaed2ee6b5da551a01c573eba3b69c16 (diff) | |
Merge tag 'uniphier-dt-v4.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier into next/dt
UniPhier ARM SoC DT updates for v4.14 (2nd)
- add AIDET irqchip device nodes
- fix size of sdctrl node
- add ethernet pinmux nodes
* tag 'uniphier-dt-v4.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier:
ARM: dts: uniphier: add pinctrl groups of ethernet phy mode
ARM: dts: uniphier: fix size of sdctrl nodes
ARM: dts: uniphier: add AIDET nodes
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/uniphier-pro4.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/uniphier-pro4.dtsi | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/uniphier-pro4.dtsi b/arch/arm/boot/dts/uniphier-pro4.dtsi index 0c43d7836015..b3dbbd9b6e39 100644 --- a/arch/arm/boot/dts/uniphier-pro4.dtsi +++ b/arch/arm/boot/dts/uniphier-pro4.dtsi @@ -268,6 +268,13 @@ }; }; + aidet: aidet@5fc20000 { + compatible = "socionext,uniphier-pro4-aidet"; + reg = <0x5fc20000 0x200>; + interrupt-controller; + #interrupt-cells = <2>; + }; + timer@60000200 { compatible = "arm,cortex-a9-global-timer"; reg = <0x60000200 0x20>; |