From 6b8b062ead12a6c43dafb0ec9bc84d0a789e5f27 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Thu, 10 Aug 2017 01:43:29 +0900 Subject: [PATCH] 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 , which will work without relying on the exact same hierarchy as the kernel. Signed-off-by: Masahiro Yamada --- arch/arm64/boot/dts/socionext/uniphier-pinctrl.dtsi | 2 +- arch/arm64/boot/dts/socionext/uniphier-ref-daughter.dtsi | 2 +- arch/arm64/boot/dts/socionext/uniphier-support-card.dtsi | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) mode change 120000 => 100644 arch/arm64/boot/dts/socionext/uniphier-pinctrl.dtsi mode change 120000 => 100644 arch/arm64/boot/dts/socionext/uniphier-ref-daughter.dtsi mode change 120000 => 100644 arch/arm64/boot/dts/socionext/uniphier-support-card.dtsi 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 f42fb6f..0000000 --- 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 0000000..9caabbb --- /dev/null +++ b/arch/arm64/boot/dts/socionext/uniphier-pinctrl.dtsi @@ -0,0 +1 @@ +#include 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 4685a8d..0000000 --- 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 0000000..e66d999 --- /dev/null +++ b/arch/arm64/boot/dts/socionext/uniphier-ref-daughter.dtsi @@ -0,0 +1 @@ +#include 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 1246db9..0000000 --- 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 0000000..28c5b4e --- /dev/null +++ b/arch/arm64/boot/dts/socionext/uniphier-support-card.dtsi @@ -0,0 +1 @@ +#include -- 2.7.4