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-proxstream2.dtsi | |
| parent | aac641bcf43207feeca5335f5b98d955fe84c257 (diff) | |
| download | blackbird-obmc-uboot-c4adc50ea66436438f10d7eedb00d2c441ec9dbe.tar.gz blackbird-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-proxstream2.dtsi')
| -rw-r--r-- | arch/arm/dts/uniphier-proxstream2.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/dts/uniphier-proxstream2.dtsi b/arch/arm/dts/uniphier-proxstream2.dtsi index 12968bdd17..0a8c049d74 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 { |
