diff options
author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-06-29 19:38:56 +0900 |
---|---|---|
committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-07-02 05:44:29 +0900 |
commit | c4adc50ea66436438f10d7eedb00d2c441ec9dbe (patch) | |
tree | 66df229bd395d4d72e38d6abdd878010c7aacf86 /arch/arm/dts/uniphier-ph1-pro5.dtsi | |
parent | aac641bcf43207feeca5335f5b98d955fe84c257 (diff) | |
download | talos-obmc-uboot-c4adc50ea66436438f10d7eedb00d2c441ec9dbe.tar.gz talos-obmc-uboot-c4adc50ea66436438f10d7eedb00d2c441ec9dbe.zip |
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>
Diffstat (limited to 'arch/arm/dts/uniphier-ph1-pro5.dtsi')
-rw-r--r-- | arch/arm/dts/uniphier-ph1-pro5.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/dts/uniphier-ph1-pro5.dtsi b/arch/arm/dts/uniphier-ph1-pro5.dtsi index bd1b4b1b66..5b7f6e87e7 100644 --- a/arch/arm/dts/uniphier-ph1-pro5.dtsi +++ b/arch/arm/dts/uniphier-ph1-pro5.dtsi @@ -431,7 +431,7 @@ }; &pinctrl { - compatible = "socionext,ph1-pro5-pinctrl", "syscon"; + compatible = "socionext,uniphier-pro5-pinctrl"; }; &sysctrl { |