projects: linux: core: Merge Z/Z2 clocks

Mark active, and assigned to Simon

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

7 files changed, 33 insertions, 68 deletions

diff --git a/projects/linux/core/bsp392_clk_renesas_cpg-mssr.yaml b/projects/linux/core/bsp392_clk_renesas_cpg-mssr.yaml
deleted file mode 100644
index da485f1..0000000
--- a/projects/linux/core/bsp392_clk_renesas_cpg-mssr.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-title: "From bsp392, upport clk: renesas: cpg-mssr:"
-team: Core
-key: 1dfbff49-e680-474d-900b-5d11aa104915
-status: New
-
-relationships:
-
-bsp-commits:
-  - abb24ccb7cfaaa0e3ca80ddd715e77a1c6f6e6d0 # clk: renesas: cpg-mssr: Add DEF_GEN3_Z macro
-
-upstream:
-
-comments:
-  - "abb24ccb7cfaaa0e3ca80ddd715e77a1c6f6e6d0: https://patchwork.kernel.org/patch/10805917/"
diff --git a/projects/linux/core/bsp392_clk_renesas_r8a7795.yaml b/projects/linux/core/bsp392_clk_renesas_r8a7795.yaml
deleted file mode 100644
index fd7b3f7..0000000
--- a/projects/linux/core/bsp392_clk_renesas_r8a7795.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-title: "From bsp392, upport clk: renesas: r8a7795:"
-team: Core
-key: 9ba3a1dd-690e-4d2f-a73b-fef73e9baa99
-status: New
-
-relationships:
-
-bsp-commits:
-  - 9b10ae593028df22d0565002a696ccf5b9751bb4 # clk: renesas: r8a7795: Add division value of z and z2 clock
-
-upstream:
-
-comments:
-  - "9b10ae593028df22d0565002a696ccf5b9751bb4: https://patchwork.kernel.org/patch/10805917/"
diff --git a/projects/linux/core/bsp392_clk_renesas_r8a7796.yaml b/projects/linux/core/bsp392_clk_renesas_r8a7796.yaml
index 0336483..bc4f37c 100644
--- a/projects/linux/core/bsp392_clk_renesas_r8a7796.yaml
+++ b/projects/linux/core/bsp392_clk_renesas_r8a7796.yaml
@@ -6,11 +6,9 @@ status: New
 relationships:
 
 bsp-commits:
-  - aa06410b1a3b130a4b3c09b2de31e47f5f0c4752 # clk: renesas: r8a7796: Add division value of z and z2 clock
   - eb2b15bdbc4670893b4e1b4c4faa3c94a6d75511 # clk: renesas: r8a7796: Remove INTC-AP and INTC-EX clocks
 
 upstream:
 
 comments:
-  - "aa06410b1a3b130a4b3c09b2de31e47f5f0c4752: https://patchwork.kernel.org/patch/10805917/"
   - "eb2b15bdbc4670893b4e1b4c4faa3c94a6d75511: Proposing 'N': Removing the INTC-EX module clock breaks old DTB, INTC-AP does exist and must not be disabled"
diff --git a/projects/linux/core/bsp392_clk_renesas_r8a77965.yaml b/projects/linux/core/bsp392_clk_renesas_r8a77965.yaml
deleted file mode 100644
index 7a3caee..0000000
--- a/projects/linux/core/bsp392_clk_renesas_r8a77965.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-title: "From bsp392, upport clk: renesas: r8a77965:"
-team: Core
-key: 5abadb4d-7ed4-4397-9d96-2072a081b0ad
-status: New
-
-relationships:
-
-bsp-commits:
-  - f6cd0437d6ec3ef4889f7ffb8a5f696c1b05ac2a # clk: renesas: r8a77965: Add division value of z clock
-
-upstream:
-
-comments:
-  - "f6cd0437d6ec3ef4889f7ffb8a5f696c1b05ac2a: https://patchwork.kernel.org/patch/10805917/"
diff --git a/projects/linux/core/bsp392_clk_renesas_r8a77990.yaml b/projects/linux/core/bsp392_clk_renesas_r8a77990.yaml
deleted file mode 100644
index c91b03f..0000000
--- a/projects/linux/core/bsp392_clk_renesas_r8a77990.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-title: "From bsp392, upport clk: renesas: r8a77990:"
-team: Core
-key: 6bfc5f73-2c6f-4f45-a9ff-87cd94c9bb36
-status: New
-
-relationships:
-
-bsp-commits:
-  - 2b12c11844fa5be38078bec552a6c0ede189292e # clk: renesas: r8a77990: Add Z2 clock
-
-upstream:
-
-comments:
-  - "2b12c11844fa5be38078bec552a6c0ede189292e: https://patchwork.kernel.org/patch/10805905/"
diff --git a/projects/linux/core/bsp392_clk_renesas_rcar-gen3.yaml b/projects/linux/core/bsp392_clk_renesas_rcar-gen3.yaml
index 4e01944..d8557b2 100644
--- a/projects/linux/core/bsp392_clk_renesas_rcar-gen3.yaml
+++ b/projects/linux/core/bsp392_clk_renesas_rcar-gen3.yaml
@@ -6,12 +6,7 @@ status: New
 relationships:
 
 bsp-commits:
