powerpc/dts: Move mvme2500.dts back in the right place

powerpc/dts: Move mvme2500.dts back in the right place

[Alessio Igor Bogani]

Commit dc37374b9c83 ("powerpc/fsl: Move Freescale device tree files into
fsl folder") move also mvme2500.dts which isn't a device tree for a
Freescale board but for an Artesyn one. So move mvme2500.dts back in the
right place.

Signed-off-by: Alessio Igor Bogani <alessio.bogani@elettra.eu>
---
 arch/powerpc/boot/dts/{fsl => }/mvme2500.dts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename arch/powerpc/boot/dts/{fsl => }/mvme2500.dts (98%)

diff --git a/arch/powerpc/boot/dts/fsl/mvme2500.dts b/arch/powerpc/boot/dts/mvme2500.dts
similarity index 98%
rename from arch/powerpc/boot/dts/fsl/mvme2500.dts
rename to arch/powerpc/boot/dts/mvme2500.dts
index c7bc1a0..67714cf 100644
--- a/arch/powerpc/boot/dts/fsl/mvme2500.dts
+++ b/arch/powerpc/boot/dts/mvme2500.dts
@@ -12,7 +12,7 @@
  * Copyright 2009 Freescale Semiconductor Inc.
  */
 
-/include/ "p2020si-pre.dtsi"
+/include/ "fsl/p2020si-pre.dtsi"
 
 / {
 	model = "MVME2500";
@@ -258,7 +258,7 @@
 	};
 };
 
-/include/ "p2020si-post.dtsi"
+/include/ "fsl/p2020si-post.dtsi"
 
 / {
 	soc@ffe00000 {
-- 
2.7.0

Re: powerpc/dts: Move mvme2500.dts back in the right place

[Scott Wood]

On Tue, 2016-01-26 at 13:25 +0100, Alessio Igor Bogani wrote:
> Commit dc37374b9c83 ("powerpc/fsl: Move Freescale device tree files into
> fsl folder") move also mvme2500.dts which isn't a device tree for a
> Freescale board but for an Artesyn one. So move mvme2500.dts back in the
> right place.

It's not about who makes the board.  In theory it's for all boards with a
Freescale SoC.  The initial set that was moved was those which use dtsi files
from the fsl directory.  The motivation was that some of the dtsi files are
now requiring the preprocessor, and preprocessor includes don't mix well with
dts includes that change the current directory.

-Scott

Re: powerpc/dts: Move mvme2500.dts back in the right place

[Alessio Igor Bogani]

Scott,

On 26 January 2016 at 15:48, Scott Wood <oss@buserror.net> wrote:
> On Tue, 2016-01-26 at 13:25 +0100, Alessio Igor Bogani wrote:
>> Commit dc37374b9c83 ("powerpc/fsl: Move Freescale device tree files into
>> fsl folder") move also mvme2500.dts which isn't a device tree for a
>> Freescale board but for an Artesyn one. So move mvme2500.dts back in the
>> right place.
>
> It's not about who makes the board.  In theory it's for all boards with a
> Freescale SoC.  The initial set that was moved was those which use dtsi files
> from the fsl directory.  The motivation was that some of the dtsi files are
> now requiring the preprocessor, and preprocessor includes don't mix well with
> dts includes that change the current directory.

Thank you for your detailed explanation and I'm sorry to have bothered you.

Ciao,
Alessio