aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2016-06-14 12:01:41 +0900
committerOlof Johansson <olof@lixom.net>2016-06-14 10:40:15 -0700
commited6cca5f9a69cba9468ed1c467009bb12bc90287 (patch)
tree1aea9f8f7b3b8fb73df8124f70fdcffe334b152d
parentMerge tag 'renesas-arm64-dt-for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt64 (diff)
downloadwireguard-linux-ed6cca5f9a69cba9468ed1c467009bb12bc90287.tar.xz
wireguard-linux-ed6cca5f9a69cba9468ed1c467009bb12bc90287.zip
arm64: dts: uniphier: add SoC-Glue node to UniPhier 64bit SoCs
This node consists of various system-level configuration registers. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r--arch/arm64/boot/dts/socionext/uniphier-ph1-ld20.dtsi10
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/arm64/boot/dts/socionext/uniphier-ph1-ld20.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ph1-ld20.dtsi
index 95328808e3c1..31dc51b7610f 100644
--- a/arch/arm64/boot/dts/socionext/uniphier-ph1-ld20.dtsi
+++ b/arch/arm64/boot/dts/socionext/uniphier-ph1-ld20.dtsi
@@ -264,9 +264,13 @@
reg = <0x59801000 0x400>;
};
- pinctrl: pinctrl@5f801000 {
- compatible = "socionext,ph1-ld20-pinctrl", "syscon";
- reg = <0x5f801000 0xe00>;
+ soc-glue@5f800000 {
+ compatible = "simple-mfd", "syscon";
+ reg = <0x5f800000 0x2000>;
+
+ pinctrl: pinctrl {
+ compatible = "socionext,uniphier-ld20-pinctrl";
+ };
};
gic: interrupt-controller@5fe00000 {