projects: linux: core: Merge clock errata

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

5 files changed, 18 insertions, 30 deletions

diff --git a/projects/linux/core/bsp392_clk_renesas_errata.yaml b/projects/linux/core/bsp392_clk_renesas_errata.yaml
new file mode 100644
index 0000000..9d7e0ad
--- /dev/null
+++ b/projects/linux/core/bsp392_clk_renesas_errata.yaml
@@ -0,0 +1,18 @@
+title: "From bsp392, upport clk: renesas: errata"
+team: Core
+key: 67a370b6-df7b-4d7f-ace2-b7470925f38c
+status: New
+
+relationships:
+
+bsp-commits:
+  - 1ad2ac2ebaee63e6df1489d145e9a17bc8dc32a0 # clk: renesas: r8a7796: Correct parent clock of EHCI/OHCI
+  - 5944af98d299aeb81c1f867b2869ea912b3b8eb7 # clk: renesas: r8a77{95,96,965,990}: Correct parent clock of Audio-DMAC
+  - a368826e8647d23a758207e191b14b2207182632 # clk: renesas: r8a77{95,96,965}: Correct parent clock of SYS-DMAC
+  - accceea30bd4f4aca1be5771e48db70e83e0b10e # clk: renesas: r8a77{95,965,990}: Correct parent clock of EHCI/OHCI
+  - e6b2f32570db4c47730e2217f3aa602a370f5aa5 # clk: renesas: r8a7796: Correct parent clock of HS-USB
+  - f1699a5ab267220bebcaa99104c3f3e69f1fa453 # clk: renesas: r8a77{95,965,990}: Correct parent clock of HS-USB
+
+upstream:
+
+comments:
diff --git a/projects/linux/core/bsp392_clk_renesas_r8a7796.yaml b/projects/linux/core/bsp392_clk_renesas_r8a7796.yaml
index 35361a7..0336483 100644
--- a/projects/linux/core/bsp392_clk_renesas_r8a7796.yaml
+++ b/projects/linux/core/bsp392_clk_renesas_r8a7796.yaml
@@ -6,9 +6,7 @@ status: New
 relationships:
 
 bsp-commits:
-  - 1ad2ac2ebaee63e6df1489d145e9a17bc8dc32a0 # clk: renesas: r8a7796: Correct parent clock of EHCI/OHCI
   - aa06410b1a3b130a4b3c09b2de31e47f5f0c4752 # clk: renesas: r8a7796: Add division value of z and z2 clock
-  - e6b2f32570db4c47730e2217f3aa602a370f5aa5 # clk: renesas: r8a7796: Correct parent clock of HS-USB
   - eb2b15bdbc4670893b4e1b4c4faa3c94a6d75511 # clk: renesas: r8a7796: Remove INTC-AP and INTC-EX clocks
 
 upstream:
diff --git a/projects/linux/core/bsp392_clk_renesas_r8a77{95,96,965,990}.yaml b/projects/linux/core/bsp392_clk_renesas_r8a77{95,96,965,990}.yaml
deleted file mode 100644
index 4186160..0000000
--- a/projects/linux/core/bsp392_clk_renesas_r8a77{95,96,965,990}.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-title: "From bsp392, upport clk: renesas: r8a77{95,96,965,990}:"
-team: Core
-key: 67a370b6-df7b-4d7f-ace2-b7470925f38c
-status: New
-
-relationships:
-
-bsp-commits:
-  - 5944af98d299aeb81c1f867b2869ea912b3b8eb7 # clk: renesas: r8a77{95,96,965,990}: Correct parent clock of Audio-DMAC
-
-upstream:
-
-comments:
diff --git a/projects/linux/core/bsp392_clk_renesas_r8a77{95,96,965}.yaml b/projects/linux/core/bsp392_clk_renesas_r8a77{95,96,965}.yaml
deleted file mode 100644
index 52746ef..0000000
--- a/projects/linux/core/bsp392_clk_renesas_r8a77{95,96,965}.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-title: "From bsp392, upport clk: renesas: r8a77{95,96,965}:"
-team: Core
-key: 095380a9-51a6-4b2b-b932-488bcb91fa73
-status: New
-
-relationships:
-
-bsp-commits:
-  - a368826e8647d23a758207e191b14b2207182632 # clk: renesas: r8a77{95,96,965}: Correct parent clock of SYS-DMAC
-
-upstream:
-
-comments:
diff --git a/projects/linux/core/bsp392_clk_renesas_r8a77{95,965,990}.yaml b/projects/linux/core/bsp392_clk_renesas_r8a77{95,965,990}.yaml
index 874c683..24e348c 100644
--- a/projects/linux/core/bsp392_clk_renesas_r8a77{95,965,990}.yaml
+++ b/projects/linux/core/bsp392_clk_renesas_r8a77{95,965,990}.yaml
@@ -7,8 +7,6 @@ relationships:
 
 bsp-commits:
   - 2826ead86b471df62b9f3214ffb43b70e0759152 # clk: renesas: r8a77{95,965,990}: Remove INTC-AP and INTC-EX clocks
-  - accceea30bd4f4aca1be5771e48db70e83e0b10e # clk: renesas: r8a77{95,965,990}: Correct parent clock of EHCI/OHCI
-  - f1699a5ab267220bebcaa99104c3f3e69f1fa453 # clk: renesas: r8a77{95,965,990}: Correct parent clock of HS-USB
 
 upstream: