projects: linux: core: Merge r8a77990 and ebisu DT files

There were two versions of each: with/without "renesas".

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

4 files changed, 27 insertions, 53 deletions

diff --git a/projects/linux/core/bsp392_arm64_dts_r8a77990-ebisu.yaml b/projects/linux/core/bsp392_arm64_dts_r8a77990-ebisu.yaml
deleted file mode 100644
index f2bfecd..0000000
--- a/projects/linux/core/bsp392_arm64_dts_r8a77990-ebisu.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-title: "From bsp392, upport arm64: dts: r8a77990-ebisu:"
-team: Core
-key: 92f34e4f-8464-427b-86f7-03160331001e
-status: New
-
-relationships:
-
-bsp-commits:
-  - 04e3aed055da7ace1ee65069a6bf762bd9d13b66 # arm64: dts: r8a77990-ebisu: Enable sound support
-  - 112e3a322ac0d651ca2bde8f70282f0e349ad245 # arm64: dts: r8a77990-ebisu: Fix reg of adv7482 port node to decimal
-  - 1133675e0d0a18c2211a08eddf75dae93c3d9533 # arm64: dts: r8a77990-ebisu: Add BD9571 PMIC
-  - 27aafebfab0452e2025ad480e6cbc206473c1c78 # arm64: dts: r8a77990-ebisu: Set max dot clock for vga
-  - 27c04d35a98453929ff413c50295d68042aaa1b8 # arm64: dts: r8a77990-ebisu: Enable other VIN
-  - 544b1bf429845ef319b9f92bac879b29e1c42440 # arm64: dts: r8a77990-ebisu: Add no use ddc option for VGA connector
-  - 69360bc0b67fda689885bff813c9fb94d4f9e2df # arm64: dts: r8a77990-ebisu: Remove renesas, no-ether-link property
-  - b6ed5b1bc7e86e07131bab0931345ab3c3d22615 # arm64: dts: r8a77990-ebisu: Change to use "audio-graph-card"
-  - c39267cdbb3e91e25da76123d9b1651ffdeb7f53 # arm64: dts: r8a77990-ebisu: Set preferred resolution
-  - d3394635755093f8539acfdbaf932a164ec59533 # arm64: dts: r8a77990-ebisu: Enable simultaneous output of VGA and HDMI
-  - decd769383a82104c76ffc9c8dd6674d46f90e19 # arm64: dts: r8a77990-ebisu: Add LVDS panel nodes
-
-upstream:
-
-comments:
-  - "112e3a322ac0d651ca2bde8f70282f0e349ad245: linux-next:9130c15829846fae56ea729f42d1894b8413f89b"
-  - "1133675e0d0a18c2211a08eddf75dae93c3d9533: linux-next:1f4c123a98098cce0c172264de7da4fab1ff71b9"
-  - "27c04d35a98453929ff413c50295d68042aaa1b8: linux-next:a8f6110e64422d5c28046e6be7e8adcee929a418"
-  - "69360bc0b67fda689885bff813c9fb94d4f9e2df: https://patchwork.kernel.org/patch/10692753/"
diff --git a/projects/linux/core/bsp392_arm64_dts_r8a77990.yaml b/projects/linux/core/bsp392_arm64_dts_r8a77990.yaml
deleted file mode 100644
index 5f06c1f..0000000
--- a/projects/linux/core/bsp392_arm64_dts_r8a77990.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-title: "From bsp392, upport arm64: dts: r8a77990:"
-team: Core
-key: 803d8246-58ef-44ef-88db-f877527a626f
-status: New
-
-relationships:
-
-bsp-commits:
-  - 2ce15ed2e90209ed8d67827e7e517e1442ee94de # arm64: dts: r8a77990: Add Sound CTU subnodes in rcar_sound node
-  - 39d216958e035ad2b8d5f08ac22025179e1c29fc # arm64: dts: r8a77990: Fix register range of display node
-  - 58aa768edba14c1ca8ed6a457a04ae2ac7d7a529 # arm64: dts: r8a77990: Add Sound SRC support
-  - 64dbde6ddc30e5e9cb767208a3f21670c3fd0351 # arm64: dts: r8a77990: Add Sound MIX subnodes in rcar_sound node
-  - 7a8f63359fa12a7186964ab1c3f719a0162f3e04 # arm64: dts: r8a77990: Add Sound device node and SSI support
-  - 8c35f8420724368b334d40001e3a57e34857e886 # arm64: dts: r8a77990: Add Sound DVC support
-  - d15a0a57db3605b5ed0927dc074420f02b29b431 # arm64: dts: r8a77990: Add csi2 endpoint number in vin node
-  - dd07fe6c2fc2073ad6d7dc5c6cade3611d590ae0 # arm64: dts: r8a77990: Add Audio-DMAC device nodes
-  - e332a58ed6d7bb188a0aa6cb22a15e0add24ae16 # arm64: dts: r8a77990: Add cpg reset for LVDS Interface
-  - e9d506632abc893f3370a6004743b20be501650f # arm64: dts: r8a77990: Add renesas id for lvds distinction
-
-upstream:
-  - torvalds: 3b46fa57e350dc4fb72b8e02feb7fb218a3640d1 # arm64: dts: renesas: r8a77990: Add Audio-DMAC and Sound device nodes
-  - torvalds: 3b46fa57e350dc4fb72b8e02feb7fb218a3640d1 # arm64: dts: renesas: r8a77990: Add Audio-DMAC and Sound device nodes
-  - torvalds: 5e53dbf4edb4d0d1cc97318139f2c20338f207c8 # arm64: dts: renesas: r8a77990: Fix VIN endpoint numbering
-  - torvalds: 3b46fa57e350dc4fb72b8e02feb7fb218a3640d1 # arm64: dts: renesas: r8a77990: Add Audio-DMAC and Sound device nodes
-
-comments:
diff --git a/projects/linux/core/bsp392_arm64_dts_renesas_r8a77990-ebisu.yaml b/projects/linux/core/bsp392_arm64_dts_renesas_r8a77990-ebisu.yaml
index 938c841..7654b5c 100644
--- a/projects/linux/core/bsp392_arm64_dts_renesas_r8a77990-ebisu.yaml
+++ b/projects/linux/core/bsp392_arm64_dts_renesas_r8a77990-ebisu.yaml
@@ -6,8 +6,23 @@ status: New
 relationships:
 
 bsp-commits:
