commit 1174603f1fb5973f0d888013dd23a1e02475247f
author Masahiro Yamada <yamada.masahiro@socionext.com> Wed Jun 29 19:38:56 2016 +0900
committer Masahiro Yamada <yamada.masahiro@socionext.com> Sat Jul 02 05:44:29 2016 +0900
tree 66df229bd395d4d72e38d6abdd878010c7aacf86
parent 80a6a148de9b0adb54d81ccf03f5e0f663debe38

ARM: dts: uniphier: sync Device Trees with upstream Linux

I periodically sync Device Trees for better maintainability.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

arch/arm/dts/uniphier-proxstream2.dtsi

diff --git a/arch/arm/dts/uniphier-proxstream2.dtsi b/arch/arm/dts/uniphier-proxstream2.dtsi
index 12968bd..0a8c049 100644
--- a/arch/arm/dts/uniphier-proxstream2.dtsi
+++ b/arch/arm/dts/uniphier-proxstream2.dtsi
@@ -435,7 +435,7 @@
 };
 
 &pinctrl {
-	compatible = "socionext,proxstream2-pinctrl", "syscon";
+	compatible = "socionext,uniphier-pxs2-pinctrl";
 };
 
 &sysctrl {