lantiq: move dts-v1 statement to top-level DTSI files

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 lantiq, 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 SoC-based DTSI files 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 top-level
SoC-based DTSI files, and removes all other occurences.
Since the dts-v1 statement needs to be before any other definitions,
this also moves the includes accordingly where necessary.

Changes are applied to files-5.4 only, files-4.19 remains untouched.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
This commit is contained in:
Adrian Schmutzler 2020-10-01 18:08:17 +02:00
parent 624298dc27
commit 7f8a1fc55e
71 changed files with 24 additions and 139 deletions

View File

@ -1,3 +1,5 @@
/dts-v1/;
#include <dt-bindings/gpio/gpio.h>
/ {

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "amazonse.dtsi"
/ {

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "amazonse.dtsi"
#include <dt-bindings/input/input.h>

View File

@ -1,3 +1,5 @@
/dts-v1/;
#include <dt-bindings/gpio/gpio.h>
/ {

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "ar9.dtsi"
#include <dt-bindings/input/input.h>

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "ar9.dtsi"
#include <dt-bindings/input/input.h>

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "ar9.dtsi"
#include <dt-bindings/input/input.h>

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "ar9.dtsi"
#include <dt-bindings/input/input.h>

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "ar9_netgear_dgn3500.dtsi"
/ {

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "ar9_netgear_dgn3500.dtsi"
/ {

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "ar9.dtsi"
#include <dt-bindings/input/input.h>

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "ar9.dtsi"
#include <dt-bindings/input/input.h>

View File

@ -1,3 +1,5 @@
/dts-v1/;
#include <dt-bindings/gpio/gpio.h>
/ {

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "danube.dtsi"
#include <dt-bindings/input/input.h>

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "danube_arcadyan_arv4518pwr01.dtsi"
/ {

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "danube_arcadyan_arv4518pwr01.dtsi"
/ {

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "danube.dtsi"
#include <dt-bindings/input/input.h>

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "danube.dtsi"
#include <dt-bindings/input/input.h>

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "danube.dtsi"
#include <dt-bindings/input/input.h>

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "danube.dtsi"
#include <dt-bindings/input/input.h>

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "danube.dtsi"
#include <dt-bindings/input/input.h>

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "danube.dtsi"
#include <dt-bindings/input/input.h>

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "danube.dtsi"
#include <dt-bindings/input/input.h>

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "danube.dtsi"
#include <dt-bindings/input/input.h>

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "danube.dtsi"
#include <dt-bindings/input/input.h>

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "danube.dtsi"
#include <dt-bindings/input/input.h>

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "danube.dtsi"
#include <dt-bindings/input/input.h>

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "danube.dtsi"
#include <dt-bindings/input/input.h>

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "danube.dtsi"
/ {

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "danube.dtsi"
#include <dt-bindings/input/input.h>

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "danube.dtsi"
/ {

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "danube.dtsi"
#include <dt-bindings/input/input.h>

View File

@ -1,3 +1,5 @@
/dts-v1/;
/ {
#address-cells = <1>;
#size-cells = <1>;

View File

@ -1,9 +1,8 @@
/dts-v1/;
#include <dt-bindings/gpio/gpio.h>
#include "falcon.dtsi"
#include "falcon_sflash-16m.dtsi"
#include <dt-bindings/gpio/gpio.h>
/ {
model = "Lantiq Falcon FTTDP8 Reference Board";
compatible = "lantiq,easy88388", "lantiq,falcon";

View File

@ -1,9 +1,8 @@
/dts-v1/;
#include <dt-bindings/gpio/gpio.h>
#include "falcon.dtsi"
#include "falcon_sflash-16m.dtsi"
#include <dt-bindings/gpio/gpio.h>
/ {
model = "Lantiq Falcon FTTdp G.FAST Reference Board";
compatible = "lantiq,easy88444", "lantiq,falcon";

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "falcon_lantiq_easy98000.dtsi"
/ {

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "falcon_lantiq_easy98000.dtsi"
/ {

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "falcon_lantiq_easy98000.dtsi"
#include "falcon_sflash-16m.dtsi"

View File

@ -1,8 +1,8 @@
#include "falcon.dtsi"
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/gpio/gpio.h>
#include "falcon.dtsi"
/ {
compatible = "lantiq,easy98000", "lantiq,falcon";

View File

@ -1,10 +1,8 @@
/dts-v1/;
#include <dt-bindings/gpio/gpio.h>
#include "falcon.dtsi"
#include "falcon_sflash-16m.dtsi"
#include <dt-bindings/gpio/gpio.h>
/ {
model = "Lantiq Falcon Reference Board V1.8";
compatible = "lantiq,easy98020-v18", "lantiq,easy98020", "lantiq,falcon";

View File

@ -1,10 +1,8 @@
/dts-v1/;
#include <dt-bindings/gpio/gpio.h>
#include "falcon.dtsi"
#include "falcon_sflash-16m.dtsi"
#include <dt-bindings/gpio/gpio.h>
/ {
model = "Lantiq Falcon Reference Board";
compatible = "lantiq,easy98020", "lantiq,falcon";

View File

@ -1,10 +1,8 @@
/dts-v1/;
#include <dt-bindings/gpio/gpio.h>
#include "falcon.dtsi"
#include "falcon_sflash-16m.dtsi"
#include <dt-bindings/gpio/gpio.h>
/ {
model = "Lantiq Falcon HGU Reference Board";
compatible = "lantiq,easy98021", "lantiq,easy98020", "lantiq,falcon";

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "falcon.dtsi"
#include "falcon_sflash-16m.dtsi"

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "falcon.dtsi"
#include "falcon_sflash-16m.dtsi"

View File

@ -1,10 +1,8 @@
/dts-v1/;
#include <dt-bindings/gpio/gpio.h>
#include "falcon.dtsi"
#include "falcon_sflash-16m.dtsi"
#include <dt-bindings/gpio/gpio.h>
/ {
model = "Lantiq Falcon / Vinax MDU Board";
compatible = "lantiq,falcon-mdu", "lantiq,falcon";

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "falcon.dtsi"
#include "falcon_sflash-16m.dtsi"

View File

@ -1,3 +1,5 @@
/dts-v1/;
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/phy/phy-lantiq-vrx200-pcie.h>

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "vr9.dtsi"
#include <dt-bindings/input/input.h>

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "vr9.dtsi"
#include <dt-bindings/input/input.h>

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "vr9.dtsi"
#include <dt-bindings/input/input.h>

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "vr9_arcadyan_vgv7510kw22.dtsi"
/ {

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "vr9_arcadyan_vgv7510kw22.dtsi"
/ {

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "vr9_arcadyan_vgv7519.dtsi"
/ {

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "vr9_arcadyan_vgv7519.dtsi"
/ {

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "vr9_avm_fritz3370-rev2.dtsi"
/ {

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "vr9_avm_fritz3370-rev2.dtsi"
/ {

View File

@ -1,5 +1,4 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/dts-v1/;
#include "vr9_avm_fritz736x.dtsi"

View File

@ -1,5 +1,4 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/dts-v1/;
#include "vr9_avm_fritz736x.dtsi"

View File

@ -1,5 +1,4 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/dts-v1/;
#include "vr9_avm_fritz736x.dtsi"

View File

@ -1,5 +1,4 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/dts-v1/;
#include "vr9.dtsi"

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "vr9.dtsi"
#include <dt-bindings/input/input.h>

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "vr9.dtsi"
#include <dt-bindings/input/input.h>

View File

@ -1,6 +1,3 @@
/dts-v1/;
#include "vr9_lantiq_easy80920.dtsi"
/ {

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "vr9_lantiq_easy80920.dtsi"
/ {

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "vr9.dtsi"
#include <dt-bindings/input/input.h>

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "vr9_tplink_tdw89x0.dtsi"
/ {

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "vr9_tplink_tdw89x0.dtsi"
/ {

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "vr9_tplink_vr200.dtsi"
/ {

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "vr9_tplink_vr200.dtsi"
/ {

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "vr9_zyxel_p-2812hnu-fx.dtsi"
/ {

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "vr9_zyxel_p-2812hnu-fx.dtsi"
/ {