+  - 04e3aed055da7ace1ee65069a6bf762bd9d13b66 # arm64: dts: r8a77990-ebisu: Enable sound support
+  - 112e3a322ac0d651ca2bde8f70282f0e349ad245 # arm64: dts: r8a77990-ebisu: Fix reg of adv7482 port node to decimal
+  - 1133675e0d0a18c2211a08eddf75dae93c3d9533 # arm64: dts: r8a77990-ebisu: Add BD9571 PMIC
+  - 27aafebfab0452e2025ad480e6cbc206473c1c78 # arm64: dts: r8a77990-ebisu: Set max dot clock for vga
+  - 27c04d35a98453929ff413c50295d68042aaa1b8 # arm64: dts: r8a77990-ebisu: Enable other VIN
+  - 544b1bf429845ef319b9f92bac879b29e1c42440 # arm64: dts: r8a77990-ebisu: Add no use ddc option for VGA connector
+  - 69360bc0b67fda689885bff813c9fb94d4f9e2df # arm64: dts: r8a77990-ebisu: Remove renesas, no-ether-link property
+  - b6ed5b1bc7e86e07131bab0931345ab3c3d22615 # arm64: dts: r8a77990-ebisu: Change to use "audio-graph-card"
+  - c39267cdbb3e91e25da76123d9b1651ffdeb7f53 # arm64: dts: r8a77990-ebisu: Set preferred resolution
+  - d3394635755093f8539acfdbaf932a164ec59533 # arm64: dts: r8a77990-ebisu: Enable simultaneous output of VGA and HDMI
+  - decd769383a82104c76ffc9c8dd6674d46f90e19 # arm64: dts: r8a77990-ebisu: Add LVDS panel nodes
   - f0fc4fc5aa859da42f14e6b98cfa52e0e827ae4d # arm64: dts: renesas: r8a77990-ebisu: sort subnodes of root node
 
 upstream:
 
 comments:
