arm64: dts: renesas: white-hawk: Drop SoC parts from sub boards

The White Hawk CSI/DSI and RAVB/Ethernet(1000Base-T1) sub boards are not
specific to R-Car V4H.

Hence rename their DTS file names to drop the "r8a779g0-" prefix, and
remove any references to R-Car V4H.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Link: https://lore.kernel.org/r/f89613d0df04cfa6196f8797fe655cf7cec812de.1706192990.git.geert+renesas@glider.be

diff --git a/arch/arm64/boot/dts/renesas/r8a779g0-white-hawk-csi-dsi.dtsi b/arch/arm64/boot/dts/renesas/r8a779g0-white-hawk-csi-dsi.dtsi
deleted file mode 100644 (file)
index f8537f7..0000000
--- a/arch/arm64/boot/dts/renesas/r8a779g0-white-hawk-csi-dsi.dtsi
+++ /dev/null
@@ -1,187 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
-/*
- * Device Tree Source for the R-Car V4H White Hawk CSI/DSI sub-board
- *
- * Copyright (C) 2022 Glider bv
- */
-
-#include <dt-bindings/media/video-interfaces.h>
-
-&csi40 {
-       status = "okay";
-
-       ports {
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               port@0 {
-                       reg = <0>;
-
-                       csi40_in: endpoint {
-                               bus-type = <MEDIA_BUS_TYPE_CSI2_CPHY>;
-                               clock-lanes = <0>;
-                               data-lanes = <1 2 3>;
-                               remote-endpoint = <&max96712_out0>;
-                       };
-               };
-       };
-};
-
-&csi41 {
-       status = "okay";
-
-       ports {
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               port@0 {
-                       reg = <0>;
-
-                       csi41_in: endpoint {
-                               bus-type = <MEDIA_BUS_TYPE_CSI2_CPHY>;
-                               clock-lanes = <0>;
-                               data-lanes = <1 2 3>;
-                               remote-endpoint = <&max96712_out1>;
-                       };
-               };
-       };
-};
-
-&i2c0 {
-       pca9654_a: gpio@21 {
-               compatible = "onnn,pca9654";
-               reg = <0x21>;
-               gpio-controller;
-               #gpio-cells = <2>;
-       };
-
-       pca9654_b: gpio@22 {
-               compatible = "onnn,pca9654";
-               reg = <0x22>;
-               gpio-controller;
-               #gpio-cells = <2>;
-       };
-
-       eeprom@52 {
-               compatible = "rohm,br24g01", "atmel,24c01";
-               label = "csi-dsi-sub-board-id";
-               reg = <0x52>;
-               pagesize = <8>;
-       };
-};
-
-&i2c1 {
-       gmsl0: gmsl-deserializer@49 {
-               compatible = "maxim,max96712";
-               reg = <0x49>;
-               enable-gpios = <&pca9654_a 0 GPIO_ACTIVE_HIGH>;
-
-               ports {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-
-                       port@4 {
-                               reg = <4>;
-                               max96712_out0: endpoint {
-                                       bus-type = <MEDIA_BUS_TYPE_CSI2_CPHY>;
-                                       clock-lanes = <0>;
-                                       data-lanes = <1 2 3>;
-                                       remote-endpoint = <&csi40_in>;
-                               };
-                       };
-               };
-       };
-
-       gmsl1: gmsl-deserializer@4b {
-               compatible = "maxim,max96712";
-               reg = <0x4b>;
-               enable-gpios = <&pca9654_b 0 GPIO_ACTIVE_HIGH>;
-
-               ports {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-
-                       port@4 {
-                               reg = <4>;
-                               max96712_out1: endpoint {
-                                       bus-type = <MEDIA_BUS_TYPE_CSI2_CPHY>;
-                                       clock-lanes = <0>;
-                                       data-lanes = <1 2 3>;
-                                       remote-endpoint = <&csi41_in>;
-                               };
-                       };
-               };
-       };
-};
-
-&isp0 {
-       status = "okay";
-};
-
-&isp1 {
-       status = "okay";
-};
-
-&vin00 {
-       status = "okay";
-};
-
-&vin01 {
-       status = "okay";
-};
-
-&vin02 {
-       status = "okay";
-};
-
-&vin03 {
-       status = "okay";
-};
-
-&vin04 {
-       status = "okay";
-};
-
-&vin05 {
-       status = "okay";
-};
-
-&vin06 {
-       status = "okay";
-};
-
-&vin07 {
-       status = "okay";
-};
-
-&vin08 {
-       status = "okay";
-};
-
-&vin09 {
-       status = "okay";
-};
-
-&vin10 {
-       status = "okay";
-};
-
-&vin11 {
-       status = "okay";
-};
-
-&vin12 {
-       status = "okay";
-};
-
-&vin13 {
-       status = "okay";
-};
-
-&vin14 {
-       status = "okay";
-};
-
-&vin15 {
-       status = "okay";
-};

diff --git a/arch/arm64/boot/dts/renesas/r8a779g0-white-hawk-ethernet.dtsi b/arch/arm64/boot/dts/renesas/r8a779g0-white-hawk-ethernet.dtsi
deleted file mode 100644 (file)
index 4f411f9..0000000
--- a/arch/arm64/boot/dts/renesas/r8a779g0-white-hawk-ethernet.dtsi
+++ /dev/null
@@ -1,16 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
-/*
- * Device Tree Source for the R-Car V4H White Hawk RAVB/Ethernet(1000Base-T1)
- * sub-board
- *
- * Copyright (C) 2022 Glider bv
- */
-
-&i2c0 {
-       eeprom@53 {
-               compatible = "rohm,br24g01", "atmel,24c01";
-               label = "ethernet-sub-board-id";
-               reg = <0x53>;
-               pagesize = <8>;
-       };
-};

diff --git a/arch/arm64/boot/dts/renesas/r8a779g0-white-hawk.dts b/arch/arm64/boot/dts/renesas/r8a779g0-white-hawk.dts
index eff1ef6e2cc83aba94d041996682b3616002c1be..8d82294a1a56444c0c9513e5c4e52a5c5d358c42 100644 (file)
--- a/arch/arm64/boot/dts/renesas/r8a779g0-white-hawk.dts
+++ b/arch/arm64/boot/dts/renesas/r8a779g0-white-hawk.dts
@@ -7,8 +7,8 @@
 
 /dts-v1/;
 #include "r8a779g0-white-hawk-cpu.dtsi"