-  - 11a8254d0dea1642c4ce369fe3c53f6679a17c8e # clk: renesas: rcar-gen3: Add support Z2 clock divider for R8A77990
-  - 1aa84001f1853bd52ac3d72ca425ce8be1b58640 # clk: renesas: rcar-gen3: Add support when frequency does not propagate to parent in z clock divider
   - 2de4f963524d2f6f0c0373f684fb7f0af997d4a7 # clk: renesas: rcar-gen3: Fix SD divider setting
-  - 3c32d47c96f6b664576a3e34abb35998e4f17789 # clk: renesas: rcar-gen3: Add rounding for Z-clock frequency
-  - 467ae1aa149ba70ef843a0fda2d6fc64328ab111 # clk: renesas: rcar-gen3: Add PLL clock and update z-clock for propagating frequency to parent
-  - dd4aba9be2060071c8d3278719dcb748d210d29b # clk: renesas: rcar-gen3: Add division value argument to cpg_z_clk_register
 
 upstream:
   - torvalds: 36c4da4f552a126bb29a95dc5c9608795491e32a # clk: renesas: rcar-gen3: Add HS400 quirk for SD clock
@@ -19,8 +14,3 @@ upstream:
   - torvalds: e2f4dd1f5b51b4dab813aa6e4db44e87aa750393 # clk: renesas: rcar-gen3: Add documentation for SD clocks
 
 comments:
-  - "11a8254d0dea1642c4ce369fe3c53f6679a17c8e: https://patchwork.kernel.org/patch/10805895/"
-  - "1aa84001f1853bd52ac3d72ca425ce8be1b58640: requested upport with 0ff874dd0f36501e13e30be213c5641db2352237 of BSPv3.6.1"
-  - "3c32d47c96f6b664576a3e34abb35998e4f17789: This is a local patch file for developers. So we don't need to upport."
-  - "467ae1aa149ba70ef843a0fda2d6fc64328ab111: We need to upport with refactoring."
-  - "dd4aba9be2060071c8d3278719dcb748d210d29b: https://patchwork.kernel.org/patch/10805917/"
diff --git a/projects/linux/core/bsp392_clk_renesas_z_z2_clocks.yaml b/projects/linux/core/bsp392_clk_renesas_z_z2_clocks.yaml
new file mode 100644
index 0000000..8260a14
--- /dev/null
+++ b/projects/linux/core/bsp392_clk_renesas_z_z2_clocks.yaml
@@ -0,0 +1,33 @@
+title: "From bsp392, upport clk: renesas: Z/Z2 clocks"
+team: Core
+key: 1dfbff49-e680-474d-900b-5d11aa104915
+status: Active
+assignee: Simon
+
+relationships:
+
+bsp-commits:
+  - 11a8254d0dea1642c4ce369fe3c53f6679a17c8e # clk: renesas: rcar-gen3: Add support Z2 clock divider for R8A77990
+  - 1aa84001f1853bd52ac3d72ca425ce8be1b58640 # clk: renesas: rcar-gen3: Add support when frequency does not propagate to parent in z clock divider
+  - 2b12c11844fa5be38078bec552a6c0ede189292e # clk: renesas: r8a77990: Add Z2 clock
+  - 3c32d47c96f6b664576a3e34abb35998e4f17789 # clk: renesas: rcar-gen3: Add rounding for Z-clock frequency
+  - 467ae1aa149ba70ef843a0fda2d6fc64328ab111 # clk: renesas: rcar-gen3: Add PLL clock and update z-clock for propagating frequency to parent
+  - 9b10ae593028df22d0565002a696ccf5b9751bb4 # clk: renesas: r8a7795: Add division value of z and z2 clock
+  - aa06410b1a3b130a4b3c09b2de31e47f5f0c4752 # clk: renesas: r8a7796: Add division value of z and z2 clock
+  - abb24ccb7cfaaa0e3ca80ddd715e77a1c6f6e6d0 # clk: renesas: cpg-mssr: Add DEF_GEN3_Z macro
+  - dd4aba9be2060071c8d3278719dcb748d210d29b # clk: renesas: rcar-gen3: Add division value argument to cpg_z_clk_register
+  - f6cd0437d6ec3ef4889f7ffb8a5f696c1b05ac2a # clk: renesas: r8a77965: Add division value of z clock
+
+upstream:
+
+comments:
+  - "11a8254d0dea1642c4ce369fe3c53f6679a17c8e: https://patchwork.kernel.org/patch/10805895/"
+  - "1aa84001f1853bd52ac3d72ca425ce8be1b58640: requested upport with 0ff874dd0f36501e13e30be213c5641db2352237 of BSPv3.6.1"
+  - "2b12c11844fa5be38078bec552a6c0ede189292e: https://patchwork.kernel.org/patch/10805905/"
+  - "3c32d47c96f6b664576a3e34abb35998e4f17789: This is a local patch file for developers. So we don't need to upport."
+  - "467ae1aa149ba70ef843a0fda2d6fc64328ab111: We need to upport with refactoring."
+  - "9b10ae593028df22d0565002a696ccf5b9751bb4: https://patchwork.kernel.org/patch/10805917/"
+  - "aa06410b1a3b130a4b3c09b2de31e47f5f0c4752: https://patchwork.kernel.org/patch/10805917/"
+  - "abb24ccb7cfaaa0e3ca80ddd715e77a1c6f6e6d0: https://patchwork.kernel.org/patch/10805917/"
+  - "dd4aba9be2060071c8d3278719dcb748d210d29b: https://patchwork.kernel.org/patch/10805917/"
+  - "f6cd0437d6ec3ef4889f7ffb8a5f696c1b05ac2a: https://patchwork.kernel.org/patch/10805917/"