projects: linux: core: Merge TEE

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

7 files changed, 14 insertions, 38 deletions

diff --git a/projects/linux/core/bsp392_arm64_dts_r8a7795.yaml b/projects/linux/core/bsp392_arm64_dts_r8a7795.yaml
index 16eabee..387e5d7 100644
--- a/projects/linux/core/bsp392_arm64_dts_r8a7795.yaml
+++ b/projects/linux/core/bsp392_arm64_dts_r8a7795.yaml
@@ -9,11 +9,9 @@ bsp-commits:
   - 1205d423bd423a57523aeefb4f737e6a777c37e6 # arm64: dts: r8a7795: Add spi aliases
   - 3c3b44c752c4eef9a29694f4262934445c5f5da9 # arm64: dts: r8a7795: Add CPUIdle support for all CPU core
   - 55f098971fd427d4cf36b9424b99d3f2235c1c49 # arm64: dts: r8a7795: Add OPPs table-{1-7} for cpu devices
-  - cff6dba41e969cf92421e189998d2aa3895d643b # arm64: dts: r8a7795: Add optee node
 
 upstream:
 
 comments:
   - "1205d423bd423a57523aeefb4f737e6a777c37e6: Proposing 'N': SPI aliases are deprecated, and there are no spidev nodes in upstream (and there shouldn't be)"
   - "55f098971fd427d4cf36b9424b99d3f2235c1c49: requested upport with 9c17869e23b54b41d75e09069efecb6c08464099 of BSPv3.6.0"
-  - "cff6dba41e969cf92421e189998d2aa3895d643b: Because the upstream policy of the driver is unknown"
diff --git a/projects/linux/core/bsp392_arm64_dts_r8a7796.yaml b/projects/linux/core/bsp392_arm64_dts_r8a7796.yaml
index 9e16bb5..983328b 100644
--- a/projects/linux/core/bsp392_arm64_dts_r8a7796.yaml
+++ b/projects/linux/core/bsp392_arm64_dts_r8a7796.yaml
@@ -9,7 +9,6 @@ bsp-commits:
   - 033aee12f32ea1f75c4553ca8685edeb6e82a00f # arm64: dts: r8a7796: Add OPPs table-{1-7} for cpu devices
   - 314084341d97c1b5276f971dd82330db2e1acab2 # arm64: dts: r8a7796: Add spi aliases
   - 902ff7caa32dc71cbd1f93be30c359cd9d38e098 # arm64: dts: r8a7796: Add CPUIdle support for all CPU core
-  - 966a851d8ac664afac9c93a6817cd95a2b719be2 # arm64: dts: r8a7796: Add optee node
   - e10cf1a2a261fb0eb604c94551913f02e6f670b8 # arm64: dts: r8a7796: Remove clocks properties in gic and irqc node
 
 upstream:
@@ -17,5 +16,4 @@ upstream:
 comments:
   - "033aee12f32ea1f75c4553ca8685edeb6e82a00f: requested upport with 1baee1bebe00e8741d57cf2e2c7fff6b04e41ae2 of BSPv3.6.0"
   - "314084341d97c1b5276f971dd82330db2e1acab2: Proposing 'N': SPI aliases are deprecated, and there are no spidev nodes in upstream (and there shouldn't be)"
-  - "966a851d8ac664afac9c93a6817cd95a2b719be2: Because the upstream policy of the driver is unknown"
   - "e10cf1a2a261fb0eb604c94551913f02e6f670b8: Proposing 'N': DT describes hardware, not documentation policy"
diff --git a/projects/linux/core/bsp392_arm64_dts_r8a77965.yaml b/projects/linux/core/bsp392_arm64_dts_r8a77965.yaml
index cb24354..955102c 100644
--- a/projects/linux/core/bsp392_arm64_dts_r8a77965.yaml
+++ b/projects/linux/core/bsp392_arm64_dts_r8a77965.yaml
@@ -6,7 +6,6 @@ status: New
 relationships:
 
 bsp-commits:
-  - 2d440ad0a3976578ae47316ed1eeec5488624086 # arm64: dts: r8a77965: Add optee node
   - 492eb8a80c3a38387e6bef24d9ec6bb3eb1b65f9 # arm64: dts: r8a77965: Remove reg-names of display node
   - a7d53ce95b71dd5a8ffcb1171e5c4cd62edcc993 # arm64: dts: r8a77965: Remove IPMMU-IR node
   - c635f6a8ad201445fb1125a4d8c045d4de704c35 # arm64: dts: r8a77965: Add CPUIdle support for CA57
@@ -16,6 +15,5 @@ upstream:
   - torvalds: d8c6557bc93be73ed1abe5b13fa1e46e59da028b # arm64: dts: renesas: r8a77965: Remove non-existent IPMMU-IR
 
 comments:
-  - "2d440ad0a3976578ae47316ed1eeec5488624086: Because the upstream policy of the driver is unknown"
   - "c635f6a8ad201445fb1125a4d8c045d4de704c35: requested upport with c4eaa8e627a321ff73bd9791f51020871e48d7ce of BSPv3.6.0"
   - "f80d440d2f564e3493c7c8c20822bfdf4d5e4ffa: Proposing 'N': SPI aliases are deprecated, and there are no spidev nodes in upstream (and there shouldn't be)"