-#include "r8a779g0-white-hawk-csi-dsi.dtsi"
-#include "r8a779g0-white-hawk-ethernet.dtsi"
+#include "white-hawk-csi-dsi.dtsi"
+#include "white-hawk-ethernet.dtsi"
 
 / {
        model = "Renesas White Hawk CPU and Breakout boards based on r8a779g0";

diff --git a/arch/arm64/boot/dts/renesas/white-hawk-csi-dsi.dtsi b/arch/arm64/boot/dts/renesas/white-hawk-csi-dsi.dtsi
new file mode 100644 (file)
index 0000000..3006b0a
--- /dev/null
+++ b/arch/arm64/boot/dts/renesas/white-hawk-csi-dsi.dtsi
@@ -0,0 +1,187 @@
+// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+/*
+ * Device Tree Source for the White Hawk CSI/DSI sub-board
+ *
+ * Copyright (C) 2022 Glider bv
+ */
+
+#include <dt-bindings/media/video-interfaces.h>
+
+&csi40 {
+       status = "okay";
+
+       ports {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               port@0 {
+                       reg = <0>;
+
+                       csi40_in: endpoint {
+                               bus-type = <MEDIA_BUS_TYPE_CSI2_CPHY>;
+                               clock-lanes = <0>;
+                               data-lanes = <1 2 3>;
+                               remote-endpoint = <&max96712_out0>;
+                       };
+               };
+       };
+};
+
+&csi41 {
+       status = "okay";
+
+       ports {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               port@0 {
+                       reg = <0>;
+
+                       csi41_in: endpoint {
+                               bus-type = <MEDIA_BUS_TYPE_CSI2_CPHY>;
+                               clock-lanes = <0>;
+                               data-lanes = <1 2 3>;
+                               remote-endpoint = <&max96712_out1>;
+                       };
+               };
+       };
+};
+
+&i2c0 {
+       pca9654_a: gpio@21 {
+               compatible = "onnn,pca9654";
+               reg = <0x21>;
+               gpio-controller;
+               #gpio-cells = <2>;
+       };
+
+       pca9654_b: gpio@22 {
+               compatible = "onnn,pca9654";
+               reg = <0x22>;
+               gpio-controller;
+               #gpio-cells = <2>;
+       };
+
+       eeprom@52 {
+               compatible = "rohm,br24g01", "atmel,24c01";
+               label = "csi-dsi-sub-board-id";
+               reg = <0x52>;
+               pagesize = <8>;
+       };
+};
+
+&i2c1 {
+       gmsl0: gmsl-deserializer@49 {
+               compatible = "maxim,max96712";
+               reg = <0x49>;
+               enable-gpios = <&pca9654_a 0 GPIO_ACTIVE_HIGH>;
+
+               ports {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+
+                       port@4 {
+                               reg = <4>;
+                               max96712_out0: endpoint {
+                                       bus-type = <MEDIA_BUS_TYPE_CSI2_CPHY>;
+                                       clock-lanes = <0>;
+                                       data-lanes = <1 2 3>;
+                                       remote-endpoint = <&csi40_in>;
+                               };
+                       };
+               };
+       };
+
+       gmsl1: gmsl-deserializer@4b {
+               compatible = "maxim,max96712";
+               reg = <0x4b>;
+               enable-gpios = <&pca9654_b 0 GPIO_ACTIVE_HIGH>;
+
+               ports {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+
+                       port@4 {
+                               reg = <4>;
+                               max96712_out1: endpoint {
+                                       bus-type = <MEDIA_BUS_TYPE_CSI2_CPHY>;
+                                       clock-lanes = <0>;
+                                       data-lanes = <1 2 3>;
+                                       remote-endpoint = <&csi41_in>;
+                               };
+                       };
+               };
+       };
+};
+
+&isp0 {
+       status = "okay";
+};
+
+&isp1 {
+       status = "okay";
+};
+
+&vin00 {
+       status = "okay";
+};
+
+&vin01 {
+       status = "okay";
+};
+
+&vin02 {
+       status = "okay";
+};
+
+&vin03 {
+       status = "okay";
+};
+
+&vin04 {
+       status = "okay";
+};
+
+&vin05 {
+       status = "okay";
+};
+
+&vin06 {
+       status = "okay";
+};
+
+&vin07 {
+       status = "okay";
+};
+
+&vin08 {
+       status = "okay";
+};
+
+&vin09 {
+       status = "okay";
+};
+
+&vin10 {
+       status = "okay";
+};
+
+&vin11 {
+       status = "okay";
+};
+
+&vin12 {
+       status = "okay";
+};
+
+&vin13 {
+       status = "okay";
+};
+
+&vin14 {
+       status = "okay";
+};
+
+&vin15 {
+       status = "okay";
+};

diff --git a/arch/arm64/boot/dts/renesas/white-hawk-ethernet.dtsi b/arch/arm64/boot/dts/renesas/white-hawk-ethernet.dtsi
new file mode 100644 (file)
index 0000000..a218fda
--- /dev/null
+++ b/arch/arm64/boot/dts/renesas/white-hawk-ethernet.dtsi
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+/*
+ * Device Tree Source for the White Hawk RAVB/Ethernet(1000Base-T1)
+ * sub-board
+ *
+ * Copyright (C) 2022 Glider bv
+ */
+
+&i2c0 {
+       eeprom@53 {
+               compatible = "rohm,br24g01", "atmel,24c01";
+               label = "ethernet-sub-board-id";
+               reg = <0x53>;
+               pagesize = <8>;
+       };
+};