ARM: dts: meson-sm1: add U-Boot specific DT for graphics

Rename meson-g12a-u-boot.dtsi into meson-g12-common-u-boot.dtsi to
match the new DT architecture and add meson-sm1-sei610-u-boot.dtsi
to handle the U-Boot specific DT for graphics.

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>

diff --git a/arch/arm/dts/meson-g12-common-u-boot.dtsi b/arch/arm/dts/meson-g12-common-u-boot.dtsi
new file mode 100644 (file)
index 0000000..38fd3d3
--- /dev/null
+++ b/arch/arm/dts/meson-g12-common-u-boot.dtsi
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2019 BayLibre, SAS.
+ * Author: Maxime Jourdan <mjourdan@baylibre.com>
+ */
+
+/ {
+       soc {
+               u-boot,dm-pre-reloc;
+       };
+};
+
+&canvas {
+       status = "disabled";
+};
+
+&vpu {
+       reg = <0x0 0xff900000 0x0 0x100000>,
+             <0x0 0xff63c000 0x0 0x1000>,
+             <0x0 0xff638000 0x0 0x400>;
+       reg-names = "vpu", "hhi", "dmc";
+       u-boot,dm-pre-reloc;
+};
+
+&hdmi_tx {
+       reg = <0x0 0x0 0x0 0x10000>,
+             <0x0 0x3c000 0x0 0x1000>;
+       reg-names = "hdmitx", "hhi";
+};

diff --git a/arch/arm/dts/meson-g12a-sei510-u-boot.dtsi b/arch/arm/dts/meson-g12a-sei510-u-boot.dtsi
index fddffd628c68a257dfc12464fce33b1986670079..236f2468dc20ce547eccce753dbcfbe1261d2742 100644 (file)
--- a/arch/arm/dts/meson-g12a-sei510-u-boot.dtsi
+++ b/arch/arm/dts/meson-g12a-sei510-u-boot.dtsi
@@ -4,4 +4,4 @@
  * Author: Neil Armstrong <narmstrong@baylibre.com>
  */
 
-#include "meson-g12a-u-boot.dtsi"
+#include "meson-g12-common-u-boot.dtsi"

diff --git a/arch/arm/dts/meson-g12a-u-boot.dtsi b/arch/arm/dts/meson-g12a-u-boot.dtsi
deleted file mode 100644 (file)
index 38fd3d3..0000000
--- a/arch/arm/dts/meson-g12a-u-boot.dtsi
+++ /dev/null
@@ -1,29 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Copyright (c) 2019 BayLibre, SAS.
- * Author: Maxime Jourdan <mjourdan@baylibre.com>
- */
-
-/ {
-       soc {
-               u-boot,dm-pre-reloc;
-       };
-};
-
-&canvas {
-       status = "disabled";
-};
-
-&vpu {
-       reg = <0x0 0xff900000 0x0 0x100000>,
-             <0x0 0xff63c000 0x0 0x1000>,
-             <0x0 0xff638000 0x0 0x400>;
-       reg-names = "vpu", "hhi", "dmc";
-       u-boot,dm-pre-reloc;
-};
-
-&hdmi_tx {
-       reg = <0x0 0x0 0x0 0x10000>,
-             <0x0 0x3c000 0x0 0x1000>;
-       reg-names = "hdmitx", "hhi";
-};

diff --git a/arch/arm/dts/meson-g12a-u200-u-boot.dtsi b/arch/arm/dts/meson-g12a-u200-u-boot.dtsi
index fddffd628c68a257dfc12464fce33b1986670079..236f2468dc20ce547eccce753dbcfbe1261d2742 100644 (file)
--- a/arch/arm/dts/meson-g12a-u200-u-boot.dtsi
+++ b/arch/arm/dts/meson-g12a-u200-u-boot.dtsi
@@ -4,4 +4,4 @@
  * Author: Neil Armstrong <narmstrong@baylibre.com>
  */
 
-#include "meson-g12a-u-boot.dtsi"
+#include "meson-g12-common-u-boot.dtsi"

diff --git a/arch/arm/dts/meson-g12b-odroid-n2-u-boot.dtsi b/arch/arm/dts/meson-g12b-odroid-n2-u-boot.dtsi
index fddffd628c68a257dfc12464fce33b1986670079..236f2468dc20ce547eccce753dbcfbe1261d2742 100644 (file)
--- a/arch/arm/dts/meson-g12b-odroid-n2-u-boot.dtsi
+++ b/arch/arm/dts/meson-g12b-odroid-n2-u-boot.dtsi
@@ -4,4 +4,4 @@
  * Author: Neil Armstrong <narmstrong@baylibre.com>
  */
 
-#include "meson-g12a-u-boot.dtsi"
+#include "meson-g12-common-u-boot.dtsi"

diff --git a/arch/arm/dts/meson-sm1-sei610-u-boot.dtsi b/arch/arm/dts/meson-sm1-sei610-u-boot.dtsi
new file mode 100644 (file)
index 0000000..236f246
--- /dev/null
+++ b/arch/arm/dts/meson-sm1-sei610-u-boot.dtsi
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2019 BayLibre, SAS.
+ * Author: Neil Armstrong <narmstrong@baylibre.com>
+ */
+
+#include "meson-g12-common-u-boot.dtsi"