From e2eb6d5829c71ded0238059a7f2c6ade19c8b171 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Fri, 20 Dec 2019 14:08:55 +0100 Subject: [PATCH] lantiq: move include to parent falcon_lantiq_easy98000.dtsi This moves the include of lantiq.dtsi from the DTS files to the parent falcon_lantiq_easy98000.dtsi. Signed-off-by: Adrian Schmutzler --- .../mips/boot/dts/lantiq/falcon_lantiq_easy98000-nand.dts | 1 - .../arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nor.dts | 1 - .../mips/boot/dts/lantiq/falcon_lantiq_easy98000-sflash.dts | 2 -- .../arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000.dtsi | 4 ++-- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nand.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nand.dts index e4719d59e0..2107da5435 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nand.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nand.dts @@ -1,6 +1,5 @@ /dts-v1/; -#include "falcon.dtsi" #include "falcon_lantiq_easy98000.dtsi" / { diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nor.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nor.dts index cba277e6d1..56d0fe0bc3 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nor.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-nor.dts @@ -1,6 +1,5 @@ /dts-v1/; -#include "falcon.dtsi" #include "falcon_lantiq_easy98000.dtsi" / { diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-sflash.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-sflash.dts index e8d8b42470..8c931746ed 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-sflash.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000-sflash.dts @@ -1,6 +1,5 @@ /dts-v1/; -#include "falcon.dtsi" #include "falcon_lantiq_easy98000.dtsi" #include "falcon_sflash-16m.dtsi" @@ -13,4 +12,3 @@ spi1 = &spi; }; }; - diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000.dtsi index fa8c0b4b06..5821c51def 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000.dtsi @@ -1,7 +1,8 @@ - #include #include +#include "falcon.dtsi" + / { compatible = "lantiq,easy98000", "lantiq,falcon"; @@ -107,4 +108,3 @@ reg = <0x51>; }; }; - -- 2.30.2