+  - "112e3a322ac0d651ca2bde8f70282f0e349ad245: linux-next:9130c15829846fae56ea729f42d1894b8413f89b"
+  - "1133675e0d0a18c2211a08eddf75dae93c3d9533: linux-next:1f4c123a98098cce0c172264de7da4fab1ff71b9"
+  - "27c04d35a98453929ff413c50295d68042aaa1b8: linux-next:a8f6110e64422d5c28046e6be7e8adcee929a418"
+  - "69360bc0b67fda689885bff813c9fb94d4f9e2df: https://patchwork.kernel.org/patch/10692753/"
diff --git a/projects/linux/core/bsp392_arm64_dts_renesas_r8a77990.yaml b/projects/linux/core/bsp392_arm64_dts_renesas_r8a77990.yaml
index 7417acb..11f3b08 100644
--- a/projects/linux/core/bsp392_arm64_dts_renesas_r8a77990.yaml
+++ b/projects/linux/core/bsp392_arm64_dts_renesas_r8a77990.yaml
@@ -7,9 +7,21 @@ relationships:
 
 bsp-commits:
   - 03f9060719bd9d19974c0420aadcbd4b927c8f29 # arm64: dts: renesas: r8a77990: Add OPPs table for cpu devices
+  - 2ce15ed2e90209ed8d67827e7e517e1442ee94de # arm64: dts: r8a77990: Add Sound CTU subnodes in rcar_sound node
+  - 39d216958e035ad2b8d5f08ac22025179e1c29fc # arm64: dts: r8a77990: Fix register range of display node
+  - 58aa768edba14c1ca8ed6a457a04ae2ac7d7a529 # arm64: dts: r8a77990: Add Sound SRC support
+  - 64dbde6ddc30e5e9cb767208a3f21670c3fd0351 # arm64: dts: r8a77990: Add Sound MIX subnodes in rcar_sound node
+  - 7a8f63359fa12a7186964ab1c3f719a0162f3e04 # arm64: dts: r8a77990: Add Sound device node and SSI support
+  - 8c35f8420724368b334d40001e3a57e34857e886 # arm64: dts: r8a77990: Add Sound DVC support
   - a342b3bb8c309826182c28e445b61c349b7e8367 # arm64: dts: renesas: r8a77990: sort subnodes of the soc node
+  - d15a0a57db3605b5ed0927dc074420f02b29b431 # arm64: dts: r8a77990: Add csi2 endpoint number in vin node
+  - dd07fe6c2fc2073ad6d7dc5c6cade3611d590ae0 # arm64: dts: r8a77990: Add Audio-DMAC device nodes
+  - e332a58ed6d7bb188a0aa6cb22a15e0add24ae16 # arm64: dts: r8a77990: Add cpg reset for LVDS Interface
+  - e9d506632abc893f3370a6004743b20be501650f # arm64: dts: r8a77990: Add renesas id for lvds distinction
 
 upstream:
+  - torvalds: 3b46fa57e350dc4fb72b8e02feb7fb218a3640d1 # arm64: dts: renesas: r8a77990: Add Audio-DMAC and Sound device nodes
+  - torvalds: 5e53dbf4edb4d0d1cc97318139f2c20338f207c8 # arm64: dts: renesas: r8a77990: Fix VIN endpoint numbering
 
 comments:
   - "a342b3bb8c309826182c28e445b61c349b7e8367: linux-next:d5d7134fd49e6f5382432b9fcfbf68fa6556b04c"