From 41cc7edc15010b41a9347988d42898b9001d7402 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Fri, 25 Sep 2020 21:52:57 +0200 Subject: ath79: move dts-v1 statement to ath79.dtsi The "/dts-v1/;" identifier is supposed to be present once at the top of a device tree file after the includes have been processed. In ath79, we therefore requested to have in the DTS files so far, and omit it in the DTSI files. However, essentially the syntax of the parent ath79.dtsi file already determines the DTS version, so putting it into the DTS files is just a useless repetition. Consequently, this patch puts the dts-v1 statement into the parent ath79.dtsi, which is (indirectly) included by all DTS files. All other occurences are removed. Since the dts-v1 statement needs to be before any other definitions, this also moves the includes to make sure the ath79.dtsi or its descendants are always included first. Signed-off-by: Adrian Schmutzler --- target/linux/ath79/dts/qca9561_xiaomi_mi-router-4q.dts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'target/linux/ath79/dts/qca9561_xiaomi_mi-router-4q.dts') diff --git a/target/linux/ath79/dts/qca9561_xiaomi_mi-router-4q.dts b/target/linux/ath79/dts/qca9561_xiaomi_mi-router-4q.dts index 736ad3f27f..077724d4b9 100644 --- a/target/linux/ath79/dts/qca9561_xiaomi_mi-router-4q.dts +++ b/target/linux/ath79/dts/qca9561_xiaomi_mi-router-4q.dts @@ -1,11 +1,10 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT -/dts-v1/; + +#include "qca956x.dtsi" #include #include -#include "qca956x.dtsi" - / { compatible = "xiaomi,mi-router-4q", "qca,qca9560"; model = "Xiaomi Mi Router 4Q"; -- cgit v1.2.3