From: Masahiro Yamada <yamada.masahiro@socionext.com>
Date: Wed, 9 Aug 2017 16:43:29 +0000 (+0900)
Subject: arm64: dts: uniphier: use cross-arch include instead of symlinks
X-Git-Tag: android-x86-8.1-r1~2699^2^2~2^2~5
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6b8b062ead12a6c43dafb0ec9bc84d0a789e5f27;p=android-x86%2Fkernel.git

arm64: dts: uniphier: use cross-arch include instead of symlinks

On UniPhier platform, some DTSI files are shared between arm and arm64.
Recently, inclusion of DT material of different architectures has been
supported by the build system level.  Use #include <arm/...>, which
will work without relying on the exact same hierarchy as the kernel.

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

diff --git a/arch/arm64/boot/dts/socionext/uniphier-pinctrl.dtsi b/arch/arm64/boot/dts/socionext/uniphier-pinctrl.dtsi
deleted file mode 120000
index f42fb6f38bd3..000000000000
--- a/arch/arm64/boot/dts/socionext/uniphier-pinctrl.dtsi
+++ /dev/null
@@ -1 +0,0 @@
-../../../../arm/boot/dts/uniphier-pinctrl.dtsi
\ No newline at end of file
diff --git a/arch/arm64/boot/dts/socionext/uniphier-pinctrl.dtsi b/arch/arm64/boot/dts/socionext/uniphier-pinctrl.dtsi
new file mode 100644
index 000000000000..9caabbb8bae3
--- /dev/null
+++ b/arch/arm64/boot/dts/socionext/uniphier-pinctrl.dtsi
@@ -0,0 +1 @@
+#include <arm/uniphier-pinctrl.dtsi>
diff --git a/arch/arm64/boot/dts/socionext/uniphier-ref-daughter.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ref-daughter.dtsi
deleted file mode 120000
index 4685a8d89cba..000000000000
--- a/arch/arm64/boot/dts/socionext/uniphier-ref-daughter.dtsi
+++ /dev/null
@@ -1 +0,0 @@
-../../../../arm/boot/dts/uniphier-ref-daughter.dtsi
\ No newline at end of file
diff --git a/arch/arm64/boot/dts/socionext/uniphier-ref-daughter.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ref-daughter.dtsi
new file mode 100644
index 000000000000..e66d999d9f5d
--- /dev/null
+++ b/arch/arm64/boot/dts/socionext/uniphier-ref-daughter.dtsi
@@ -0,0 +1 @@
+#include <arm/uniphier-ref-daughter.dtsi>
diff --git a/arch/arm64/boot/dts/socionext/uniphier-support-card.dtsi b/arch/arm64/boot/dts/socionext/uniphier-support-card.dtsi
deleted file mode 120000
index 1246db9be2a1..000000000000
--- a/arch/arm64/boot/dts/socionext/uniphier-support-card.dtsi
+++ /dev/null
@@ -1 +0,0 @@
-../../../../arm/boot/dts/uniphier-support-card.dtsi
\ No newline at end of file
diff --git a/arch/arm64/boot/dts/socionext/uniphier-support-card.dtsi b/arch/arm64/boot/dts/socionext/uniphier-support-card.dtsi
new file mode 100644
index 000000000000..28c5b4ed1d95
--- /dev/null
+++ b/arch/arm64/boot/dts/socionext/uniphier-support-card.dtsi
@@ -0,0 +1 @@
+#include <arm/uniphier-support-card.dtsi>