diff --git a/projects/linux/core/bsp392_arm64_dts_r8a77990.yaml b/projects/linux/core/bsp392_arm64_dts_r8a77990.yaml
index 072aa0f..f5f78d8 100644
--- a/projects/linux/core/bsp392_arm64_dts_r8a77990.yaml
+++ b/projects/linux/core/bsp392_arm64_dts_r8a77990.yaml
@@ -7,7 +7,6 @@ relationships:
 
 bsp-commits:
   - 2ce15ed2e90209ed8d67827e7e517e1442ee94de # arm64: dts: r8a77990: Add Sound CTU subnodes in rcar_sound node
-  - 302879e890a65b4dc30c877e73b646de7aacf759 # arm64: dts: r8a77990: Add optee 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
@@ -27,5 +26,4 @@ upstream:
   - torvalds: 3b46fa57e350dc4fb72b8e02feb7fb218a3640d1 # arm64: dts: renesas: r8a77990: Add Audio-DMAC and Sound device nodes
 
 comments:
-  - "302879e890a65b4dc30c877e73b646de7aacf759: Because the upstream policy of the driver is unknown"
   - "8e88dcc472b4943bfd64d2a8e7d294d077ac362d: Proposing 'N': SPI aliases are deprecated, and there are no spidev nodes in upstream (and there shouldn't be)"
diff --git a/projects/linux/core/bsp392_tee.yaml b/projects/linux/core/bsp392_tee.yaml
index b24865b..6a2cacf 100644
--- a/projects/linux/core/bsp392_tee.yaml
+++ b/projects/linux/core/bsp392_tee.yaml
@@ -6,9 +6,23 @@ status: New
 relationships:
 
 bsp-commits:
+  - 2d440ad0a3976578ae47316ed1eeec5488624086 # arm64: dts: r8a77965: Add optee node
+  - 302879e890a65b4dc30c877e73b646de7aacf759 # arm64: dts: r8a77990: Add optee node
+  - 3c9cf833fef60330a60c48de6a25491cb1ad0946 # tee: optee: Change workqueue to kthread in debug log function
+  - 62f50d22df2e03990e380e582e718822934c96a5 # tee: optee: add r-car original function
+  - 966a851d8ac664afac9c93a6817cd95a2b719be2 # arm64: dts: r8a7796: Add optee node
   - aa1bb6d1927d617aea4afb021419326082653bf9 # tee: Add a macro to provide a register function to a kernel space
+  - cff6dba41e969cf92421e189998d2aa3895d643b # arm64: dts: r8a7795: Add optee node
+  - eef19e7c5353b6acd3c77e2ff5efd8466c740e11 # tee: tee_shm: Fix the release function to the shared memory
 
 upstream:
 
 comments:
+  - "2d440ad0a3976578ae47316ed1eeec5488624086: Because the upstream policy of the driver is unknown"
+  - "302879e890a65b4dc30c877e73b646de7aacf759: Because the upstream policy of the driver is unknown"
+  - "3c9cf833fef60330a60c48de6a25491cb1ad0946: Because the upstream policy of the driver is unknown"
+  - "62f50d22df2e03990e380e582e718822934c96a5: Because the upstream policy of the driver is unknown"
+  - "966a851d8ac664afac9c93a6817cd95a2b719be2: Because the upstream policy of the driver is unknown"
   - "aa1bb6d1927d617aea4afb021419326082653bf9: Because the upstream policy of the driver is unknown"
+  - "cff6dba41e969cf92421e189998d2aa3895d643b: Because the upstream policy of the driver is unknown"
+  - "eef19e7c5353b6acd3c77e2ff5efd8466c740e11: Because the upstream policy of the driver is unknown"
diff --git a/projects/linux/core/bsp392_tee_optee.yaml b/projects/linux/core/bsp392_tee_optee.yaml
deleted file mode 100644
index cc1216d..0000000
--- a/projects/linux/core/bsp392_tee_optee.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-title: "From bsp392, upport tee: optee:"
-team: Core
-key: c3b3b455-94eb-4b78-8611-8ed5a0ba4117
-status: New
-
-relationships:
-
-bsp-commits:
-  - 3c9cf833fef60330a60c48de6a25491cb1ad0946 # tee: optee: Change workqueue to kthread in debug log function
-  - 62f50d22df2e03990e380e582e718822934c96a5 # tee: optee: add r-car original function
-
-upstream:
-
-comments:
-  - "3c9cf833fef60330a60c48de6a25491cb1ad0946: Because the upstream policy of the driver is unknown"
-  - "62f50d22df2e03990e380e582e718822934c96a5: Because the upstream policy of the driver is unknown"
diff --git a/projects/linux/core/bsp392_tee_tee_shm.yaml b/projects/linux/core/bsp392_tee_tee_shm.yaml
deleted file mode 100644
index 4ff7d36..0000000
--- a/projects/linux/core/bsp392_tee_tee_shm.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-title: "From bsp392, upport tee: tee_shm:"
-team: Core
-key: 635025dd-1ef2-4a8a-91b7-c5e90a5632cf
-status: New
-
-relationships:
-
-bsp-commits:
-  - eef19e7c5353b6acd3c77e2ff5efd8466c740e11 # tee: tee_shm: Fix the release function to the shared memory
-
-upstream:
-
-comments:
-  - "eef19e7c5353b6acd3c77e2ff5efd8466c740e11: Because the upstream policy of the driver is unknown"