[PATCH 00/15] clk: qcom: gcc-qcs404: convert to parent_data

[PATCH 00/15] clk: qcom: gcc-qcs404: convert to parent_data

[Dmitry Baryshkov]

This patchset reworks and improves the Qualcomm QCS404 global clock
controller driver and it's platform usage.

It fixes some omissions (MDSS and oxili GDSCs, incorrect clock names,
direct number usage in the qcs404.dtsi). Then it converts the gcc driver
to use parent_data/parent_hws where prefereable and finally applies
these features and fixes to the qcs404.dtsi.

Dmitry Baryshkov (15):
  dt-bindings: clock: qcom: gcc-qcs404: add two GDSC entries
  dt-bindings: clock: qcom: gcc-qcs404: switch to gcc.yaml
  dt-bindings: clock: qcom: gcc-qcs404: define clocks/clock-names for
    QCS404
  clk: qcom: gcc-qcs404: use ARRAY_SIZE instead of specifying
    num_parents
  clk: qcom: gcc-qcs404: disable gpll[04]_out_aux parents
  clk: qcom: gcc-qcs404: fix names of the DSI clocks used as parents
  clk: qcom: gcc-qcs404: fix the name of the HDMI PLL clock
  clk: qcom: gcc-qcs404: get rid of the test clock
  clk: qcom: gcc-qcs404: move PLL clocks up
  clk: qcom: gcc-qcs404: use parent_hws/_data instead of parent_names
  clk: qcom: gcc-qcs404: sort out the cxo clock
  clk: qcom: gcc-qcs404: add support for GDSCs
  arm64: dts: qcom: qcs404: use symbol names for PCIe resets
  arm64: dts: qcom: qcs404: add power-domains-cells to gcc node
  arm64: dts: qcom: qcs404: add clocks to the gcc node

 .../bindings/clock/qcom,gcc-qcs404.yaml       |  38 +-
 arch/arm64/boot/dts/qcom/qcs404.dtsi          |  26 +-
 drivers/clk/qcom/gcc-qcs404.c                 | 848 +++++++++---------
 include/dt-bindings/clock/qcom,gcc-qcs404.h   |   4 +
 4 files changed, 466 insertions(+), 450 deletions(-)

-- 
2.35.1

[PATCH 01/15] dt-bindings: clock: qcom: gcc-qcs404: add two GDSC entries

[Dmitry Baryshkov]

On QCS404 platform the Global Clock Controller supports two GDSCs: MDSS
(display) and OXILI (GPU). Add corresponding indices.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 include/dt-bindings/clock/qcom,gcc-qcs404.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/include/dt-bindings/clock/qcom,gcc-qcs404.h b/include/dt-bindings/clock/qcom,gcc-qcs404.h
index bc3051543347..126a51898571 100644
--- a/include/dt-bindings/clock/qcom,gcc-qcs404.h
+++ b/include/dt-bindings/clock/qcom,gcc-qcs404.h
@@ -177,4 +177,8 @@
 #define GCC_PCIE_0_PIPE_ARES				21
 #define GCC_WDSP_RESTART				22
 
+/* Indexes for GDSCs */
+#define MDSS_GDSC				0
+#define OXILI_GDSC				1
+
 #endif
-- 
2.35.1

Re: [PATCH 01/15] dt-bindings: clock: qcom: gcc-qcs404: add two GDSC entries

[Krzysztof Kozlowski]

On 17/12/2022 01:17, Dmitry Baryshkov wrote:
> On QCS404 platform the Global Clock Controller supports two GDSCs: MDSS
> (display) and OXILI (GPU). Add corresponding indices.
> 
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
>  include/dt-bindings/clock/qcom,gcc-qcs404.h | 4 ++++
>  1 file changed, 4 insertions(+)


Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Best regards,
Krzysztof

[PATCH 02/15] dt-bindings: clock: qcom: gcc-qcs404: switch to gcc.yaml

[Dmitry Baryshkov]

Now as the gcc-qcs404 gained support for GDSC and requires using
the #power-domain-cells property, switch the qcom,gcc-qcs404.yaml schema
to use common gcc.yaml.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 .../bindings/clock/qcom,gcc-qcs404.yaml       | 22 +++++--------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/Documentation/devicetree/bindings/clock/qcom,gcc-qcs404.yaml b/Documentation/devicetree/bindings/clock/qcom,gcc-qcs404.yaml
index dca5775f79a4..b70901e0d5cf 100644
--- a/Documentation/devicetree/bindings/clock/qcom,gcc-qcs404.yaml
+++ b/Documentation/devicetree/bindings/clock/qcom,gcc-qcs404.yaml
@@ -20,26 +20,13 @@ properties:
   compatible:
     const: qcom,gcc-qcs404
 
-  '#clock-cells':
-    const: 1
-
-  '#reset-cells':
-    const: 1
-
-  reg:
-    maxItems: 1
-
-  protected-clocks:
-    description:
-      Protected clock specifier list as per common clock binding.
-
 required:
   - compatible
-  - reg
-  - '#clock-cells'
-  - '#reset-cells'
 
-additionalProperties: false
+allOf:
+  - $ref: qcom,gcc.yaml#
+
+unevaluatedProperties: false
 
 examples:
   - |
@@ -48,5 +35,6 @@ examples:
       reg = <0x01800000 0x80000>;
       #clock-cells = <1>;
       #reset-cells = <1>;
+      #power-domain-cells = <1>;
     };
 ...
-- 
2.35.1

Re: [PATCH 02/15] dt-bindings: clock: qcom: gcc-qcs404: switch to gcc.yaml

[Krzysztof Kozlowski]

On 17/12/2022 01:17, Dmitry Baryshkov wrote:
> Now as the gcc-qcs404 gained support for GDSC and requires using
> the #power-domain-cells property, switch the qcom,gcc-qcs404.yaml schema
> to use common gcc.yaml.
> 
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---


Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Best regards,
Krzysztof

[PATCH 03/15] dt-bindings: clock: qcom: gcc-qcs404: define clocks/clock-names for QCS404

[Dmitry Baryshkov]

Define clock/clock-names properties of the GCC device node to be used
on QCS404 platform.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 .../bindings/clock/qcom,gcc-qcs404.yaml        | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/Documentation/devicetree/bindings/clock/qcom,gcc-qcs404.yaml b/Documentation/devicetree/bindings/clock/qcom,gcc-qcs404.yaml
index b70901e0d5cf..b2256f81b265 100644
--- a/Documentation/devicetree/bindings/clock/qcom,gcc-qcs404.yaml
+++ b/Documentation/devicetree/bindings/clock/qcom,gcc-qcs404.yaml
@@ -20,6 +20,24 @@ properties:
   compatible:
     const: qcom,gcc-qcs404
 
+  clocks:
+    items:
+      - description: XO source
+      - description: Sleep clock source
+      - description: PCIe 0 PIPE clock (optional)
+      - description: DSI phy instance 0 dsi clock
+      - description: DSI phy instance 0 byte clock
+      - description: HDMI phy PLL clock
+
+  clock-names:
+    items:
+      - const: cxo
+      - const: sleep_clk
+      - const: pcie_0_pipe_clk_src
+      - const: dsi0pll
+      - const: dsi0pllbyte
+      - const: hdmi_pll
+
 required:
   - compatible
 
-- 
2.35.1

Re: [PATCH 03/15] dt-bindings: clock: qcom: gcc-qcs404: define clocks/clock-names for QCS404

[Krzysztof Kozlowski]

On 17/12/2022 01:17, Dmitry Baryshkov wrote:
> Define clock/clock-names properties of the GCC device node to be used
> on QCS404 platform.
> 
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---


Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Best regards,
Krzysztof

[PATCH 04/15] clk: qcom: gcc-qcs404: use ARRAY_SIZE instead of specifying num_parents

[Dmitry Baryshkov]

Use ARRAY_SIZE() instead of manually specifying num_parents. This makes
adding/removing entries to/from parent_data/names/hws easy and errorproof.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 drivers/clk/qcom/gcc-qcs404.c | 86 +++++++++++++++++------------------
 1 file changed, 43 insertions(+), 43 deletions(-)

diff --git a/drivers/clk/qcom/gcc-qcs404.c b/drivers/clk/qcom/gcc-qcs404.c
index 46d314d69250..f60a0ab42da1 100644
--- a/drivers/clk/qcom/gcc-qcs404.c
+++ b/drivers/clk/qcom/gcc-qcs404.c
@@ -440,7 +440,7 @@ static struct clk_rcg2 apss_ahb_clk_src = {
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "apss_ahb_clk_src",
 		.parent_names = gcc_parent_names_ao_0,
-		.num_parents = 3,
+		.num_parents = ARRAY_SIZE(gcc_parent_names_ao_0),
 		.flags = CLK_IS_CRITICAL,
 		.ops = &clk_rcg2_ops,
 	},
@@ -461,7 +461,7 @@ static struct clk_rcg2 blsp1_qup0_i2c_apps_clk_src = {
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "blsp1_qup0_i2c_apps_clk_src",
 		.parent_names = gcc_parent_names_0,
-		.num_parents = 3,
+		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -486,7 +486,7 @@ static struct clk_rcg2 blsp1_qup0_spi_apps_clk_src = {
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "blsp1_qup0_spi_apps_clk_src",
 		.parent_names = gcc_parent_names_0,
-		.num_parents = 3,
+		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -500,7 +500,7 @@ static struct clk_rcg2 blsp1_qup1_i2c_apps_clk_src = {
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "blsp1_qup1_i2c_apps_clk_src",
 		.parent_names = gcc_parent_names_0,
-		.num_parents = 3,
+		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -525,7 +525,7 @@ static struct clk_rcg2 blsp1_qup1_spi_apps_clk_src = {
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "blsp1_qup1_spi_apps_clk_src",
 		.parent_names = gcc_parent_names_0,
-		.num_parents = 3,
+		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -539,7 +539,7 @@ static struct clk_rcg2 blsp1_qup2_i2c_apps_clk_src = {
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "blsp1_qup2_i2c_apps_clk_src",
 		.parent_names = gcc_parent_names_0,
-		.num_parents = 3,
+		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -565,7 +565,7 @@ static struct clk_rcg2 blsp1_qup2_spi_apps_clk_src = {
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "blsp1_qup2_spi_apps_clk_src",
 		.parent_names = gcc_parent_names_0,
-		.num_parents = 3,
+		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -579,7 +579,7 @@ static struct clk_rcg2 blsp1_qup3_i2c_apps_clk_src = {
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "blsp1_qup3_i2c_apps_clk_src",
 		.parent_names = gcc_parent_names_0,
-		.num_parents = 3,
+		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -593,7 +593,7 @@ static struct clk_rcg2 blsp1_qup3_spi_apps_clk_src = {
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "blsp1_qup3_spi_apps_clk_src",
 		.parent_names = gcc_parent_names_0,
-		.num_parents = 3,
+		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -607,7 +607,7 @@ static struct clk_rcg2 blsp1_qup4_i2c_apps_clk_src = {
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "blsp1_qup4_i2c_apps_clk_src",
 		.parent_names = gcc_parent_names_0,
-		.num_parents = 3,
+		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -621,7 +621,7 @@ static struct clk_rcg2 blsp1_qup4_spi_apps_clk_src = {
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "blsp1_qup4_spi_apps_clk_src",
 		.parent_names = gcc_parent_names_0,
-		.num_parents = 3,
+		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -655,7 +655,7 @@ static struct clk_rcg2 blsp1_uart0_apps_clk_src = {
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "blsp1_uart0_apps_clk_src",
 		.parent_names = gcc_parent_names_0,
-		.num_parents = 3,
+		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -669,7 +669,7 @@ static struct clk_rcg2 blsp1_uart1_apps_clk_src = {
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "blsp1_uart1_apps_clk_src",
 		.parent_names = gcc_parent_names_0,
-		.num_parents = 3,
+		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -683,7 +683,7 @@ static struct clk_rcg2 blsp1_uart2_apps_clk_src = {
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "blsp1_uart2_apps_clk_src",
 		.parent_names = gcc_parent_names_0,
-		.num_parents = 3,
+		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -698,7 +698,7 @@ static struct clk_rcg2 blsp1_uart3_apps_clk_src = {
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "blsp1_uart3_apps_clk_src",
 		.parent_names = gcc_parent_names_0,
-		.num_parents = 3,
+		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -712,7 +712,7 @@ static struct clk_rcg2 blsp2_qup0_i2c_apps_clk_src = {
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "blsp2_qup0_i2c_apps_clk_src",
 		.parent_names = gcc_parent_names_0,
-		.num_parents = 3,
+		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -726,7 +726,7 @@ static struct clk_rcg2 blsp2_qup0_spi_apps_clk_src = {
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "blsp2_qup0_spi_apps_clk_src",
 		.parent_names = gcc_parent_names_0,
-		.num_parents = 3,
+		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -740,7 +740,7 @@ static struct clk_rcg2 blsp2_uart0_apps_clk_src = {
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "blsp2_uart0_apps_clk_src",
 		.parent_names = gcc_parent_names_0,
-		.num_parents = 3,
+		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -753,7 +753,7 @@ static struct clk_rcg2 byte0_clk_src = {
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "byte0_clk_src",
 		.parent_names = gcc_parent_names_5,
-		.num_parents = 4,
+		.num_parents = ARRAY_SIZE(gcc_parent_names_5),
 		.flags = CLK_SET_RATE_PARENT,
 		.ops = &clk_byte2_ops,
 	},
@@ -776,7 +776,7 @@ static struct clk_rcg2 emac_clk_src = {
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "emac_clk_src",
 		.parent_names = gcc_parent_names_4,
-		.num_parents = 3,
+		.num_parents = ARRAY_SIZE(gcc_parent_names_4),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -797,7 +797,7 @@ static struct clk_rcg2 emac_ptp_clk_src = {
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "emac_ptp_clk_src",
 		.parent_names = gcc_parent_names_4,
-		.num_parents = 3,
+		.num_parents = ARRAY_SIZE(gcc_parent_names_4),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -816,7 +816,7 @@ static struct clk_rcg2 esc0_clk_src = {
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "esc0_clk_src",
 		.parent_names = gcc_parent_names_6,
-		.num_parents = 4,
+		.num_parents = ARRAY_SIZE(gcc_parent_names_6),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -850,7 +850,7 @@ static struct clk_rcg2 gfx3d_clk_src = {
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "gfx3d_clk_src",
 		.parent_names = gcc_parent_names_7,
-		.num_parents = 6,
+		.num_parents = ARRAY_SIZE(gcc_parent_names_7),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -871,7 +871,7 @@ static struct clk_rcg2 gp1_clk_src = {
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "gp1_clk_src",
 		.parent_names = gcc_parent_names_2,
-		.num_parents = 4,
+		.num_parents = ARRAY_SIZE(gcc_parent_names_2),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -885,7 +885,7 @@ static struct clk_rcg2 gp2_clk_src = {
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "gp2_clk_src",
 		.parent_names = gcc_parent_names_2,
-		.num_parents = 4,
+		.num_parents = ARRAY_SIZE(gcc_parent_names_2),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -899,7 +899,7 @@ static struct clk_rcg2 gp3_clk_src = {
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "gp3_clk_src",
 		.parent_names = gcc_parent_names_2,
-		.num_parents = 4,
+		.num_parents = ARRAY_SIZE(gcc_parent_names_2),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -913,7 +913,7 @@ static struct clk_rcg2 hdmi_app_clk_src = {
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "hdmi_app_clk_src",
 		.parent_names = gcc_parent_names_1,
-		.num_parents = 2,
+		.num_parents = ARRAY_SIZE(gcc_parent_names_1),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -927,7 +927,7 @@ static struct clk_rcg2 hdmi_pclk_clk_src = {
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "hdmi_pclk_clk_src",
 		.parent_names = gcc_parent_names_8,
-		.num_parents = 3,
+		.num_parents = ARRAY_SIZE(gcc_parent_names_8),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -954,7 +954,7 @@ static struct clk_rcg2 mdp_clk_src = {
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "mdp_clk_src",
 		.parent_names = gcc_parent_names_9,
-		.num_parents = 5,
+		.num_parents = ARRAY_SIZE(gcc_parent_names_9),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -973,7 +973,7 @@ static struct clk_rcg2 pcie_0_aux_clk_src = {
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "pcie_0_aux_clk_src",
 		.parent_names = gcc_parent_names_10,
-		.num_parents = 3,
+		.num_parents = ARRAY_SIZE(gcc_parent_names_10),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -994,7 +994,7 @@ static struct clk_rcg2 pcie_0_pipe_clk_src = {
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "pcie_0_pipe_clk_src",
 		.parent_names = gcc_parent_names_11,
-		.num_parents = 3,
+		.num_parents = ARRAY_SIZE(gcc_parent_names_11),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -1007,7 +1007,7 @@ static struct clk_rcg2 pclk0_clk_src = {
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "pclk0_clk_src",
 		.parent_names = gcc_parent_names_12,
-		.num_parents = 4,
+		.num_parents = ARRAY_SIZE(gcc_parent_names_12),
 		.flags = CLK_SET_RATE_PARENT,
 		.ops = &clk_pixel_ops,
 	},
@@ -1028,7 +1028,7 @@ static struct clk_rcg2 pdm2_clk_src = {
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "pdm2_clk_src",
 		.parent_names = gcc_parent_names_0,
-		.num_parents = 3,
+		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -1056,7 +1056,7 @@ static struct clk_rcg2 sdcc1_apps_clk_src = {
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "sdcc1_apps_clk_src",
 		.parent_names = gcc_parent_names_13,
-		.num_parents = 5,
+		.num_parents = ARRAY_SIZE(gcc_parent_names_13),
 		.ops = &clk_rcg2_floor_ops,
 	},
 };
@@ -1076,7 +1076,7 @@ static struct clk_rcg2 sdcc1_ice_core_clk_src = {
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "sdcc1_ice_core_clk_src",
 		.parent_names = gcc_parent_names_3,
-		.num_parents = 4,
+		.num_parents = ARRAY_SIZE(gcc_parent_names_3),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -1102,7 +1102,7 @@ static struct clk_rcg2 sdcc2_apps_clk_src = {
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "sdcc2_apps_clk_src",
 		.parent_names = gcc_parent_names_14,
-		.num_parents = 4,
+		.num_parents = ARRAY_SIZE(gcc_parent_names_14),
 		.ops = &clk_rcg2_floor_ops,
 	},
 };
@@ -1116,7 +1116,7 @@ static struct clk_rcg2 usb20_mock_utmi_clk_src = {
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "usb20_mock_utmi_clk_src",
 		.parent_names = gcc_parent_names_1,
-		.num_parents = 2,
+		.num_parents = ARRAY_SIZE(gcc_parent_names_1),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -1138,7 +1138,7 @@ static struct clk_rcg2 usb30_master_clk_src = {
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "usb30_master_clk_src",
 		.parent_names = gcc_parent_names_0,
-		.num_parents = 3,
+		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -1152,7 +1152,7 @@ static struct clk_rcg2 usb30_mock_utmi_clk_src = {
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "usb30_mock_utmi_clk_src",
 		.parent_names = gcc_parent_names_1,
-		.num_parents = 2,
+		.num_parents = ARRAY_SIZE(gcc_parent_names_1),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -1166,7 +1166,7 @@ static struct clk_rcg2 usb3_phy_aux_clk_src = {
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "usb3_phy_aux_clk_src",
 		.parent_names = gcc_parent_names_1,
-		.num_parents = 2,
+		.num_parents = ARRAY_SIZE(gcc_parent_names_1),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -1189,7 +1189,7 @@ static struct clk_rcg2 usb_hs_system_clk_src = {
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "usb_hs_system_clk_src",
 		.parent_names = gcc_parent_names_3,
-		.num_parents = 4,
+		.num_parents = ARRAY_SIZE(gcc_parent_names_3),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -1203,7 +1203,7 @@ static struct clk_rcg2 vsync_clk_src = {
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "vsync_clk_src",
 		.parent_names = gcc_parent_names_15,
-		.num_parents = 3,
+		.num_parents = ARRAY_SIZE(gcc_parent_names_15),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -1225,7 +1225,7 @@ static struct clk_rcg2 cdsp_bimc_clk_src = {
 	.clkr.hw.init = &(struct clk_init_data) {
 		.name = "cdsp_bimc_clk_src",
 		.parent_names = gcc_parent_names_16,
-		.num_parents = 4,
+		.num_parents = ARRAY_SIZE(gcc_parent_names_16),
 		.ops = &clk_rcg2_ops,
 	},
 };
-- 
2.35.1

Re: [PATCH 04/15] clk: qcom: gcc-qcs404: use ARRAY_SIZE instead of specifying num_parents

[Konrad Dybcio]

On 17.12.2022 01:17, Dmitry Baryshkov wrote:
> Use ARRAY_SIZE() instead of manually specifying num_parents. This makes
> adding/removing entries to/from parent_data/names/hws easy and errorproof.
> 
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>

Konrad
>  drivers/clk/qcom/gcc-qcs404.c | 86 +++++++++++++++++------------------
>  1 file changed, 43 insertions(+), 43 deletions(-)
> 
> diff --git a/drivers/clk/qcom/gcc-qcs404.c b/drivers/clk/qcom/gcc-qcs404.c
> index 46d314d69250..f60a0ab42da1 100644
> --- a/drivers/clk/qcom/gcc-qcs404.c
> +++ b/drivers/clk/qcom/gcc-qcs404.c
> @@ -440,7 +440,7 @@ static struct clk_rcg2 apss_ahb_clk_src = {
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "apss_ahb_clk_src",
>  		.parent_names = gcc_parent_names_ao_0,
> -		.num_parents = 3,
> +		.num_parents = ARRAY_SIZE(gcc_parent_names_ao_0),
>  		.flags = CLK_IS_CRITICAL,
>  		.ops = &clk_rcg2_ops,
>  	},
> @@ -461,7 +461,7 @@ static struct clk_rcg2 blsp1_qup0_i2c_apps_clk_src = {
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "blsp1_qup0_i2c_apps_clk_src",
>  		.parent_names = gcc_parent_names_0,
> -		.num_parents = 3,
> +		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -486,7 +486,7 @@ static struct clk_rcg2 blsp1_qup0_spi_apps_clk_src = {
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "blsp1_qup0_spi_apps_clk_src",
>  		.parent_names = gcc_parent_names_0,
> -		.num_parents = 3,
> +		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -500,7 +500,7 @@ static struct clk_rcg2 blsp1_qup1_i2c_apps_clk_src = {
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "blsp1_qup1_i2c_apps_clk_src",
>  		.parent_names = gcc_parent_names_0,
> -		.num_parents = 3,
> +		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -525,7 +525,7 @@ static struct clk_rcg2 blsp1_qup1_spi_apps_clk_src = {
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "blsp1_qup1_spi_apps_clk_src",
>  		.parent_names = gcc_parent_names_0,
> -		.num_parents = 3,
> +		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -539,7 +539,7 @@ static struct clk_rcg2 blsp1_qup2_i2c_apps_clk_src = {
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "blsp1_qup2_i2c_apps_clk_src",
>  		.parent_names = gcc_parent_names_0,
> -		.num_parents = 3,
> +		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -565,7 +565,7 @@ static struct clk_rcg2 blsp1_qup2_spi_apps_clk_src = {
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "blsp1_qup2_spi_apps_clk_src",
>  		.parent_names = gcc_parent_names_0,
> -		.num_parents = 3,
> +		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -579,7 +579,7 @@ static struct clk_rcg2 blsp1_qup3_i2c_apps_clk_src = {
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "blsp1_qup3_i2c_apps_clk_src",
>  		.parent_names = gcc_parent_names_0,
> -		.num_parents = 3,
> +		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -593,7 +593,7 @@ static struct clk_rcg2 blsp1_qup3_spi_apps_clk_src = {
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "blsp1_qup3_spi_apps_clk_src",
>  		.parent_names = gcc_parent_names_0,
> -		.num_parents = 3,
> +		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -607,7 +607,7 @@ static struct clk_rcg2 blsp1_qup4_i2c_apps_clk_src = {
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "blsp1_qup4_i2c_apps_clk_src",
>  		.parent_names = gcc_parent_names_0,
> -		.num_parents = 3,
> +		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -621,7 +621,7 @@ static struct clk_rcg2 blsp1_qup4_spi_apps_clk_src = {
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "blsp1_qup4_spi_apps_clk_src",
>  		.parent_names = gcc_parent_names_0,
> -		.num_parents = 3,
> +		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -655,7 +655,7 @@ static struct clk_rcg2 blsp1_uart0_apps_clk_src = {
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "blsp1_uart0_apps_clk_src",
>  		.parent_names = gcc_parent_names_0,
> -		.num_parents = 3,
> +		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -669,7 +669,7 @@ static struct clk_rcg2 blsp1_uart1_apps_clk_src = {
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "blsp1_uart1_apps_clk_src",
>  		.parent_names = gcc_parent_names_0,
> -		.num_parents = 3,
> +		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -683,7 +683,7 @@ static struct clk_rcg2 blsp1_uart2_apps_clk_src = {
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "blsp1_uart2_apps_clk_src",
>  		.parent_names = gcc_parent_names_0,
> -		.num_parents = 3,
> +		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -698,7 +698,7 @@ static struct clk_rcg2 blsp1_uart3_apps_clk_src = {
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "blsp1_uart3_apps_clk_src",
>  		.parent_names = gcc_parent_names_0,
> -		.num_parents = 3,
> +		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -712,7 +712,7 @@ static struct clk_rcg2 blsp2_qup0_i2c_apps_clk_src = {
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "blsp2_qup0_i2c_apps_clk_src",
>  		.parent_names = gcc_parent_names_0,
> -		.num_parents = 3,
> +		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -726,7 +726,7 @@ static struct clk_rcg2 blsp2_qup0_spi_apps_clk_src = {
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "blsp2_qup0_spi_apps_clk_src",
>  		.parent_names = gcc_parent_names_0,
> -		.num_parents = 3,
> +		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -740,7 +740,7 @@ static struct clk_rcg2 blsp2_uart0_apps_clk_src = {
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "blsp2_uart0_apps_clk_src",
>  		.parent_names = gcc_parent_names_0,
> -		.num_parents = 3,
> +		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -753,7 +753,7 @@ static struct clk_rcg2 byte0_clk_src = {
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "byte0_clk_src",
>  		.parent_names = gcc_parent_names_5,
> -		.num_parents = 4,
> +		.num_parents = ARRAY_SIZE(gcc_parent_names_5),
>  		.flags = CLK_SET_RATE_PARENT,
>  		.ops = &clk_byte2_ops,
>  	},
> @@ -776,7 +776,7 @@ static struct clk_rcg2 emac_clk_src = {
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "emac_clk_src",
>  		.parent_names = gcc_parent_names_4,
> -		.num_parents = 3,
> +		.num_parents = ARRAY_SIZE(gcc_parent_names_4),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -797,7 +797,7 @@ static struct clk_rcg2 emac_ptp_clk_src = {
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "emac_ptp_clk_src",
>  		.parent_names = gcc_parent_names_4,
> -		.num_parents = 3,
> +		.num_parents = ARRAY_SIZE(gcc_parent_names_4),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -816,7 +816,7 @@ static struct clk_rcg2 esc0_clk_src = {
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "esc0_clk_src",
>  		.parent_names = gcc_parent_names_6,
> -		.num_parents = 4,
> +		.num_parents = ARRAY_SIZE(gcc_parent_names_6),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -850,7 +850,7 @@ static struct clk_rcg2 gfx3d_clk_src = {
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "gfx3d_clk_src",
>  		.parent_names = gcc_parent_names_7,
> -		.num_parents = 6,
> +		.num_parents = ARRAY_SIZE(gcc_parent_names_7),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -871,7 +871,7 @@ static struct clk_rcg2 gp1_clk_src = {
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "gp1_clk_src",
>  		.parent_names = gcc_parent_names_2,
> -		.num_parents = 4,
> +		.num_parents = ARRAY_SIZE(gcc_parent_names_2),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -885,7 +885,7 @@ static struct clk_rcg2 gp2_clk_src = {
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "gp2_clk_src",
>  		.parent_names = gcc_parent_names_2,
> -		.num_parents = 4,
> +		.num_parents = ARRAY_SIZE(gcc_parent_names_2),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -899,7 +899,7 @@ static struct clk_rcg2 gp3_clk_src = {
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "gp3_clk_src",
>  		.parent_names = gcc_parent_names_2,
> -		.num_parents = 4,
> +		.num_parents = ARRAY_SIZE(gcc_parent_names_2),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -913,7 +913,7 @@ static struct clk_rcg2 hdmi_app_clk_src = {
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "hdmi_app_clk_src",
>  		.parent_names = gcc_parent_names_1,
> -		.num_parents = 2,
> +		.num_parents = ARRAY_SIZE(gcc_parent_names_1),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -927,7 +927,7 @@ static struct clk_rcg2 hdmi_pclk_clk_src = {
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "hdmi_pclk_clk_src",
>  		.parent_names = gcc_parent_names_8,
> -		.num_parents = 3,
> +		.num_parents = ARRAY_SIZE(gcc_parent_names_8),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -954,7 +954,7 @@ static struct clk_rcg2 mdp_clk_src = {
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "mdp_clk_src",
>  		.parent_names = gcc_parent_names_9,
> -		.num_parents = 5,
> +		.num_parents = ARRAY_SIZE(gcc_parent_names_9),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -973,7 +973,7 @@ static struct clk_rcg2 pcie_0_aux_clk_src = {
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "pcie_0_aux_clk_src",
>  		.parent_names = gcc_parent_names_10,
> -		.num_parents = 3,
> +		.num_parents = ARRAY_SIZE(gcc_parent_names_10),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -994,7 +994,7 @@ static struct clk_rcg2 pcie_0_pipe_clk_src = {
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "pcie_0_pipe_clk_src",
>  		.parent_names = gcc_parent_names_11,
> -		.num_parents = 3,
> +		.num_parents = ARRAY_SIZE(gcc_parent_names_11),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -1007,7 +1007,7 @@ static struct clk_rcg2 pclk0_clk_src = {
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "pclk0_clk_src",
>  		.parent_names = gcc_parent_names_12,
> -		.num_parents = 4,
> +		.num_parents = ARRAY_SIZE(gcc_parent_names_12),
>  		.flags = CLK_SET_RATE_PARENT,
>  		.ops = &clk_pixel_ops,
>  	},
> @@ -1028,7 +1028,7 @@ static struct clk_rcg2 pdm2_clk_src = {
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "pdm2_clk_src",
>  		.parent_names = gcc_parent_names_0,
> -		.num_parents = 3,
> +		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -1056,7 +1056,7 @@ static struct clk_rcg2 sdcc1_apps_clk_src = {
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "sdcc1_apps_clk_src",
>  		.parent_names = gcc_parent_names_13,
> -		.num_parents = 5,
> +		.num_parents = ARRAY_SIZE(gcc_parent_names_13),
>  		.ops = &clk_rcg2_floor_ops,
>  	},
>  };
> @@ -1076,7 +1076,7 @@ static struct clk_rcg2 sdcc1_ice_core_clk_src = {
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "sdcc1_ice_core_clk_src",
>  		.parent_names = gcc_parent_names_3,
> -		.num_parents = 4,
> +		.num_parents = ARRAY_SIZE(gcc_parent_names_3),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -1102,7 +1102,7 @@ static struct clk_rcg2 sdcc2_apps_clk_src = {
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "sdcc2_apps_clk_src",
>  		.parent_names = gcc_parent_names_14,
> -		.num_parents = 4,
> +		.num_parents = ARRAY_SIZE(gcc_parent_names_14),
>  		.ops = &clk_rcg2_floor_ops,
>  	},
>  };
> @@ -1116,7 +1116,7 @@ static struct clk_rcg2 usb20_mock_utmi_clk_src = {
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "usb20_mock_utmi_clk_src",
>  		.parent_names = gcc_parent_names_1,
> -		.num_parents = 2,
> +		.num_parents = ARRAY_SIZE(gcc_parent_names_1),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -1138,7 +1138,7 @@ static struct clk_rcg2 usb30_master_clk_src = {
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "usb30_master_clk_src",
>  		.parent_names = gcc_parent_names_0,
> -		.num_parents = 3,
> +		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -1152,7 +1152,7 @@ static struct clk_rcg2 usb30_mock_utmi_clk_src = {
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "usb30_mock_utmi_clk_src",
>  		.parent_names = gcc_parent_names_1,
> -		.num_parents = 2,
> +		.num_parents = ARRAY_SIZE(gcc_parent_names_1),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -1166,7 +1166,7 @@ static struct clk_rcg2 usb3_phy_aux_clk_src = {
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "usb3_phy_aux_clk_src",
>  		.parent_names = gcc_parent_names_1,
> -		.num_parents = 2,
> +		.num_parents = ARRAY_SIZE(gcc_parent_names_1),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -1189,7 +1189,7 @@ static struct clk_rcg2 usb_hs_system_clk_src = {
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "usb_hs_system_clk_src",
>  		.parent_names = gcc_parent_names_3,
> -		.num_parents = 4,
> +		.num_parents = ARRAY_SIZE(gcc_parent_names_3),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -1203,7 +1203,7 @@ static struct clk_rcg2 vsync_clk_src = {
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "vsync_clk_src",
>  		.parent_names = gcc_parent_names_15,
> -		.num_parents = 3,
> +		.num_parents = ARRAY_SIZE(gcc_parent_names_15),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -1225,7 +1225,7 @@ static struct clk_rcg2 cdsp_bimc_clk_src = {
>  	.clkr.hw.init = &(struct clk_init_data) {
>  		.name = "cdsp_bimc_clk_src",
>  		.parent_names = gcc_parent_names_16,
> -		.num_parents = 4,
> +		.num_parents = ARRAY_SIZE(gcc_parent_names_16),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };

[PATCH 05/15] clk: qcom: gcc-qcs404: disable gpll[04]_out_aux parents

[Dmitry Baryshkov]

On the QCS404 platform the driver for the Global Clock Controller
doens't define gpll0_out_aux and gpll4_out_aux clocks, so it's not
possible to use them as parents. Comment out entries for these clocks.

Note: backporting this patch to earlier kernels would also require a
previous patch which switches the gcc driver to use ARRAY_SIZE for
parent data arrays.

Fixes: 652f1813c113 ("clk: qcom: gcc: Add global clock controller driver for QCS404")
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 drivers/clk/qcom/gcc-qcs404.c | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/drivers/clk/qcom/gcc-qcs404.c b/drivers/clk/qcom/gcc-qcs404.c
index f60a0ab42da1..c48326da1bb3 100644
--- a/drivers/clk/qcom/gcc-qcs404.c
+++ b/drivers/clk/qcom/gcc-qcs404.c
@@ -25,11 +25,11 @@ enum {
 	P_CORE_BI_PLL_TEST_SE,
 	P_DSI0_PHY_PLL_OUT_BYTECLK,
 	P_DSI0_PHY_PLL_OUT_DSICLK,
-	P_GPLL0_OUT_AUX,
+	/* P_GPLL0_OUT_AUX, */
 	P_GPLL0_OUT_MAIN,
 	P_GPLL1_OUT_MAIN,
 	P_GPLL3_OUT_MAIN,
-	P_GPLL4_OUT_AUX,
+	/* P_GPLL4_OUT_AUX, */
 	P_GPLL4_OUT_MAIN,
 	P_GPLL6_OUT_AUX,
 	P_HDMI_PHY_PLL_CLK,
@@ -109,28 +109,28 @@ static const char * const gcc_parent_names_4[] = {
 static const struct parent_map gcc_parent_map_5[] = {
 	{ P_XO, 0 },
 	{ P_DSI0_PHY_PLL_OUT_BYTECLK, 1 },
-	{ P_GPLL0_OUT_AUX, 2 },
+	/* { P_GPLL0_OUT_AUX, 2 }, */
 	{ P_CORE_BI_PLL_TEST_SE, 7 },
 };
 
 static const char * const gcc_parent_names_5[] = {
 	"cxo",
 	"dsi0pll_byteclk_src",
-	"gpll0_out_aux",
+	/* "gpll0_out_aux", */
 	"core_bi_pll_test_se",
 };
 
 static const struct parent_map gcc_parent_map_6[] = {
 	{ P_XO, 0 },
 	{ P_DSI0_PHY_PLL_OUT_BYTECLK, 2 },
-	{ P_GPLL0_OUT_AUX, 3 },
+	/* { P_GPLL0_OUT_AUX, 3 }, */
 	{ P_CORE_BI_PLL_TEST_SE, 7 },
 };
 
 static const char * const gcc_parent_names_6[] = {
 	"cxo",
 	"dsi0_phy_pll_out_byteclk",
-	"gpll0_out_aux",
+	/* "gpll0_out_aux", */
 	"core_bi_pll_test_se",
 };
 
@@ -139,7 +139,7 @@ static const struct parent_map gcc_parent_map_7[] = {
 	{ P_GPLL0_OUT_MAIN, 1 },
 	{ P_GPLL3_OUT_MAIN, 2 },
 	{ P_GPLL6_OUT_AUX, 3 },
-	{ P_GPLL4_OUT_AUX, 4 },
+	/* { P_GPLL4_OUT_AUX, 4 }, */
 	{ P_CORE_BI_PLL_TEST_SE, 7 },
 };
 
@@ -148,7 +148,7 @@ static const char * const gcc_parent_names_7[] = {
 	"gpll0_out_main",
 	"gpll3_out_main",
 	"gpll6_out_aux",
-	"gpll4_out_aux",
+	/* "gpll4_out_aux", */
 	"core_bi_pll_test_se",
 };
 
@@ -207,14 +207,14 @@ static const char * const gcc_parent_names_11[] = {
 static const struct parent_map gcc_parent_map_12[] = {
 	{ P_XO, 0 },
 	{ P_DSI0_PHY_PLL_OUT_DSICLK, 1 },
-	{ P_GPLL0_OUT_AUX, 2 },
+	/* { P_GPLL0_OUT_AUX, 2 }, */
 	{ P_CORE_BI_PLL_TEST_SE, 7 },
 };
 
 static const char * const gcc_parent_names_12[] = {
 	"cxo",
 	"dsi0pll_pclk_src",
-	"gpll0_out_aux",
+	/* "gpll0_out_aux", */
 	"core_bi_pll_test_se",
 };
 
@@ -237,40 +237,40 @@ static const char * const gcc_parent_names_13[] = {
 static const struct parent_map gcc_parent_map_14[] = {
 	{ P_XO, 0 },
 	{ P_GPLL0_OUT_MAIN, 1 },
-	{ P_GPLL4_OUT_AUX, 2 },
+	/* { P_GPLL4_OUT_AUX, 2 }, */
 	{ P_CORE_BI_PLL_TEST_SE, 7 },
 };
 
 static const char * const gcc_parent_names_14[] = {
 	"cxo",
 	"gpll0_out_main",
-	"gpll4_out_aux",
+	/* "gpll4_out_aux", */
 	"core_bi_pll_test_se",
 };
 
 static const struct parent_map gcc_parent_map_15[] = {
 	{ P_XO, 0 },
-	{ P_GPLL0_OUT_AUX, 2 },
+	/* { P_GPLL0_OUT_AUX, 2 }, */
 	{ P_CORE_BI_PLL_TEST_SE, 7 },
 };
 
 static const char * const gcc_parent_names_15[] = {
 	"cxo",
-	"gpll0_out_aux",
+	/* "gpll0_out_aux", */
 	"core_bi_pll_test_se",
 };
 
 static const struct parent_map gcc_parent_map_16[] = {
 	{ P_XO, 0 },
 	{ P_GPLL0_OUT_MAIN, 1 },
-	{ P_GPLL0_OUT_AUX, 2 },
+	/* { P_GPLL0_OUT_AUX, 2 }, */
 	{ P_CORE_BI_PLL_TEST_SE, 7 },
 };
 
 static const char * const gcc_parent_names_16[] = {
 	"cxo",
 	"gpll0_out_main",
-	"gpll0_out_aux",
+	/* "gpll0_out_aux", */
 	"core_bi_pll_test_se",
 };
 
-- 
2.35.1

Re: [PATCH 05/15] clk: qcom: gcc-qcs404: disable gpll[04]_out_aux parents

[Konrad Dybcio]

On 17.12.2022 01:17, Dmitry Baryshkov wrote:
> On the QCS404 platform the driver for the Global Clock Controller
> doens't define gpll0_out_aux and gpll4_out_aux clocks, so it's not
> possible to use them as parents. Comment out entries for these clocks.
> 
> Note: backporting this patch to earlier kernels would also require a
> previous patch which switches the gcc driver to use ARRAY_SIZE for
> parent data arrays.
> 
> Fixes: 652f1813c113 ("clk: qcom: gcc: Add global clock controller driver for QCS404")
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
Perhaps one could just remove them then?

Konrad
>  drivers/clk/qcom/gcc-qcs404.c | 32 ++++++++++++++++----------------
>  1 file changed, 16 insertions(+), 16 deletions(-)
> 
> diff --git a/drivers/clk/qcom/gcc-qcs404.c b/drivers/clk/qcom/gcc-qcs404.c
> index f60a0ab42da1..c48326da1bb3 100644
> --- a/drivers/clk/qcom/gcc-qcs404.c
> +++ b/drivers/clk/qcom/gcc-qcs404.c
> @@ -25,11 +25,11 @@ enum {
>  	P_CORE_BI_PLL_TEST_SE,
>  	P_DSI0_PHY_PLL_OUT_BYTECLK,
>  	P_DSI0_PHY_PLL_OUT_DSICLK,
> -	P_GPLL0_OUT_AUX,
> +	/* P_GPLL0_OUT_AUX, */
>  	P_GPLL0_OUT_MAIN,
>  	P_GPLL1_OUT_MAIN,
>  	P_GPLL3_OUT_MAIN,
> -	P_GPLL4_OUT_AUX,
> +	/* P_GPLL4_OUT_AUX, */
>  	P_GPLL4_OUT_MAIN,
>  	P_GPLL6_OUT_AUX,
>  	P_HDMI_PHY_PLL_CLK,
> @@ -109,28 +109,28 @@ static const char * const gcc_parent_names_4[] = {
>  static const struct parent_map gcc_parent_map_5[] = {
>  	{ P_XO, 0 },
>  	{ P_DSI0_PHY_PLL_OUT_BYTECLK, 1 },
> -	{ P_GPLL0_OUT_AUX, 2 },
> +	/* { P_GPLL0_OUT_AUX, 2 }, */
>  	{ P_CORE_BI_PLL_TEST_SE, 7 },
>  };
>  
>  static const char * const gcc_parent_names_5[] = {
>  	"cxo",
>  	"dsi0pll_byteclk_src",
> -	"gpll0_out_aux",
> +	/* "gpll0_out_aux", */
>  	"core_bi_pll_test_se",
>  };
>  
>  static const struct parent_map gcc_parent_map_6[] = {
>  	{ P_XO, 0 },
>  	{ P_DSI0_PHY_PLL_OUT_BYTECLK, 2 },
> -	{ P_GPLL0_OUT_AUX, 3 },
> +	/* { P_GPLL0_OUT_AUX, 3 }, */
>  	{ P_CORE_BI_PLL_TEST_SE, 7 },
>  };
>  
>  static const char * const gcc_parent_names_6[] = {
>  	"cxo",
>  	"dsi0_phy_pll_out_byteclk",
> -	"gpll0_out_aux",
> +	/* "gpll0_out_aux", */
>  	"core_bi_pll_test_se",
>  };
>  
> @@ -139,7 +139,7 @@ static const struct parent_map gcc_parent_map_7[] = {
>  	{ P_GPLL0_OUT_MAIN, 1 },
>  	{ P_GPLL3_OUT_MAIN, 2 },
>  	{ P_GPLL6_OUT_AUX, 3 },
> -	{ P_GPLL4_OUT_AUX, 4 },
> +	/* { P_GPLL4_OUT_AUX, 4 }, */
>  	{ P_CORE_BI_PLL_TEST_SE, 7 },
>  };
>  
> @@ -148,7 +148,7 @@ static const char * const gcc_parent_names_7[] = {
>  	"gpll0_out_main",
>  	"gpll3_out_main",
>  	"gpll6_out_aux",
> -	"gpll4_out_aux",
> +	/* "gpll4_out_aux", */
>  	"core_bi_pll_test_se",
>  };
>  
> @@ -207,14 +207,14 @@ static const char * const gcc_parent_names_11[] = {
>  static const struct parent_map gcc_parent_map_12[] = {
>  	{ P_XO, 0 },
>  	{ P_DSI0_PHY_PLL_OUT_DSICLK, 1 },
> -	{ P_GPLL0_OUT_AUX, 2 },
> +	/* { P_GPLL0_OUT_AUX, 2 }, */
>  	{ P_CORE_BI_PLL_TEST_SE, 7 },
>  };
>  
>  static const char * const gcc_parent_names_12[] = {
>  	"cxo",
>  	"dsi0pll_pclk_src",
> -	"gpll0_out_aux",
> +	/* "gpll0_out_aux", */
>  	"core_bi_pll_test_se",
>  };
>  
> @@ -237,40 +237,40 @@ static const char * const gcc_parent_names_13[] = {
>  static const struct parent_map gcc_parent_map_14[] = {
>  	{ P_XO, 0 },
>  	{ P_GPLL0_OUT_MAIN, 1 },
> -	{ P_GPLL4_OUT_AUX, 2 },
> +	/* { P_GPLL4_OUT_AUX, 2 }, */
>  	{ P_CORE_BI_PLL_TEST_SE, 7 },
>  };
>  
>  static const char * const gcc_parent_names_14[] = {
>  	"cxo",
>  	"gpll0_out_main",
> -	"gpll4_out_aux",
> +	/* "gpll4_out_aux", */
>  	"core_bi_pll_test_se",
>  };
>  
>  static const struct parent_map gcc_parent_map_15[] = {
>  	{ P_XO, 0 },
> -	{ P_GPLL0_OUT_AUX, 2 },
> +	/* { P_GPLL0_OUT_AUX, 2 }, */
>  	{ P_CORE_BI_PLL_TEST_SE, 7 },
>  };
>  
>  static const char * const gcc_parent_names_15[] = {
>  	"cxo",
> -	"gpll0_out_aux",
> +	/* "gpll0_out_aux", */
>  	"core_bi_pll_test_se",
>  };
>  
>  static const struct parent_map gcc_parent_map_16[] = {
>  	{ P_XO, 0 },
>  	{ P_GPLL0_OUT_MAIN, 1 },
> -	{ P_GPLL0_OUT_AUX, 2 },
> +	/* { P_GPLL0_OUT_AUX, 2 }, */
>  	{ P_CORE_BI_PLL_TEST_SE, 7 },
>  };
>  
>  static const char * const gcc_parent_names_16[] = {
>  	"cxo",
>  	"gpll0_out_main",
> -	"gpll0_out_aux",
> +	/* "gpll0_out_aux", */
>  	"core_bi_pll_test_se",
>  };
>  

Re: [PATCH 05/15] clk: qcom: gcc-qcs404: disable gpll[04]_out_aux parents

[Dmitry Baryshkov]

17 декабря 2022 г. 17:08:24 GMT+02:00, Konrad Dybcio <konrad.dybcio@linaro.org> пишет:
>
>
>On 17.12.2022 01:17, Dmitry Baryshkov wrote:
>> On the QCS404 platform the driver for the Global Clock Controller
>> doens't define gpll0_out_aux and gpll4_out_aux clocks, so it's not
>> possible to use them as parents. Comment out entries for these clocks.
>> 
>> Note: backporting this patch to earlier kernels would also require a
>> previous patch which switches the gcc driver to use ARRAY_SIZE for
>> parent data arrays.
>> 
>> Fixes: 652f1813c113 ("clk: qcom: gcc: Add global clock controller driver for QCS404")
>> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
>> ---
>Perhaps one could just remove them then?

I was not sure, so I preferred to keep them in place in case someone has to use them again (after defining corresponding clock, of course).


>
>Konrad
>>  drivers/clk/qcom/gcc-qcs404.c | 32 ++++++++++++++++----------------
>>  1 file changed, 16 insertions(+), 16 deletions(-)
>> 
>> diff --git a/drivers/clk/qcom/gcc-qcs404.c b/drivers/clk/qcom/gcc-qcs404.c
>> index f60a0ab42da1..c48326da1bb3 100644
>> --- a/drivers/clk/qcom/gcc-qcs404.c
>> +++ b/drivers/clk/qcom/gcc-qcs404.c
>> @@ -25,11 +25,11 @@ enum {
>>  	P_CORE_BI_PLL_TEST_SE,
>>  	P_DSI0_PHY_PLL_OUT_BYTECLK,
>>  	P_DSI0_PHY_PLL_OUT_DSICLK,
>> -	P_GPLL0_OUT_AUX,
>> +	/* P_GPLL0_OUT_AUX, */
>>  	P_GPLL0_OUT_MAIN,
>>  	P_GPLL1_OUT_MAIN,
>>  	P_GPLL3_OUT_MAIN,
>> -	P_GPLL4_OUT_AUX,
>> +	/* P_GPLL4_OUT_AUX, */
>>  	P_GPLL4_OUT_MAIN,
>>  	P_GPLL6_OUT_AUX,
>>  	P_HDMI_PHY_PLL_CLK,
>> @@ -109,28 +109,28 @@ static const char * const gcc_parent_names_4[] = {
>>  static const struct parent_map gcc_parent_map_5[] = {
>>  	{ P_XO, 0 },
>>  	{ P_DSI0_PHY_PLL_OUT_BYTECLK, 1 },
>> -	{ P_GPLL0_OUT_AUX, 2 },
>> +	/* { P_GPLL0_OUT_AUX, 2 }, */
>>  	{ P_CORE_BI_PLL_TEST_SE, 7 },
>>  };
>>  
>>  static const char * const gcc_parent_names_5[] = {
>>  	"cxo",
>>  	"dsi0pll_byteclk_src",
>> -	"gpll0_out_aux",
>> +	/* "gpll0_out_aux", */
>>  	"core_bi_pll_test_se",
>>  };
>>  
>>  static const struct parent_map gcc_parent_map_6[] = {
>>  	{ P_XO, 0 },
>>  	{ P_DSI0_PHY_PLL_OUT_BYTECLK, 2 },
>> -	{ P_GPLL0_OUT_AUX, 3 },
>> +	/* { P_GPLL0_OUT_AUX, 3 }, */
>>  	{ P_CORE_BI_PLL_TEST_SE, 7 },
>>  };
>>  
>>  static const char * const gcc_parent_names_6[] = {
>>  	"cxo",
>>  	"dsi0_phy_pll_out_byteclk",
>> -	"gpll0_out_aux",
>> +	/* "gpll0_out_aux", */
>>  	"core_bi_pll_test_se",
>>  };
>>  
>> @@ -139,7 +139,7 @@ static const struct parent_map gcc_parent_map_7[] = {
>>  	{ P_GPLL0_OUT_MAIN, 1 },
>>  	{ P_GPLL3_OUT_MAIN, 2 },
>>  	{ P_GPLL6_OUT_AUX, 3 },
>> -	{ P_GPLL4_OUT_AUX, 4 },
>> +	/* { P_GPLL4_OUT_AUX, 4 }, */
>>  	{ P_CORE_BI_PLL_TEST_SE, 7 },
>>  };
>>  
>> @@ -148,7 +148,7 @@ static const char * const gcc_parent_names_7[] = {
>>  	"gpll0_out_main",
>>  	"gpll3_out_main",
>>  	"gpll6_out_aux",
>> -	"gpll4_out_aux",
>> +	/* "gpll4_out_aux", */
>>  	"core_bi_pll_test_se",
>>  };
>>  
>> @@ -207,14 +207,14 @@ static const char * const gcc_parent_names_11[] = {
>>  static const struct parent_map gcc_parent_map_12[] = {
>>  	{ P_XO, 0 },
>>  	{ P_DSI0_PHY_PLL_OUT_DSICLK, 1 },
>> -	{ P_GPLL0_OUT_AUX, 2 },
>> +	/* { P_GPLL0_OUT_AUX, 2 }, */
>>  	{ P_CORE_BI_PLL_TEST_SE, 7 },
>>  };
>>  
>>  static const char * const gcc_parent_names_12[] = {
>>  	"cxo",
>>  	"dsi0pll_pclk_src",
>> -	"gpll0_out_aux",
>> +	/* "gpll0_out_aux", */
>>  	"core_bi_pll_test_se",
>>  };
>>  
>> @@ -237,40 +237,40 @@ static const char * const gcc_parent_names_13[] = {
>>  static const struct parent_map gcc_parent_map_14[] = {
>>  	{ P_XO, 0 },
>>  	{ P_GPLL0_OUT_MAIN, 1 },
>> -	{ P_GPLL4_OUT_AUX, 2 },
>> +	/* { P_GPLL4_OUT_AUX, 2 }, */
>>  	{ P_CORE_BI_PLL_TEST_SE, 7 },
>>  };
>>  
>>  static const char * const gcc_parent_names_14[] = {
>>  	"cxo",
>>  	"gpll0_out_main",
>> -	"gpll4_out_aux",
>> +	/* "gpll4_out_aux", */
>>  	"core_bi_pll_test_se",
>>  };
>>  
>>  static const struct parent_map gcc_parent_map_15[] = {
>>  	{ P_XO, 0 },
>> -	{ P_GPLL0_OUT_AUX, 2 },
>> +	/* { P_GPLL0_OUT_AUX, 2 }, */
>>  	{ P_CORE_BI_PLL_TEST_SE, 7 },
>>  };
>>  
>>  static const char * const gcc_parent_names_15[] = {
>>  	"cxo",
>> -	"gpll0_out_aux",
>> +	/* "gpll0_out_aux", */
>>  	"core_bi_pll_test_se",
>>  };
>>  
>>  static const struct parent_map gcc_parent_map_16[] = {
>>  	{ P_XO, 0 },
>>  	{ P_GPLL0_OUT_MAIN, 1 },
>> -	{ P_GPLL0_OUT_AUX, 2 },
>> +	/* { P_GPLL0_OUT_AUX, 2 }, */
>>  	{ P_CORE_BI_PLL_TEST_SE, 7 },
>>  };
>>  
>>  static const char * const gcc_parent_names_16[] = {
>>  	"cxo",
>>  	"gpll0_out_main",
>> -	"gpll0_out_aux",
>> +	/* "gpll0_out_aux", */
>>  	"core_bi_pll_test_se",
>>  };
>>  

[PATCH 06/15] clk: qcom: gcc-qcs404: fix names of the DSI clocks used as parents

[Dmitry Baryshkov]

The QCS404 uses 28nm LPM DSI PHY, which registers dsi0pll and
dsi0pllbyte clocks. Fix all DSI PHY clock names used as parents inside
the GCC driver.

Fixes: 652f1813c113 ("clk: qcom: gcc: Add global clock controller driver for QCS404")
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 drivers/clk/qcom/gcc-qcs404.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/clk/qcom/gcc-qcs404.c b/drivers/clk/qcom/gcc-qcs404.c
index c48326da1bb3..23562096298d 100644
--- a/drivers/clk/qcom/gcc-qcs404.c
+++ b/drivers/clk/qcom/gcc-qcs404.c
@@ -115,7 +115,7 @@ static const struct parent_map gcc_parent_map_5[] = {
 
 static const char * const gcc_parent_names_5[] = {
 	"cxo",
-	"dsi0pll_byteclk_src",
+	"dsi0pllbyte",
 	/* "gpll0_out_aux", */
 	"core_bi_pll_test_se",
 };
@@ -129,7 +129,7 @@ static const struct parent_map gcc_parent_map_6[] = {
 
 static const char * const gcc_parent_names_6[] = {
 	"cxo",
-	"dsi0_phy_pll_out_byteclk",
+	"dsi0pllbyte",
 	/* "gpll0_out_aux", */
 	"core_bi_pll_test_se",
 };
@@ -175,7 +175,7 @@ static const struct parent_map gcc_parent_map_9[] = {
 static const char * const gcc_parent_names_9[] = {
 	"cxo",
 	"gpll0_out_main",
-	"dsi0_phy_pll_out_dsiclk",
+	"dsi0pll",
 	"gpll6_out_aux",
 	"core_bi_pll_test_se",
 };
@@ -213,7 +213,7 @@ static const struct parent_map gcc_parent_map_12[] = {
 
 static const char * const gcc_parent_names_12[] = {
 	"cxo",
-	"dsi0pll_pclk_src",
+	"dsi0pll",
 	/* "gpll0_out_aux", */
 	"core_bi_pll_test_se",
 };
-- 
2.35.1

Re: [PATCH 06/15] clk: qcom: gcc-qcs404: fix names of the DSI clocks used as parents

[Konrad Dybcio]

On 17.12.2022 01:17, Dmitry Baryshkov wrote:
> The QCS404 uses 28nm LPM DSI PHY, which registers dsi0pll and
> dsi0pllbyte clocks. Fix all DSI PHY clock names used as parents inside
> the GCC driver.
> 
> Fixes: 652f1813c113 ("clk: qcom: gcc: Add global clock controller driver for QCS404")
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>

Konrad
>  drivers/clk/qcom/gcc-qcs404.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/clk/qcom/gcc-qcs404.c b/drivers/clk/qcom/gcc-qcs404.c
> index c48326da1bb3..23562096298d 100644
> --- a/drivers/clk/qcom/gcc-qcs404.c
> +++ b/drivers/clk/qcom/gcc-qcs404.c
> @@ -115,7 +115,7 @@ static const struct parent_map gcc_parent_map_5[] = {
>  
>  static const char * const gcc_parent_names_5[] = {
>  	"cxo",
> -	"dsi0pll_byteclk_src",
> +	"dsi0pllbyte",
>  	/* "gpll0_out_aux", */
>  	"core_bi_pll_test_se",
>  };
> @@ -129,7 +129,7 @@ static const struct parent_map gcc_parent_map_6[] = {
>  
>  static const char * const gcc_parent_names_6[] = {
>  	"cxo",
> -	"dsi0_phy_pll_out_byteclk",
> +	"dsi0pllbyte",
>  	/* "gpll0_out_aux", */
>  	"core_bi_pll_test_se",
>  };
> @@ -175,7 +175,7 @@ static const struct parent_map gcc_parent_map_9[] = {
>  static const char * const gcc_parent_names_9[] = {
>  	"cxo",
>  	"gpll0_out_main",
> -	"dsi0_phy_pll_out_dsiclk",
> +	"dsi0pll",
>  	"gpll6_out_aux",
>  	"core_bi_pll_test_se",
>  };
> @@ -213,7 +213,7 @@ static const struct parent_map gcc_parent_map_12[] = {
>  
>  static const char * const gcc_parent_names_12[] = {
>  	"cxo",
> -	"dsi0pll_pclk_src",
> +	"dsi0pll",
>  	/* "gpll0_out_aux", */
>  	"core_bi_pll_test_se",
>  };

[PATCH 07/15] clk: qcom: gcc-qcs404: fix the name of the HDMI PLL clock

[Dmitry Baryshkov]

The QCS404 uses 28nm HDMI PHY. The in-kernel driver doesn't provide the
PLL (yet), but the out of tree patches used the name "hdmi_pll" for it.
Other Qualcomm HDMI PHYs use either the name "hdmi_pll" (8960) or
"hdmipll" (8996). Thus change the expected HDMI PLL clock name to
"hdmi_pll".

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 drivers/clk/qcom/gcc-qcs404.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/clk/qcom/gcc-qcs404.c b/drivers/clk/qcom/gcc-qcs404.c
index 23562096298d..5636c6524d0f 100644
--- a/drivers/clk/qcom/gcc-qcs404.c
+++ b/drivers/clk/qcom/gcc-qcs404.c
@@ -160,7 +160,7 @@ static const struct parent_map gcc_parent_map_8[] = {
 
 static const char * const gcc_parent_names_8[] = {
 	"cxo",
-	"hdmi_phy_pll_clk",
+	"hdmi_pll",
 	"core_bi_pll_test_se",
 };
 
-- 
2.35.1

Re: [PATCH 07/15] clk: qcom: gcc-qcs404: fix the name of the HDMI PLL clock

[Konrad Dybcio]

On 17.12.2022 01:17, Dmitry Baryshkov wrote:
> The QCS404 uses 28nm HDMI PHY. The in-kernel driver doesn't provide the
> PLL (yet), but the out of tree patches used the name "hdmi_pll" for it.
> Other Qualcomm HDMI PHYs use either the name "hdmi_pll" (8960) or
> "hdmipll" (8996). Thus change the expected HDMI PLL clock name to
> "hdmi_pll".
> 
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>

Konrad
>  drivers/clk/qcom/gcc-qcs404.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/clk/qcom/gcc-qcs404.c b/drivers/clk/qcom/gcc-qcs404.c
> index 23562096298d..5636c6524d0f 100644
> --- a/drivers/clk/qcom/gcc-qcs404.c
> +++ b/drivers/clk/qcom/gcc-qcs404.c
> @@ -160,7 +160,7 @@ static const struct parent_map gcc_parent_map_8[] = {
>  
>  static const char * const gcc_parent_names_8[] = {
>  	"cxo",
> -	"hdmi_phy_pll_clk",
> +	"hdmi_pll",
>  	"core_bi_pll_test_se",
>  };
>  

[PATCH 08/15] clk: qcom: gcc-qcs404: get rid of the test clock

[Dmitry Baryshkov]

The test clock isn't in the bindings and apparently it's not used by
anyone upstream.  Remove it.

Suggested-by: Stephen Boyd <swboyd@chromium.org>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 drivers/clk/qcom/gcc-qcs404.c | 34 ----------------------------------
 1 file changed, 34 deletions(-)

diff --git a/drivers/clk/qcom/gcc-qcs404.c b/drivers/clk/qcom/gcc-qcs404.c
index 5636c6524d0f..fb94c57a00af 100644
--- a/drivers/clk/qcom/gcc-qcs404.c
+++ b/drivers/clk/qcom/gcc-qcs404.c
@@ -22,7 +22,6 @@
 #include "reset.h"
 
 enum {
-	P_CORE_BI_PLL_TEST_SE,
 	P_DSI0_PHY_PLL_OUT_BYTECLK,
 	P_DSI0_PHY_PLL_OUT_DSICLK,
 	/* P_GPLL0_OUT_AUX, */
@@ -41,29 +40,24 @@ enum {
 static const struct parent_map gcc_parent_map_0[] = {
 	{ P_XO, 0 },
 	{ P_GPLL0_OUT_MAIN, 1 },
-	{ P_CORE_BI_PLL_TEST_SE, 7 },
 };
 
 static const char * const gcc_parent_names_0[] = {
 	"cxo",
 	"gpll0_out_main",
-	"core_bi_pll_test_se",
 };
 
 static const char * const gcc_parent_names_ao_0[] = {
 	"cxo",
 	"gpll0_ao_out_main",
-	"core_bi_pll_test_se",
 };
 
 static const struct parent_map gcc_parent_map_1[] = {
 	{ P_XO, 0 },
-	{ P_CORE_BI_PLL_TEST_SE, 7 },
 };
 
 static const char * const gcc_parent_names_1[] = {
 	"cxo",
-	"core_bi_pll_test_se",
 };
 
 static const struct parent_map gcc_parent_map_2[] = {
@@ -84,54 +78,46 @@ static const struct parent_map gcc_parent_map_3[] = {
 	{ P_XO, 0 },
 	{ P_GPLL0_OUT_MAIN, 1 },
 	{ P_GPLL6_OUT_AUX, 2 },
-	{ P_CORE_BI_PLL_TEST_SE, 7 },
 };
 
 static const char * const gcc_parent_names_3[] = {
 	"cxo",
 	"gpll0_out_main",
 	"gpll6_out_aux",
-	"core_bi_pll_test_se",
 };
 
 static const struct parent_map gcc_parent_map_4[] = {
 	{ P_XO, 0 },
 	{ P_GPLL1_OUT_MAIN, 1 },
-	{ P_CORE_BI_PLL_TEST_SE, 7 },
 };
 
 static const char * const gcc_parent_names_4[] = {
 	"cxo",
 	"gpll1_out_main",
-	"core_bi_pll_test_se",
 };
 
 static const struct parent_map gcc_parent_map_5[] = {
 	{ P_XO, 0 },
 	{ P_DSI0_PHY_PLL_OUT_BYTECLK, 1 },
 	/* { P_GPLL0_OUT_AUX, 2 }, */
-	{ P_CORE_BI_PLL_TEST_SE, 7 },
 };
 
 static const char * const gcc_parent_names_5[] = {
 	"cxo",
 	"dsi0pllbyte",
 	/* "gpll0_out_aux", */
-	"core_bi_pll_test_se",
 };
 
 static const struct parent_map gcc_parent_map_6[] = {
 	{ P_XO, 0 },
 	{ P_DSI0_PHY_PLL_OUT_BYTECLK, 2 },
 	/* { P_GPLL0_OUT_AUX, 3 }, */
-	{ P_CORE_BI_PLL_TEST_SE, 7 },
 };
 
 static const char * const gcc_parent_names_6[] = {
 	"cxo",
 	"dsi0pllbyte",
 	/* "gpll0_out_aux", */
-	"core_bi_pll_test_se",
 };
 
 static const struct parent_map gcc_parent_map_7[] = {
@@ -140,7 +126,6 @@ static const struct parent_map gcc_parent_map_7[] = {
 	{ P_GPLL3_OUT_MAIN, 2 },
 	{ P_GPLL6_OUT_AUX, 3 },
 	/* { P_GPLL4_OUT_AUX, 4 }, */
-	{ P_CORE_BI_PLL_TEST_SE, 7 },
 };
 
 static const char * const gcc_parent_names_7[] = {
@@ -149,19 +134,16 @@ static const char * const gcc_parent_names_7[] = {
 	"gpll3_out_main",
 	"gpll6_out_aux",
 	/* "gpll4_out_aux", */
-	"core_bi_pll_test_se",
 };
 
 static const struct parent_map gcc_parent_map_8[] = {
 	{ P_XO, 0 },
 	{ P_HDMI_PHY_PLL_CLK, 1 },
-	{ P_CORE_BI_PLL_TEST_SE, 7 },
 };
 
 static const char * const gcc_parent_names_8[] = {
 	"cxo",
 	"hdmi_pll",
-	"core_bi_pll_test_se",
 };
 
 static const struct parent_map gcc_parent_map_9[] = {
@@ -169,7 +151,6 @@ static const struct parent_map gcc_parent_map_9[] = {
 	{ P_GPLL0_OUT_MAIN, 1 },
 	{ P_DSI0_PHY_PLL_OUT_DSICLK, 2 },
 	{ P_GPLL6_OUT_AUX, 3 },
-	{ P_CORE_BI_PLL_TEST_SE, 7 },
 };
 
 static const char * const gcc_parent_names_9[] = {
@@ -177,45 +158,38 @@ static const char * const gcc_parent_names_9[] = {
 	"gpll0_out_main",
 	"dsi0pll",
 	"gpll6_out_aux",
-	"core_bi_pll_test_se",
 };
 
 static const struct parent_map gcc_parent_map_10[] = {
 	{ P_XO, 0 },
 	{ P_SLEEP_CLK, 1 },
-	{ P_CORE_BI_PLL_TEST_SE, 7 },
 };
 
 static const char * const gcc_parent_names_10[] = {
 	"cxo",
 	"sleep_clk",
-	"core_bi_pll_test_se",
 };
 
 static const struct parent_map gcc_parent_map_11[] = {
 	{ P_XO, 0 },
 	{ P_PCIE_0_PIPE_CLK, 1 },
-	{ P_CORE_BI_PLL_TEST_SE, 7 },
 };
 
 static const char * const gcc_parent_names_11[] = {
 	"cxo",
 	"pcie_0_pipe_clk",
-	"core_bi_pll_test_se",
 };
 
 static const struct parent_map gcc_parent_map_12[] = {
 	{ P_XO, 0 },
 	{ P_DSI0_PHY_PLL_OUT_DSICLK, 1 },
 	/* { P_GPLL0_OUT_AUX, 2 }, */
-	{ P_CORE_BI_PLL_TEST_SE, 7 },
 };
 
 static const char * const gcc_parent_names_12[] = {
 	"cxo",
 	"dsi0pll",
 	/* "gpll0_out_aux", */
-	"core_bi_pll_test_se",
 };
 
 static const struct parent_map gcc_parent_map_13[] = {
@@ -223,7 +197,6 @@ static const struct parent_map gcc_parent_map_13[] = {
 	{ P_GPLL0_OUT_MAIN, 1 },
 	{ P_GPLL4_OUT_MAIN, 2 },
 	{ P_GPLL6_OUT_AUX, 3 },
-	{ P_CORE_BI_PLL_TEST_SE, 7 },
 };
 
 static const char * const gcc_parent_names_13[] = {
@@ -231,47 +204,40 @@ static const char * const gcc_parent_names_13[] = {
 	"gpll0_out_main",
 	"gpll4_out_main",
 	"gpll6_out_aux",
-	"core_bi_pll_test_se",
 };
 
 static const struct parent_map gcc_parent_map_14[] = {
 	{ P_XO, 0 },
 	{ P_GPLL0_OUT_MAIN, 1 },
 	/* { P_GPLL4_OUT_AUX, 2 }, */
-	{ P_CORE_BI_PLL_TEST_SE, 7 },
 };
 
 static const char * const gcc_parent_names_14[] = {
 	"cxo",
 	"gpll0_out_main",
 	/* "gpll4_out_aux", */
-	"core_bi_pll_test_se",
 };
 
 static const struct parent_map gcc_parent_map_15[] = {
 	{ P_XO, 0 },
 	/* { P_GPLL0_OUT_AUX, 2 }, */
-	{ P_CORE_BI_PLL_TEST_SE, 7 },
 };
 
 static const char * const gcc_parent_names_15[] = {
 	"cxo",
 	/* "gpll0_out_aux", */
-	"core_bi_pll_test_se",
 };
 
 static const struct parent_map gcc_parent_map_16[] = {
 	{ P_XO, 0 },
 	{ P_GPLL0_OUT_MAIN, 1 },
 	/* { P_GPLL0_OUT_AUX, 2 }, */
-	{ P_CORE_BI_PLL_TEST_SE, 7 },
 };
 
 static const char * const gcc_parent_names_16[] = {
 	"cxo",
 	"gpll0_out_main",
 	/* "gpll0_out_aux", */
-	"core_bi_pll_test_se",
 };
 
 static struct clk_fixed_factor cxo = {
-- 
2.35.1

Re: [PATCH 08/15] clk: qcom: gcc-qcs404: get rid of the test clock

[Konrad Dybcio]

On 17.12.2022 01:17, Dmitry Baryshkov wrote:
> The test clock isn't in the bindings and apparently it's not used by
> anyone upstream.  Remove it.
> 
> Suggested-by: Stephen Boyd <swboyd@chromium.org>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>

Konrad
>  drivers/clk/qcom/gcc-qcs404.c | 34 ----------------------------------
>  1 file changed, 34 deletions(-)
> 
> diff --git a/drivers/clk/qcom/gcc-qcs404.c b/drivers/clk/qcom/gcc-qcs404.c
> index 5636c6524d0f..fb94c57a00af 100644
> --- a/drivers/clk/qcom/gcc-qcs404.c
> +++ b/drivers/clk/qcom/gcc-qcs404.c
> @@ -22,7 +22,6 @@
>  #include "reset.h"
>  
>  enum {
> -	P_CORE_BI_PLL_TEST_SE,
>  	P_DSI0_PHY_PLL_OUT_BYTECLK,
>  	P_DSI0_PHY_PLL_OUT_DSICLK,
>  	/* P_GPLL0_OUT_AUX, */
> @@ -41,29 +40,24 @@ enum {
>  static const struct parent_map gcc_parent_map_0[] = {
>  	{ P_XO, 0 },
>  	{ P_GPLL0_OUT_MAIN, 1 },
> -	{ P_CORE_BI_PLL_TEST_SE, 7 },
>  };
>  
>  static const char * const gcc_parent_names_0[] = {
>  	"cxo",
>  	"gpll0_out_main",
> -	"core_bi_pll_test_se",
>  };
>  
>  static const char * const gcc_parent_names_ao_0[] = {
>  	"cxo",
>  	"gpll0_ao_out_main",
> -	"core_bi_pll_test_se",
>  };
>  
>  static const struct parent_map gcc_parent_map_1[] = {
>  	{ P_XO, 0 },
> -	{ P_CORE_BI_PLL_TEST_SE, 7 },
>  };
>  
>  static const char * const gcc_parent_names_1[] = {
>  	"cxo",
> -	"core_bi_pll_test_se",
>  };
>  
>  static const struct parent_map gcc_parent_map_2[] = {
> @@ -84,54 +78,46 @@ static const struct parent_map gcc_parent_map_3[] = {
>  	{ P_XO, 0 },
>  	{ P_GPLL0_OUT_MAIN, 1 },
>  	{ P_GPLL6_OUT_AUX, 2 },
> -	{ P_CORE_BI_PLL_TEST_SE, 7 },
>  };
>  
>  static const char * const gcc_parent_names_3[] = {
>  	"cxo",
>  	"gpll0_out_main",
>  	"gpll6_out_aux",
> -	"core_bi_pll_test_se",
>  };
>  
>  static const struct parent_map gcc_parent_map_4[] = {
>  	{ P_XO, 0 },
>  	{ P_GPLL1_OUT_MAIN, 1 },
> -	{ P_CORE_BI_PLL_TEST_SE, 7 },
>  };
>  
>  static const char * const gcc_parent_names_4[] = {
>  	"cxo",
>  	"gpll1_out_main",
> -	"core_bi_pll_test_se",
>  };
>  
>  static const struct parent_map gcc_parent_map_5[] = {
>  	{ P_XO, 0 },
>  	{ P_DSI0_PHY_PLL_OUT_BYTECLK, 1 },
>  	/* { P_GPLL0_OUT_AUX, 2 }, */
> -	{ P_CORE_BI_PLL_TEST_SE, 7 },
>  };
>  
>  static const char * const gcc_parent_names_5[] = {
>  	"cxo",
>  	"dsi0pllbyte",
>  	/* "gpll0_out_aux", */
> -	"core_bi_pll_test_se",
>  };
>  
>  static const struct parent_map gcc_parent_map_6[] = {
>  	{ P_XO, 0 },
>  	{ P_DSI0_PHY_PLL_OUT_BYTECLK, 2 },
>  	/* { P_GPLL0_OUT_AUX, 3 }, */
> -	{ P_CORE_BI_PLL_TEST_SE, 7 },
>  };
>  
>  static const char * const gcc_parent_names_6[] = {
>  	"cxo",
>  	"dsi0pllbyte",
>  	/* "gpll0_out_aux", */
> -	"core_bi_pll_test_se",
>  };
>  
>  static const struct parent_map gcc_parent_map_7[] = {
> @@ -140,7 +126,6 @@ static const struct parent_map gcc_parent_map_7[] = {
>  	{ P_GPLL3_OUT_MAIN, 2 },
>  	{ P_GPLL6_OUT_AUX, 3 },
>  	/* { P_GPLL4_OUT_AUX, 4 }, */
> -	{ P_CORE_BI_PLL_TEST_SE, 7 },
>  };
>  
>  static const char * const gcc_parent_names_7[] = {
> @@ -149,19 +134,16 @@ static const char * const gcc_parent_names_7[] = {
>  	"gpll3_out_main",
>  	"gpll6_out_aux",
>  	/* "gpll4_out_aux", */
> -	"core_bi_pll_test_se",
>  };
>  
>  static const struct parent_map gcc_parent_map_8[] = {
>  	{ P_XO, 0 },
>  	{ P_HDMI_PHY_PLL_CLK, 1 },
> -	{ P_CORE_BI_PLL_TEST_SE, 7 },
>  };
>  
>  static const char * const gcc_parent_names_8[] = {
>  	"cxo",
>  	"hdmi_pll",
> -	"core_bi_pll_test_se",
>  };
>  
>  static const struct parent_map gcc_parent_map_9[] = {
> @@ -169,7 +151,6 @@ static const struct parent_map gcc_parent_map_9[] = {
>  	{ P_GPLL0_OUT_MAIN, 1 },
>  	{ P_DSI0_PHY_PLL_OUT_DSICLK, 2 },
>  	{ P_GPLL6_OUT_AUX, 3 },
> -	{ P_CORE_BI_PLL_TEST_SE, 7 },
>  };
>  
>  static const char * const gcc_parent_names_9[] = {
> @@ -177,45 +158,38 @@ static const char * const gcc_parent_names_9[] = {
>  	"gpll0_out_main",
>  	"dsi0pll",
>  	"gpll6_out_aux",
> -	"core_bi_pll_test_se",
>  };
>  
>  static const struct parent_map gcc_parent_map_10[] = {
>  	{ P_XO, 0 },
>  	{ P_SLEEP_CLK, 1 },
> -	{ P_CORE_BI_PLL_TEST_SE, 7 },
>  };
>  
>  static const char * const gcc_parent_names_10[] = {
>  	"cxo",
>  	"sleep_clk",
> -	"core_bi_pll_test_se",
>  };
>  
>  static const struct parent_map gcc_parent_map_11[] = {
>  	{ P_XO, 0 },
>  	{ P_PCIE_0_PIPE_CLK, 1 },
> -	{ P_CORE_BI_PLL_TEST_SE, 7 },
>  };
>  
>  static const char * const gcc_parent_names_11[] = {
>  	"cxo",
>  	"pcie_0_pipe_clk",
> -	"core_bi_pll_test_se",
>  };
>  
>  static const struct parent_map gcc_parent_map_12[] = {
>  	{ P_XO, 0 },
>  	{ P_DSI0_PHY_PLL_OUT_DSICLK, 1 },
>  	/* { P_GPLL0_OUT_AUX, 2 }, */
> -	{ P_CORE_BI_PLL_TEST_SE, 7 },
>  };
>  
>  static const char * const gcc_parent_names_12[] = {
>  	"cxo",
>  	"dsi0pll",
>  	/* "gpll0_out_aux", */
> -	"core_bi_pll_test_se",
>  };
>  
>  static const struct parent_map gcc_parent_map_13[] = {
> @@ -223,7 +197,6 @@ static const struct parent_map gcc_parent_map_13[] = {
>  	{ P_GPLL0_OUT_MAIN, 1 },
>  	{ P_GPLL4_OUT_MAIN, 2 },
>  	{ P_GPLL6_OUT_AUX, 3 },
> -	{ P_CORE_BI_PLL_TEST_SE, 7 },
>  };
>  
>  static const char * const gcc_parent_names_13[] = {
> @@ -231,47 +204,40 @@ static const char * const gcc_parent_names_13[] = {
>  	"gpll0_out_main",
>  	"gpll4_out_main",
>  	"gpll6_out_aux",
> -	"core_bi_pll_test_se",
>  };
>  
>  static const struct parent_map gcc_parent_map_14[] = {
>  	{ P_XO, 0 },
>  	{ P_GPLL0_OUT_MAIN, 1 },
>  	/* { P_GPLL4_OUT_AUX, 2 }, */
> -	{ P_CORE_BI_PLL_TEST_SE, 7 },
>  };
>  
>  static const char * const gcc_parent_names_14[] = {
>  	"cxo",
>  	"gpll0_out_main",
>  	/* "gpll4_out_aux", */
> -	"core_bi_pll_test_se",
>  };
>  
>  static const struct parent_map gcc_parent_map_15[] = {
>  	{ P_XO, 0 },
>  	/* { P_GPLL0_OUT_AUX, 2 }, */
> -	{ P_CORE_BI_PLL_TEST_SE, 7 },
>  };
>  
>  static const char * const gcc_parent_names_15[] = {
>  	"cxo",
>  	/* "gpll0_out_aux", */
> -	"core_bi_pll_test_se",
>  };
>  
>  static const struct parent_map gcc_parent_map_16[] = {
>  	{ P_XO, 0 },
>  	{ P_GPLL0_OUT_MAIN, 1 },
>  	/* { P_GPLL0_OUT_AUX, 2 }, */
> -	{ P_CORE_BI_PLL_TEST_SE, 7 },
>  };
>  
>  static const char * const gcc_parent_names_16[] = {
>  	"cxo",
>  	"gpll0_out_main",
>  	/* "gpll0_out_aux", */
> -	"core_bi_pll_test_se",
>  };
>  
>  static struct clk_fixed_factor cxo = {

[PATCH 09/15] clk: qcom: gcc-qcs404: move PLL clocks up

[Dmitry Baryshkov]

Move PLL clock declarations up, before clock parent tables, so that we
can use pll hw clock fields in the next commit.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 drivers/clk/qcom/gcc-qcs404.c | 298 +++++++++++++++++-----------------
 1 file changed, 149 insertions(+), 149 deletions(-)

diff --git a/drivers/clk/qcom/gcc-qcs404.c b/drivers/clk/qcom/gcc-qcs404.c
index fb94c57a00af..5ae7a6b2a326 100644
--- a/drivers/clk/qcom/gcc-qcs404.c
+++ b/drivers/clk/qcom/gcc-qcs404.c
@@ -37,6 +37,155 @@ enum {
 	P_XO,
 };
 
+static struct clk_fixed_factor cxo = {
+	.mult = 1,
+	.div = 1,
+	.hw.init = &(struct clk_init_data){
+		.name = "cxo",
+		.parent_names = (const char *[]){ "xo-board" },
+		.num_parents = 1,
+		.ops = &clk_fixed_factor_ops,
+	},
+};
+
+static struct clk_alpha_pll gpll0_sleep_clk_src = {
+	.offset = 0x21000,
+	.regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT],
+	.clkr = {
+		.enable_reg = 0x45008,
+		.enable_mask = BIT(23),
+		.enable_is_inverted = true,
+		.hw.init = &(struct clk_init_data){
+			.name = "gpll0_sleep_clk_src",
+			.parent_names = (const char *[]){ "cxo" },
+			.num_parents = 1,
+			.ops = &clk_alpha_pll_ops,
+		},
+	},
+};
+
+static struct clk_alpha_pll gpll0_out_main = {
+	.offset = 0x21000,
+	.regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT],
+	.flags = SUPPORTS_FSM_MODE,
+	.clkr = {
+		.enable_reg = 0x45000,
+		.enable_mask = BIT(0),
+		.hw.init = &(struct clk_init_data){
+			.name = "gpll0_out_main",
+			.parent_names = (const char *[])
+					{ "cxo" },
+			.num_parents = 1,
+			.ops = &clk_alpha_pll_ops,
+		},
+	},
+};
+
+static struct clk_alpha_pll gpll0_ao_out_main = {
+	.offset = 0x21000,
+	.regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT],
+	.flags = SUPPORTS_FSM_MODE,
+	.clkr = {
+		.enable_reg = 0x45000,
+		.enable_mask = BIT(0),
+		.hw.init = &(struct clk_init_data){
+			.name = "gpll0_ao_out_main",
+			.parent_names = (const char *[]){ "cxo" },
+			.num_parents = 1,
+			.flags = CLK_IS_CRITICAL,
+			.ops = &clk_alpha_pll_fixed_ops,
+		},
+	},
+};
+
+static struct clk_alpha_pll gpll1_out_main = {
+	.offset = 0x20000,
+	.regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT],
+	.clkr = {
+		.enable_reg = 0x45000,
+		.enable_mask = BIT(1),
+		.hw.init = &(struct clk_init_data){
+			.name = "gpll1_out_main",
+			.parent_names = (const char *[]){ "cxo" },
+			.num_parents = 1,
+			.ops = &clk_alpha_pll_ops,
+		},
+	},
+};
+
+/* 930MHz configuration */
+static const struct alpha_pll_config gpll3_config = {
+	.l = 48,
+	.alpha = 0x0,
+	.alpha_en_mask = BIT(24),
+	.post_div_mask = 0xf << 8,
+	.post_div_val = 0x1 << 8,
+	.vco_mask = 0x3 << 20,
+	.main_output_mask = 0x1,
+	.config_ctl_val = 0x4001055b,
+};
+
+static const struct pll_vco gpll3_vco[] = {
+	{ 700000000, 1400000000, 0 },
+};
+
+static struct clk_alpha_pll gpll3_out_main = {
+	.offset = 0x22000,
+	.regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT],
+	.vco_table = gpll3_vco,
+	.num_vco = ARRAY_SIZE(gpll3_vco),
+	.clkr = {
+		.hw.init = &(struct clk_init_data){
+			.name = "gpll3_out_main",
+			.parent_names = (const char *[]){ "cxo" },
+			.num_parents = 1,
+			.ops = &clk_alpha_pll_ops,
+		},
+	},
+};
+
+static struct clk_alpha_pll gpll4_out_main = {
+	.offset = 0x24000,
+	.regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT],
+	.clkr = {
+		.enable_reg = 0x45000,
+		.enable_mask = BIT(5),
+		.hw.init = &(struct clk_init_data){
+			.name = "gpll4_out_main",
+			.parent_names = (const char *[]){ "cxo" },
+			.num_parents = 1,
+			.ops = &clk_alpha_pll_ops,
+		},
+	},
+};
+
+static struct clk_pll gpll6 = {
+	.l_reg = 0x37004,
+	.m_reg = 0x37008,
+	.n_reg = 0x3700C,
+	.config_reg = 0x37014,
+	.mode_reg = 0x37000,
+	.status_reg = 0x3701C,
+	.status_bit = 17,
+	.clkr.hw.init = &(struct clk_init_data){
+		.name = "gpll6",
+		.parent_names = (const char *[]){ "cxo" },
+		.num_parents = 1,
+		.ops = &clk_pll_ops,
+	},
+};
+
+static struct clk_regmap gpll6_out_aux = {
+	.enable_reg = 0x45000,
+	.enable_mask = BIT(7),
+	.hw.init = &(struct clk_init_data){
+		.name = "gpll6_out_aux",
+		.parent_names = (const char *[]){ "gpll6" },
+		.num_parents = 1,
+		.ops = &clk_pll_vote_ops,
+	},
+};
+
 static const struct parent_map gcc_parent_map_0[] = {
 	{ P_XO, 0 },
 	{ P_GPLL0_OUT_MAIN, 1 },
@@ -240,155 +389,6 @@ static const char * const gcc_parent_names_16[] = {
 	/* "gpll0_out_aux", */
 };
 
-static struct clk_fixed_factor cxo = {
-	.mult = 1,
-	.div = 1,
-	.hw.init = &(struct clk_init_data){
-		.name = "cxo",
-		.parent_names = (const char *[]){ "xo-board" },
-		.num_parents = 1,
-		.ops = &clk_fixed_factor_ops,
-	},
-};
-
-static struct clk_alpha_pll gpll0_sleep_clk_src = {
-	.offset = 0x21000,
-	.regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT],
-	.clkr = {
-		.enable_reg = 0x45008,
-		.enable_mask = BIT(23),
-		.enable_is_inverted = true,
-		.hw.init = &(struct clk_init_data){
-			.name = "gpll0_sleep_clk_src",
-			.parent_names = (const char *[]){ "cxo" },
-			.num_parents = 1,
-			.ops = &clk_alpha_pll_ops,
-		},
-	},
-};
-
-static struct clk_alpha_pll gpll0_out_main = {
-	.offset = 0x21000,
-	.regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT],
-	.flags = SUPPORTS_FSM_MODE,
-	.clkr = {
-		.enable_reg = 0x45000,
-		.enable_mask = BIT(0),
-		.hw.init = &(struct clk_init_data){
-			.name = "gpll0_out_main",
-			.parent_names = (const char *[])
-					{ "cxo" },
-			.num_parents = 1,
-			.ops = &clk_alpha_pll_ops,
-		},
-	},
-};
-
-static struct clk_alpha_pll gpll0_ao_out_main = {
-	.offset = 0x21000,
-	.regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT],
-	.flags = SUPPORTS_FSM_MODE,
-	.clkr = {
-		.enable_reg = 0x45000,
-		.enable_mask = BIT(0),
-		.hw.init = &(struct clk_init_data){
-			.name = "gpll0_ao_out_main",
-			.parent_names = (const char *[]){ "cxo" },
-			.num_parents = 1,
-			.flags = CLK_IS_CRITICAL,
-			.ops = &clk_alpha_pll_fixed_ops,
-		},
-	},
-};
-
-static struct clk_alpha_pll gpll1_out_main = {
-	.offset = 0x20000,
-	.regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT],
-	.clkr = {
-		.enable_reg = 0x45000,
-		.enable_mask = BIT(1),
-		.hw.init = &(struct clk_init_data){
-			.name = "gpll1_out_main",
-			.parent_names = (const char *[]){ "cxo" },
-			.num_parents = 1,
-			.ops = &clk_alpha_pll_ops,
-		},
-	},
-};
-
-/* 930MHz configuration */
-static const struct alpha_pll_config gpll3_config = {
-	.l = 48,
-	.alpha = 0x0,
-	.alpha_en_mask = BIT(24),
-	.post_div_mask = 0xf << 8,
-	.post_div_val = 0x1 << 8,
-	.vco_mask = 0x3 << 20,
-	.main_output_mask = 0x1,
-	.config_ctl_val = 0x4001055b,
-};
-
-static const struct pll_vco gpll3_vco[] = {
-	{ 700000000, 1400000000, 0 },
-};
-
-static struct clk_alpha_pll gpll3_out_main = {
-	.offset = 0x22000,
-	.regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT],
-	.vco_table = gpll3_vco,
-	.num_vco = ARRAY_SIZE(gpll3_vco),
-	.clkr = {
-		.hw.init = &(struct clk_init_data){
-			.name = "gpll3_out_main",
-			.parent_names = (const char *[]){ "cxo" },
-			.num_parents = 1,
-			.ops = &clk_alpha_pll_ops,
-		},
-	},
-};
-
-static struct clk_alpha_pll gpll4_out_main = {
-	.offset = 0x24000,
-	.regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT],
-	.clkr = {
-		.enable_reg = 0x45000,
-		.enable_mask = BIT(5),
-		.hw.init = &(struct clk_init_data){
-			.name = "gpll4_out_main",
-			.parent_names = (const char *[]){ "cxo" },
-			.num_parents = 1,
-			.ops = &clk_alpha_pll_ops,
-		},
-	},
-};
-
-static struct clk_pll gpll6 = {
-	.l_reg = 0x37004,
-	.m_reg = 0x37008,
-	.n_reg = 0x3700C,
-	.config_reg = 0x37014,
-	.mode_reg = 0x37000,
-	.status_reg = 0x3701C,
-	.status_bit = 17,
-	.clkr.hw.init = &(struct clk_init_data){
-		.name = "gpll6",
-		.parent_names = (const char *[]){ "cxo" },
-		.num_parents = 1,
-		.ops = &clk_pll_ops,
-	},
-};
-
-static struct clk_regmap gpll6_out_aux = {
-	.enable_reg = 0x45000,
-	.enable_mask = BIT(7),
-	.hw.init = &(struct clk_init_data){
-		.name = "gpll6_out_aux",
-		.parent_names = (const char *[]){ "gpll6" },
-		.num_parents = 1,
-		.ops = &clk_pll_vote_ops,
-	},
-};
-
 static const struct freq_tbl ftbl_apss_ahb_clk_src[] = {
 	F(19200000, P_XO, 1, 0, 0),
 	F(50000000, P_GPLL0_OUT_MAIN, 16, 0, 0),
-- 
2.35.1

Re: [PATCH 09/15] clk: qcom: gcc-qcs404: move PLL clocks up

[Konrad Dybcio]

On 17.12.2022 01:17, Dmitry Baryshkov wrote:
> Move PLL clock declarations up, before clock parent tables, so that we
> can use pll hw clock fields in the next commit.
> 
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
>  drivers/clk/qcom/gcc-qcs404.c | 298 +++++++++++++++++-----------------
>  1 file changed, 149 insertions(+), 149 deletions(-)
> 
> diff --git a/drivers/clk/qcom/gcc-qcs404.c b/drivers/clk/qcom/gcc-qcs404.c
> index fb94c57a00af..5ae7a6b2a326 100644
> --- a/drivers/clk/qcom/gcc-qcs404.c
> +++ b/drivers/clk/qcom/gcc-qcs404.c
> @@ -37,6 +37,155 @@ enum {
>  	P_XO,
>  };
>  
> +static struct clk_fixed_factor cxo = {
> +	.mult = 1,
> +	.div = 1,
> +	.hw.init = &(struct clk_init_data){
> +		.name = "cxo",
> +		.parent_names = (const char *[]){ "xo-board" },
> +		.num_parents = 1,
> +		.ops = &clk_fixed_factor_ops,
> +	},
> +};
> +
> +static struct clk_alpha_pll gpll0_sleep_clk_src = {
> +	.offset = 0x21000,
> +	.regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT],
> +	.clkr = {
> +		.enable_reg = 0x45008,
> +		.enable_mask = BIT(23),
> +		.enable_is_inverted = true,
> +		.hw.init = &(struct clk_init_data){
> +			.name = "gpll0_sleep_clk_src",
> +			.parent_names = (const char *[]){ "cxo" },
> +			.num_parents = 1,
> +			.ops = &clk_alpha_pll_ops,
> +		},
> +	},
> +};
> +
> +static struct clk_alpha_pll gpll0_out_main = {
> +	.offset = 0x21000,
> +	.regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT],
> +	.flags = SUPPORTS_FSM_MODE,
> +	.clkr = {
> +		.enable_reg = 0x45000,
> +		.enable_mask = BIT(0),
> +		.hw.init = &(struct clk_init_data){
> +			.name = "gpll0_out_main",
> +			.parent_names = (const char *[])
> +					{ "cxo" },
> +			.num_parents = 1,
> +			.ops = &clk_alpha_pll_ops,
> +		},
> +	},
> +};
> +
> +static struct clk_alpha_pll gpll0_ao_out_main = {
> +	.offset = 0x21000,
> +	.regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT],
> +	.flags = SUPPORTS_FSM_MODE,
> +	.clkr = {
> +		.enable_reg = 0x45000,
> +		.enable_mask = BIT(0),
> +		.hw.init = &(struct clk_init_data){
> +			.name = "gpll0_ao_out_main",
> +			.parent_names = (const char *[]){ "cxo" },
> +			.num_parents = 1,
> +			.flags = CLK_IS_CRITICAL,
> +			.ops = &clk_alpha_pll_fixed_ops,
> +		},
> +	},
> +};
> +
> +static struct clk_alpha_pll gpll1_out_main = {
> +	.offset = 0x20000,
> +	.regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT],
> +	.clkr = {
> +		.enable_reg = 0x45000,
> +		.enable_mask = BIT(1),
> +		.hw.init = &(struct clk_init_data){
> +			.name = "gpll1_out_main",
> +			.parent_names = (const char *[]){ "cxo" },
> +			.num_parents = 1,
> +			.ops = &clk_alpha_pll_ops,
> +		},
> +	},
> +};
> +
> +/* 930MHz configuration */
> +static const struct alpha_pll_config gpll3_config = {
> +	.l = 48,
> +	.alpha = 0x0,
> +	.alpha_en_mask = BIT(24),
> +	.post_div_mask = 0xf << 8,
> +	.post_div_val = 0x1 << 8,
> +	.vco_mask = 0x3 << 20,
> +	.main_output_mask = 0x1,
> +	.config_ctl_val = 0x4001055b,
> +};
> +
> +static const struct pll_vco gpll3_vco[] = {
> +	{ 700000000, 1400000000, 0 },
> +};
> +
> +static struct clk_alpha_pll gpll3_out_main = {
> +	.offset = 0x22000,
> +	.regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT],
> +	.vco_table = gpll3_vco,
> +	.num_vco = ARRAY_SIZE(gpll3_vco),
> +	.clkr = {
> +		.hw.init = &(struct clk_init_data){
> +			.name = "gpll3_out_main",
> +			.parent_names = (const char *[]){ "cxo" },
> +			.num_parents = 1,
> +			.ops = &clk_alpha_pll_ops,
> +		},
> +	},
> +};
> +
> +static struct clk_alpha_pll gpll4_out_main = {
> +	.offset = 0x24000,
> +	.regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT],
> +	.clkr = {
> +		.enable_reg = 0x45000,
> +		.enable_mask = BIT(5),
> +		.hw.init = &(struct clk_init_data){
> +			.name = "gpll4_out_main",
> +			.parent_names = (const char *[]){ "cxo" },
> +			.num_parents = 1,
> +			.ops = &clk_alpha_pll_ops,
> +		},
> +	},
> +};
> +
> +static struct clk_pll gpll6 = {
> +	.l_reg = 0x37004,
> +	.m_reg = 0x37008,
> +	.n_reg = 0x3700C,
> +	.config_reg = 0x37014,
> +	.mode_reg = 0x37000,
> +	.status_reg = 0x3701C,
Getting rid of uppercase hex would be nice too!

Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>

Konrad
> +	.status_bit = 17,
> +	.clkr.hw.init = &(struct clk_init_data){
> +		.name = "gpll6",
> +		.parent_names = (const char *[]){ "cxo" },
> +		.num_parents = 1,
> +		.ops = &clk_pll_ops,
> +	},
> +};
> +
> +static struct clk_regmap gpll6_out_aux = {
> +	.enable_reg = 0x45000,
> +	.enable_mask = BIT(7),
> +	.hw.init = &(struct clk_init_data){
> +		.name = "gpll6_out_aux",
> +		.parent_names = (const char *[]){ "gpll6" },
> +		.num_parents = 1,
> +		.ops = &clk_pll_vote_ops,
> +	},
> +};
> +
>  static const struct parent_map gcc_parent_map_0[] = {
>  	{ P_XO, 0 },
>  	{ P_GPLL0_OUT_MAIN, 1 },
> @@ -240,155 +389,6 @@ static const char * const gcc_parent_names_16[] = {
>  	/* "gpll0_out_aux", */
>  };
>  
> -static struct clk_fixed_factor cxo = {
> -	.mult = 1,
> -	.div = 1,
> -	.hw.init = &(struct clk_init_data){
> -		.name = "cxo",
> -		.parent_names = (const char *[]){ "xo-board" },
> -		.num_parents = 1,
> -		.ops = &clk_fixed_factor_ops,
> -	},
> -};
> -
> -static struct clk_alpha_pll gpll0_sleep_clk_src = {
> -	.offset = 0x21000,
> -	.regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT],
> -	.clkr = {
> -		.enable_reg = 0x45008,
> -		.enable_mask = BIT(23),
> -		.enable_is_inverted = true,
> -		.hw.init = &(struct clk_init_data){
> -			.name = "gpll0_sleep_clk_src",
> -			.parent_names = (const char *[]){ "cxo" },
> -			.num_parents = 1,
> -			.ops = &clk_alpha_pll_ops,
> -		},
> -	},
> -};
> -
> -static struct clk_alpha_pll gpll0_out_main = {
> -	.offset = 0x21000,
> -	.regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT],
> -	.flags = SUPPORTS_FSM_MODE,
> -	.clkr = {
> -		.enable_reg = 0x45000,
> -		.enable_mask = BIT(0),
> -		.hw.init = &(struct clk_init_data){
> -			.name = "gpll0_out_main",
> -			.parent_names = (const char *[])
> -					{ "cxo" },
> -			.num_parents = 1,
> -			.ops = &clk_alpha_pll_ops,
> -		},
> -	},
> -};
> -
> -static struct clk_alpha_pll gpll0_ao_out_main = {
> -	.offset = 0x21000,
> -	.regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT],
> -	.flags = SUPPORTS_FSM_MODE,
> -	.clkr = {
> -		.enable_reg = 0x45000,
> -		.enable_mask = BIT(0),
> -		.hw.init = &(struct clk_init_data){
> -			.name = "gpll0_ao_out_main",
> -			.parent_names = (const char *[]){ "cxo" },
> -			.num_parents = 1,
> -			.flags = CLK_IS_CRITICAL,
> -			.ops = &clk_alpha_pll_fixed_ops,
> -		},
> -	},
> -};
> -
> -static struct clk_alpha_pll gpll1_out_main = {
> -	.offset = 0x20000,
> -	.regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT],
> -	.clkr = {
> -		.enable_reg = 0x45000,
> -		.enable_mask = BIT(1),
> -		.hw.init = &(struct clk_init_data){
> -			.name = "gpll1_out_main",
> -			.parent_names = (const char *[]){ "cxo" },
> -			.num_parents = 1,
> -			.ops = &clk_alpha_pll_ops,
> -		},
> -	},
> -};
> -
> -/* 930MHz configuration */
> -static const struct alpha_pll_config gpll3_config = {
> -	.l = 48,
> -	.alpha = 0x0,
> -	.alpha_en_mask = BIT(24),
> -	.post_div_mask = 0xf << 8,
> -	.post_div_val = 0x1 << 8,
> -	.vco_mask = 0x3 << 20,
> -	.main_output_mask = 0x1,
> -	.config_ctl_val = 0x4001055b,
> -};
> -
> -static const struct pll_vco gpll3_vco[] = {
> -	{ 700000000, 1400000000, 0 },
> -};
> -
> -static struct clk_alpha_pll gpll3_out_main = {
> -	.offset = 0x22000,
> -	.regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT],
> -	.vco_table = gpll3_vco,
> -	.num_vco = ARRAY_SIZE(gpll3_vco),
> -	.clkr = {
> -		.hw.init = &(struct clk_init_data){
> -			.name = "gpll3_out_main",
> -			.parent_names = (const char *[]){ "cxo" },
> -			.num_parents = 1,
> -			.ops = &clk_alpha_pll_ops,
> -		},
> -	},
> -};
> -
> -static struct clk_alpha_pll gpll4_out_main = {
> -	.offset = 0x24000,
> -	.regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT],
> -	.clkr = {
> -		.enable_reg = 0x45000,
> -		.enable_mask = BIT(5),
> -		.hw.init = &(struct clk_init_data){
> -			.name = "gpll4_out_main",
> -			.parent_names = (const char *[]){ "cxo" },
> -			.num_parents = 1,
> -			.ops = &clk_alpha_pll_ops,
> -		},
> -	},
> -};
> -
> -static struct clk_pll gpll6 = {
> -	.l_reg = 0x37004,
> -	.m_reg = 0x37008,
> -	.n_reg = 0x3700C,
> -	.config_reg = 0x37014,
> -	.mode_reg = 0x37000,
> -	.status_reg = 0x3701C,
> -	.status_bit = 17,
> -	.clkr.hw.init = &(struct clk_init_data){
> -		.name = "gpll6",
> -		.parent_names = (const char *[]){ "cxo" },
> -		.num_parents = 1,
> -		.ops = &clk_pll_ops,
> -	},
> -};
> -
> -static struct clk_regmap gpll6_out_aux = {
> -	.enable_reg = 0x45000,
> -	.enable_mask = BIT(7),
> -	.hw.init = &(struct clk_init_data){
> -		.name = "gpll6_out_aux",
> -		.parent_names = (const char *[]){ "gpll6" },
> -		.num_parents = 1,
> -		.ops = &clk_pll_vote_ops,
> -	},
> -};
> -
>  static const struct freq_tbl ftbl_apss_ahb_clk_src[] = {
>  	F(19200000, P_XO, 1, 0, 0),
>  	F(50000000, P_GPLL0_OUT_MAIN, 16, 0, 0),

[PATCH 10/15] clk: qcom: gcc-qcs404: use parent_hws/_data instead of parent_names

[Dmitry Baryshkov]

Convert the clock driver to specify parent data rather than parent
names, to actually bind using 'clock-names' specified in the DTS rather
than global clock names. Use parent_hws where possible to refer parent
clocks directly, skipping the lookup.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 drivers/clk/qcom/gcc-qcs404.c | 515 ++++++++++++++++++----------------
 1 file changed, 266 insertions(+), 249 deletions(-)

diff --git a/drivers/clk/qcom/gcc-qcs404.c b/drivers/clk/qcom/gcc-qcs404.c
index 5ae7a6b2a326..3941175d73a5 100644
--- a/drivers/clk/qcom/gcc-qcs404.c
+++ b/drivers/clk/qcom/gcc-qcs404.c
@@ -42,7 +42,9 @@ static struct clk_fixed_factor cxo = {
 	.div = 1,
 	.hw.init = &(struct clk_init_data){
 		.name = "cxo",
-		.parent_names = (const char *[]){ "xo-board" },
+		.parent_data = &(const struct clk_parent_data) {
+			.name = "xo-board",
+		},
 		.num_parents = 1,
 		.ops = &clk_fixed_factor_ops,
 	},
@@ -57,7 +59,9 @@ static struct clk_alpha_pll gpll0_sleep_clk_src = {
 		.enable_is_inverted = true,
 		.hw.init = &(struct clk_init_data){
 			.name = "gpll0_sleep_clk_src",
-			.parent_names = (const char *[]){ "cxo" },
+			.parent_data = &(const struct clk_parent_data) {
+				.hw = &cxo.hw,
+			},
 			.num_parents = 1,
 			.ops = &clk_alpha_pll_ops,
 		},
@@ -73,8 +77,9 @@ static struct clk_alpha_pll gpll0_out_main = {
 		.enable_mask = BIT(0),
 		.hw.init = &(struct clk_init_data){
 			.name = "gpll0_out_main",
-			.parent_names = (const char *[])
-					{ "cxo" },
+			.parent_data = &(const struct clk_parent_data) {
+				.hw = &cxo.hw,
+			},
 			.num_parents = 1,
 			.ops = &clk_alpha_pll_ops,
 		},
@@ -90,7 +95,9 @@ static struct clk_alpha_pll gpll0_ao_out_main = {
 		.enable_mask = BIT(0),
 		.hw.init = &(struct clk_init_data){
 			.name = "gpll0_ao_out_main",
-			.parent_names = (const char *[]){ "cxo" },
+			.parent_data = &(const struct clk_parent_data) {
+				.hw = &cxo.hw,
+			},
 			.num_parents = 1,
 			.flags = CLK_IS_CRITICAL,
 			.ops = &clk_alpha_pll_fixed_ops,
@@ -106,7 +113,9 @@ static struct clk_alpha_pll gpll1_out_main = {
 		.enable_mask = BIT(1),
 		.hw.init = &(struct clk_init_data){
 			.name = "gpll1_out_main",
-			.parent_names = (const char *[]){ "cxo" },
+			.parent_data = &(const struct clk_parent_data) {
+				.hw = &cxo.hw,
+			},
 			.num_parents = 1,
 			.ops = &clk_alpha_pll_ops,
 		},
@@ -137,7 +146,9 @@ static struct clk_alpha_pll gpll3_out_main = {
 	.clkr = {
 		.hw.init = &(struct clk_init_data){
 			.name = "gpll3_out_main",
-			.parent_names = (const char *[]){ "cxo" },
+			.parent_data = &(const struct clk_parent_data) {
+				.hw = &cxo.hw,
+			},
 			.num_parents = 1,
 			.ops = &clk_alpha_pll_ops,
 		},
@@ -152,7 +163,9 @@ static struct clk_alpha_pll gpll4_out_main = {
 		.enable_mask = BIT(5),
 		.hw.init = &(struct clk_init_data){
 			.name = "gpll4_out_main",
-			.parent_names = (const char *[]){ "cxo" },
+			.parent_data = &(const struct clk_parent_data) {
+				.hw = &cxo.hw,
+			},
 			.num_parents = 1,
 			.ops = &clk_alpha_pll_ops,
 		},
@@ -169,7 +182,9 @@ static struct clk_pll gpll6 = {
 	.status_bit = 17,
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "gpll6",
-		.parent_names = (const char *[]){ "cxo" },
+		.parent_data = &(const struct clk_parent_data) {
+			.hw = &cxo.hw,
+		},
 		.num_parents = 1,
 		.ops = &clk_pll_ops,
 	},
@@ -180,7 +195,9 @@ static struct clk_regmap gpll6_out_aux = {
 	.enable_mask = BIT(7),
 	.hw.init = &(struct clk_init_data){
 		.name = "gpll6_out_aux",
-		.parent_names = (const char *[]){ "gpll6" },
+		.parent_hws = (const struct clk_hw*[]) {
+			&gpll6.clkr.hw,
+		},
 		.num_parents = 1,
 		.ops = &clk_pll_vote_ops,
 	},
@@ -191,22 +208,22 @@ static const struct parent_map gcc_parent_map_0[] = {
 	{ P_GPLL0_OUT_MAIN, 1 },
 };
 
-static const char * const gcc_parent_names_0[] = {
-	"cxo",
-	"gpll0_out_main",
+static const struct clk_parent_data gcc_parent_data_0[] = {
+	{ .hw = &cxo.hw },
+	{ .hw = &gpll0_out_main.clkr.hw },
 };
 
-static const char * const gcc_parent_names_ao_0[] = {
-	"cxo",
-	"gpll0_ao_out_main",
+static const struct clk_parent_data gcc_parent_data_ao_0[] = {
+	{ .hw = &cxo.hw },
+	{ .hw = &gpll0_ao_out_main.clkr.hw },
 };
 
 static const struct parent_map gcc_parent_map_1[] = {
 	{ P_XO, 0 },
 };
 
-static const char * const gcc_parent_names_1[] = {
-	"cxo",
+static const struct clk_parent_data gcc_parent_data_1[] = {
+	{ .hw = &cxo.hw },
 };
 
 static const struct parent_map gcc_parent_map_2[] = {
@@ -216,11 +233,11 @@ static const struct parent_map gcc_parent_map_2[] = {
 	{ P_SLEEP_CLK, 6 },
 };
 
-static const char * const gcc_parent_names_2[] = {
-	"cxo",
-	"gpll0_out_main",
-	"gpll6_out_aux",
-	"sleep_clk",
+static const struct clk_parent_data gcc_parent_data_2[] = {
+	{ .hw = &cxo.hw },
+	{ .hw = &gpll0_out_main.clkr.hw },
+	{ .hw = &gpll6_out_aux.hw },
+	{ .fw_name = "sleep_clk", .name = "sleep_clk" },
 };
 
 static const struct parent_map gcc_parent_map_3[] = {
@@ -229,10 +246,10 @@ static const struct parent_map gcc_parent_map_3[] = {
 	{ P_GPLL6_OUT_AUX, 2 },
 };
 
-static const char * const gcc_parent_names_3[] = {
-	"cxo",
-	"gpll0_out_main",
-	"gpll6_out_aux",
+static const struct clk_parent_data gcc_parent_data_3[] = {
+	{ .hw = &cxo.hw },
+	{ .hw = &gpll0_out_main.clkr.hw },
+	{ .hw = &gpll6_out_aux.hw },
 };
 
 static const struct parent_map gcc_parent_map_4[] = {
@@ -240,9 +257,9 @@ static const struct parent_map gcc_parent_map_4[] = {
 	{ P_GPLL1_OUT_MAIN, 1 },
 };
 
-static const char * const gcc_parent_names_4[] = {
-	"cxo",
-	"gpll1_out_main",
+static const struct clk_parent_data gcc_parent_data_4[] = {
+	{ .hw = &cxo.hw },
+	{ .hw = &gpll1_out_main.clkr.hw },
 };
 
 static const struct parent_map gcc_parent_map_5[] = {
@@ -251,9 +268,9 @@ static const struct parent_map gcc_parent_map_5[] = {
 	/* { P_GPLL0_OUT_AUX, 2 }, */
 };
 
-static const char * const gcc_parent_names_5[] = {
-	"cxo",
-	"dsi0pllbyte",
+static const struct clk_parent_data gcc_parent_data_5[] = {
+	{ .hw = &cxo.hw },
+	{ .fw_name = "dsi0pllbyte", .name = "dsi0pllbyte" },
 	/* "gpll0_out_aux", */
 };
 
@@ -263,9 +280,9 @@ static const struct parent_map gcc_parent_map_6[] = {
 	/* { P_GPLL0_OUT_AUX, 3 }, */
 };
 
-static const char * const gcc_parent_names_6[] = {
-	"cxo",
-	"dsi0pllbyte",
+static const struct clk_parent_data gcc_parent_data_6[] = {
+	{ .hw = &cxo.hw },
+	{ .fw_name = "dsi0pllbyte", .name = "dsi0pllbyte" },
 	/* "gpll0_out_aux", */
 };
 
@@ -277,11 +294,11 @@ static const struct parent_map gcc_parent_map_7[] = {
 	/* { P_GPLL4_OUT_AUX, 4 }, */
 };
 
-static const char * const gcc_parent_names_7[] = {
-	"cxo",
-	"gpll0_out_main",
-	"gpll3_out_main",
-	"gpll6_out_aux",
+static const struct clk_parent_data gcc_parent_data_7[] = {
+	{ .hw = &cxo.hw },
+	{ .hw = &gpll0_out_main.clkr.hw },
+	{ .hw = &gpll3_out_main.clkr.hw },
+	{ .hw = &gpll6_out_aux.hw },
 	/* "gpll4_out_aux", */
 };
 
@@ -290,9 +307,9 @@ static const struct parent_map gcc_parent_map_8[] = {
 	{ P_HDMI_PHY_PLL_CLK, 1 },
 };
 
-static const char * const gcc_parent_names_8[] = {
-	"cxo",
-	"hdmi_pll",
+static const struct clk_parent_data gcc_parent_data_8[] = {
+	{ .hw = &cxo.hw },
+	{ .fw_name = "hdmi_pll", .name = "hdmi_pll" },
 };
 
 static const struct parent_map gcc_parent_map_9[] = {
@@ -302,11 +319,11 @@ static const struct parent_map gcc_parent_map_9[] = {
 	{ P_GPLL6_OUT_AUX, 3 },
 };
 
-static const char * const gcc_parent_names_9[] = {
-	"cxo",
-	"gpll0_out_main",
-	"dsi0pll",
-	"gpll6_out_aux",
+static const struct clk_parent_data gcc_parent_data_9[] = {
+	{ .hw = &cxo.hw },
+	{ .hw = &gpll0_out_main.clkr.hw },
+	{ .fw_name = "dsi0pll", .name = "dsi0pll" },
+	{ .hw = &gpll6_out_aux.hw },
 };
 
 static const struct parent_map gcc_parent_map_10[] = {
@@ -314,9 +331,9 @@ static const struct parent_map gcc_parent_map_10[] = {
 	{ P_SLEEP_CLK, 1 },
 };
 
-static const char * const gcc_parent_names_10[] = {
-	"cxo",
-	"sleep_clk",
+static const struct clk_parent_data gcc_parent_data_10[] = {
+	{ .hw = &cxo.hw },
+	{ .fw_name = "sleep_clk", .name = "sleep_clk" },
 };
 
 static const struct parent_map gcc_parent_map_11[] = {
@@ -324,9 +341,9 @@ static const struct parent_map gcc_parent_map_11[] = {
 	{ P_PCIE_0_PIPE_CLK, 1 },
 };
 
-static const char * const gcc_parent_names_11[] = {
-	"cxo",
-	"pcie_0_pipe_clk",
+static const struct clk_parent_data gcc_parent_data_11[] = {
+	{ .hw = &cxo.hw },
+	{ .fw_name = "pcie_0_pipe_clk", .name = "pcie_0_pipe_clk" },
 };
 
 static const struct parent_map gcc_parent_map_12[] = {
@@ -335,9 +352,9 @@ static const struct parent_map gcc_parent_map_12[] = {
 	/* { P_GPLL0_OUT_AUX, 2 }, */
 };
 
-static const char * const gcc_parent_names_12[] = {
-	"cxo",
-	"dsi0pll",
+static const struct clk_parent_data gcc_parent_data_12[] = {
+	{ .hw = &cxo.hw },
+	{ .fw_name = "dsi0pll", .name = "dsi0pll" },
 	/* "gpll0_out_aux", */
 };
 
@@ -348,11 +365,11 @@ static const struct parent_map gcc_parent_map_13[] = {
 	{ P_GPLL6_OUT_AUX, 3 },
 };
 
-static const char * const gcc_parent_names_13[] = {
-	"cxo",
-	"gpll0_out_main",
-	"gpll4_out_main",
-	"gpll6_out_aux",
+static const struct clk_parent_data gcc_parent_data_13[] = {
+	{ .hw = &cxo.hw },
+	{ .hw = &gpll0_out_main.clkr.hw },
+	{ .hw = &gpll4_out_main.clkr.hw },
+	{ .hw = &gpll6_out_aux.hw },
 };
 
 static const struct parent_map gcc_parent_map_14[] = {
@@ -361,9 +378,9 @@ static const struct parent_map gcc_parent_map_14[] = {
 	/* { P_GPLL4_OUT_AUX, 2 }, */
 };
 
-static const char * const gcc_parent_names_14[] = {
-	"cxo",
-	"gpll0_out_main",
+static const struct clk_parent_data gcc_parent_data_14[] = {
+	{ .hw = &cxo.hw },
+	{ .hw = &gpll0_out_main.clkr.hw },
 	/* "gpll4_out_aux", */
 };
 
@@ -372,8 +389,8 @@ static const struct parent_map gcc_parent_map_15[] = {
 	/* { P_GPLL0_OUT_AUX, 2 }, */
 };
 
-static const char * const gcc_parent_names_15[] = {
-	"cxo",
+static const struct clk_parent_data gcc_parent_data_15[] = {
+	{ .hw = &cxo.hw },
 	/* "gpll0_out_aux", */
 };
 
@@ -383,9 +400,9 @@ static const struct parent_map gcc_parent_map_16[] = {
 	/* { P_GPLL0_OUT_AUX, 2 }, */
 };
 
-static const char * const gcc_parent_names_16[] = {
-	"cxo",
-	"gpll0_out_main",
+static const struct clk_parent_data gcc_parent_data_16[] = {
+	{ .hw = &cxo.hw },
+	{ .hw = &gpll0_out_main.clkr.hw },
 	/* "gpll0_out_aux", */
 };
 
@@ -405,8 +422,8 @@ static struct clk_rcg2 apss_ahb_clk_src = {
 	.freq_tbl = ftbl_apss_ahb_clk_src,
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "apss_ahb_clk_src",
-		.parent_names = gcc_parent_names_ao_0,
-		.num_parents = ARRAY_SIZE(gcc_parent_names_ao_0),
+		.parent_data = gcc_parent_data_ao_0,
+		.num_parents = ARRAY_SIZE(gcc_parent_data_ao_0),
 		.flags = CLK_IS_CRITICAL,
 		.ops = &clk_rcg2_ops,
 	},
@@ -426,8 +443,8 @@ static struct clk_rcg2 blsp1_qup0_i2c_apps_clk_src = {
 	.freq_tbl = ftbl_blsp1_qup0_i2c_apps_clk_src,
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "blsp1_qup0_i2c_apps_clk_src",
-		.parent_names = gcc_parent_names_0,
-		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
+		.parent_data = gcc_parent_data_0,
+		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -451,8 +468,8 @@ static struct clk_rcg2 blsp1_qup0_spi_apps_clk_src = {
 	.freq_tbl = ftbl_blsp1_qup0_spi_apps_clk_src,
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "blsp1_qup0_spi_apps_clk_src",
-		.parent_names = gcc_parent_names_0,
-		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
+		.parent_data = gcc_parent_data_0,
+		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -465,8 +482,8 @@ static struct clk_rcg2 blsp1_qup1_i2c_apps_clk_src = {
 	.freq_tbl = ftbl_blsp1_qup0_i2c_apps_clk_src,
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "blsp1_qup1_i2c_apps_clk_src",
-		.parent_names = gcc_parent_names_0,
-		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
+		.parent_data = gcc_parent_data_0,
+		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -490,8 +507,8 @@ static struct clk_rcg2 blsp1_qup1_spi_apps_clk_src = {
 	.freq_tbl = ftbl_blsp1_qup1_spi_apps_clk_src,
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "blsp1_qup1_spi_apps_clk_src",
-		.parent_names = gcc_parent_names_0,
-		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
+		.parent_data = gcc_parent_data_0,
+		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -504,8 +521,8 @@ static struct clk_rcg2 blsp1_qup2_i2c_apps_clk_src = {
 	.freq_tbl = ftbl_blsp1_qup0_i2c_apps_clk_src,
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "blsp1_qup2_i2c_apps_clk_src",
-		.parent_names = gcc_parent_names_0,
-		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
+		.parent_data = gcc_parent_data_0,
+		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -530,8 +547,8 @@ static struct clk_rcg2 blsp1_qup2_spi_apps_clk_src = {
 	.freq_tbl = ftbl_blsp1_qup2_spi_apps_clk_src,
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "blsp1_qup2_spi_apps_clk_src",
-		.parent_names = gcc_parent_names_0,
-		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
+		.parent_data = gcc_parent_data_0,
+		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -544,8 +561,8 @@ static struct clk_rcg2 blsp1_qup3_i2c_apps_clk_src = {
 	.freq_tbl = ftbl_blsp1_qup0_i2c_apps_clk_src,
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "blsp1_qup3_i2c_apps_clk_src",
-		.parent_names = gcc_parent_names_0,
-		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
+		.parent_data = gcc_parent_data_0,
+		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -558,8 +575,8 @@ static struct clk_rcg2 blsp1_qup3_spi_apps_clk_src = {
 	.freq_tbl = ftbl_blsp1_qup0_spi_apps_clk_src,
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "blsp1_qup3_spi_apps_clk_src",
-		.parent_names = gcc_parent_names_0,
-		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
+		.parent_data = gcc_parent_data_0,
+		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -572,8 +589,8 @@ static struct clk_rcg2 blsp1_qup4_i2c_apps_clk_src = {
 	.freq_tbl = ftbl_blsp1_qup0_i2c_apps_clk_src,
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "blsp1_qup4_i2c_apps_clk_src",
-		.parent_names = gcc_parent_names_0,
-		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
+		.parent_data = gcc_parent_data_0,
+		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -586,8 +603,8 @@ static struct clk_rcg2 blsp1_qup4_spi_apps_clk_src = {
 	.freq_tbl = ftbl_blsp1_qup0_spi_apps_clk_src,
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "blsp1_qup4_spi_apps_clk_src",
-		.parent_names = gcc_parent_names_0,
-		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
+		.parent_data = gcc_parent_data_0,
+		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -620,8 +637,8 @@ static struct clk_rcg2 blsp1_uart0_apps_clk_src = {
 	.freq_tbl = ftbl_blsp1_uart0_apps_clk_src,
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "blsp1_uart0_apps_clk_src",
-		.parent_names = gcc_parent_names_0,
-		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
+		.parent_data = gcc_parent_data_0,
+		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -634,8 +651,8 @@ static struct clk_rcg2 blsp1_uart1_apps_clk_src = {
 	.freq_tbl = ftbl_blsp1_uart0_apps_clk_src,
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "blsp1_uart1_apps_clk_src",
-		.parent_names = gcc_parent_names_0,
-		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
+		.parent_data = gcc_parent_data_0,
+		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -648,8 +665,8 @@ static struct clk_rcg2 blsp1_uart2_apps_clk_src = {
 	.freq_tbl = ftbl_blsp1_uart0_apps_clk_src,
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "blsp1_uart2_apps_clk_src",
-		.parent_names = gcc_parent_names_0,
-		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
+		.parent_data = gcc_parent_data_0,
+		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -663,8 +680,8 @@ static struct clk_rcg2 blsp1_uart3_apps_clk_src = {
 	.freq_tbl = ftbl_blsp1_uart0_apps_clk_src,
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "blsp1_uart3_apps_clk_src",
-		.parent_names = gcc_parent_names_0,
-		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
+		.parent_data = gcc_parent_data_0,
+		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -677,8 +694,8 @@ static struct clk_rcg2 blsp2_qup0_i2c_apps_clk_src = {
 	.freq_tbl = ftbl_blsp1_qup0_i2c_apps_clk_src,
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "blsp2_qup0_i2c_apps_clk_src",
-		.parent_names = gcc_parent_names_0,
-		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
+		.parent_data = gcc_parent_data_0,
+		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -691,8 +708,8 @@ static struct clk_rcg2 blsp2_qup0_spi_apps_clk_src = {
 	.freq_tbl = ftbl_blsp1_qup0_spi_apps_clk_src,
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "blsp2_qup0_spi_apps_clk_src",
-		.parent_names = gcc_parent_names_0,
-		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
+		.parent_data = gcc_parent_data_0,
+		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -705,8 +722,8 @@ static struct clk_rcg2 blsp2_uart0_apps_clk_src = {
 	.freq_tbl = ftbl_blsp1_uart0_apps_clk_src,
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "blsp2_uart0_apps_clk_src",
-		.parent_names = gcc_parent_names_0,
-		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
+		.parent_data = gcc_parent_data_0,
+		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -718,8 +735,8 @@ static struct clk_rcg2 byte0_clk_src = {
 	.parent_map = gcc_parent_map_5,
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "byte0_clk_src",
-		.parent_names = gcc_parent_names_5,
-		.num_parents = ARRAY_SIZE(gcc_parent_names_5),
+		.parent_data = gcc_parent_data_5,
+		.num_parents = ARRAY_SIZE(gcc_parent_data_5),
 		.flags = CLK_SET_RATE_PARENT,
 		.ops = &clk_byte2_ops,
 	},
@@ -741,8 +758,8 @@ static struct clk_rcg2 emac_clk_src = {
 	.freq_tbl = ftbl_emac_clk_src,
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "emac_clk_src",
-		.parent_names = gcc_parent_names_4,
-		.num_parents = ARRAY_SIZE(gcc_parent_names_4),
+		.parent_data = gcc_parent_data_4,
+		.num_parents = ARRAY_SIZE(gcc_parent_data_4),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -762,8 +779,8 @@ static struct clk_rcg2 emac_ptp_clk_src = {
 	.freq_tbl = ftbl_emac_ptp_clk_src,
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "emac_ptp_clk_src",
-		.parent_names = gcc_parent_names_4,
-		.num_parents = ARRAY_SIZE(gcc_parent_names_4),
+		.parent_data = gcc_parent_data_4,
+		.num_parents = ARRAY_SIZE(gcc_parent_data_4),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -781,8 +798,8 @@ static struct clk_rcg2 esc0_clk_src = {
 	.freq_tbl = ftbl_esc0_clk_src,
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "esc0_clk_src",
-		.parent_names = gcc_parent_names_6,
-		.num_parents = ARRAY_SIZE(gcc_parent_names_6),
+		.parent_data = gcc_parent_data_6,
+		.num_parents = ARRAY_SIZE(gcc_parent_data_6),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -815,8 +832,8 @@ static struct clk_rcg2 gfx3d_clk_src = {
 	.freq_tbl = ftbl_gfx3d_clk_src,
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "gfx3d_clk_src",
-		.parent_names = gcc_parent_names_7,
-		.num_parents = ARRAY_SIZE(gcc_parent_names_7),
+		.parent_data = gcc_parent_data_7,
+		.num_parents = ARRAY_SIZE(gcc_parent_data_7),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -836,8 +853,8 @@ static struct clk_rcg2 gp1_clk_src = {
 	.freq_tbl = ftbl_gp1_clk_src,
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "gp1_clk_src",
-		.parent_names = gcc_parent_names_2,
-		.num_parents = ARRAY_SIZE(gcc_parent_names_2),
+		.parent_data = gcc_parent_data_2,
+		.num_parents = ARRAY_SIZE(gcc_parent_data_2),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -850,8 +867,8 @@ static struct clk_rcg2 gp2_clk_src = {
 	.freq_tbl = ftbl_gp1_clk_src,
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "gp2_clk_src",
-		.parent_names = gcc_parent_names_2,
-		.num_parents = ARRAY_SIZE(gcc_parent_names_2),
+		.parent_data = gcc_parent_data_2,
+		.num_parents = ARRAY_SIZE(gcc_parent_data_2),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -864,8 +881,8 @@ static struct clk_rcg2 gp3_clk_src = {
 	.freq_tbl = ftbl_gp1_clk_src,
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "gp3_clk_src",
-		.parent_names = gcc_parent_names_2,
-		.num_parents = ARRAY_SIZE(gcc_parent_names_2),
+		.parent_data = gcc_parent_data_2,
+		.num_parents = ARRAY_SIZE(gcc_parent_data_2),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -878,8 +895,8 @@ static struct clk_rcg2 hdmi_app_clk_src = {
 	.freq_tbl = ftbl_esc0_clk_src,
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "hdmi_app_clk_src",
-		.parent_names = gcc_parent_names_1,
-		.num_parents = ARRAY_SIZE(gcc_parent_names_1),
+		.parent_data = gcc_parent_data_1,
+		.num_parents = ARRAY_SIZE(gcc_parent_data_1),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -892,8 +909,8 @@ static struct clk_rcg2 hdmi_pclk_clk_src = {
 	.freq_tbl = ftbl_esc0_clk_src,
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "hdmi_pclk_clk_src",
-		.parent_names = gcc_parent_names_8,
-		.num_parents = ARRAY_SIZE(gcc_parent_names_8),
+		.parent_data = gcc_parent_data_8,
+		.num_parents = ARRAY_SIZE(gcc_parent_data_8),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -919,8 +936,8 @@ static struct clk_rcg2 mdp_clk_src = {
 	.freq_tbl = ftbl_mdp_clk_src,
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "mdp_clk_src",
-		.parent_names = gcc_parent_names_9,
-		.num_parents = ARRAY_SIZE(gcc_parent_names_9),
+		.parent_data = gcc_parent_data_9,
+		.num_parents = ARRAY_SIZE(gcc_parent_data_9),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -938,8 +955,8 @@ static struct clk_rcg2 pcie_0_aux_clk_src = {
 	.freq_tbl = ftbl_pcie_0_aux_clk_src,
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "pcie_0_aux_clk_src",
-		.parent_names = gcc_parent_names_10,
-		.num_parents = ARRAY_SIZE(gcc_parent_names_10),
+		.parent_data = gcc_parent_data_10,
+		.num_parents = ARRAY_SIZE(gcc_parent_data_10),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -959,8 +976,8 @@ static struct clk_rcg2 pcie_0_pipe_clk_src = {
 	.freq_tbl = ftbl_pcie_0_pipe_clk_src,
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "pcie_0_pipe_clk_src",
-		.parent_names = gcc_parent_names_11,
-		.num_parents = ARRAY_SIZE(gcc_parent_names_11),
+		.parent_data = gcc_parent_data_11,
+		.num_parents = ARRAY_SIZE(gcc_parent_data_11),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -972,8 +989,8 @@ static struct clk_rcg2 pclk0_clk_src = {
 	.parent_map = gcc_parent_map_12,
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "pclk0_clk_src",
-		.parent_names = gcc_parent_names_12,
-		.num_parents = ARRAY_SIZE(gcc_parent_names_12),
+		.parent_data = gcc_parent_data_12,
+		.num_parents = ARRAY_SIZE(gcc_parent_data_12),
 		.flags = CLK_SET_RATE_PARENT,
 		.ops = &clk_pixel_ops,
 	},
@@ -993,8 +1010,8 @@ static struct clk_rcg2 pdm2_clk_src = {
 	.freq_tbl = ftbl_pdm2_clk_src,
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "pdm2_clk_src",
-		.parent_names = gcc_parent_names_0,
-		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
+		.parent_data = gcc_parent_data_0,
+		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -1021,8 +1038,8 @@ static struct clk_rcg2 sdcc1_apps_clk_src = {
 	.freq_tbl = ftbl_sdcc1_apps_clk_src,
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "sdcc1_apps_clk_src",
-		.parent_names = gcc_parent_names_13,
-		.num_parents = ARRAY_SIZE(gcc_parent_names_13),
+		.parent_data = gcc_parent_data_13,
+		.num_parents = ARRAY_SIZE(gcc_parent_data_13),
 		.ops = &clk_rcg2_floor_ops,
 	},
 };
@@ -1041,8 +1058,8 @@ static struct clk_rcg2 sdcc1_ice_core_clk_src = {
 	.freq_tbl = ftbl_sdcc1_ice_core_clk_src,
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "sdcc1_ice_core_clk_src",
-		.parent_names = gcc_parent_names_3,
-		.num_parents = ARRAY_SIZE(gcc_parent_names_3),
+		.parent_data = gcc_parent_data_3,
+		.num_parents = ARRAY_SIZE(gcc_parent_data_3),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -1067,8 +1084,8 @@ static struct clk_rcg2 sdcc2_apps_clk_src = {
 	.freq_tbl = ftbl_sdcc2_apps_clk_src,
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "sdcc2_apps_clk_src",
-		.parent_names = gcc_parent_names_14,
-		.num_parents = ARRAY_SIZE(gcc_parent_names_14),
+		.parent_data = gcc_parent_data_14,
+		.num_parents = ARRAY_SIZE(gcc_parent_data_14),
 		.ops = &clk_rcg2_floor_ops,
 	},
 };
@@ -1081,8 +1098,8 @@ static struct clk_rcg2 usb20_mock_utmi_clk_src = {
 	.freq_tbl = ftbl_esc0_clk_src,
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "usb20_mock_utmi_clk_src",
-		.parent_names = gcc_parent_names_1,
-		.num_parents = ARRAY_SIZE(gcc_parent_names_1),
+		.parent_data = gcc_parent_data_1,
+		.num_parents = ARRAY_SIZE(gcc_parent_data_1),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -1103,8 +1120,8 @@ static struct clk_rcg2 usb30_master_clk_src = {
 	.freq_tbl = ftbl_usb30_master_clk_src,
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "usb30_master_clk_src",
-		.parent_names = gcc_parent_names_0,
-		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
+		.parent_data = gcc_parent_data_0,
+		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -1117,8 +1134,8 @@ static struct clk_rcg2 usb30_mock_utmi_clk_src = {
 	.freq_tbl = ftbl_esc0_clk_src,
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "usb30_mock_utmi_clk_src",
-		.parent_names = gcc_parent_names_1,
-		.num_parents = ARRAY_SIZE(gcc_parent_names_1),
+		.parent_data = gcc_parent_data_1,
+		.num_parents = ARRAY_SIZE(gcc_parent_data_1),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -1131,8 +1148,8 @@ static struct clk_rcg2 usb3_phy_aux_clk_src = {
 	.freq_tbl = ftbl_pcie_0_aux_clk_src,
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "usb3_phy_aux_clk_src",
-		.parent_names = gcc_parent_names_1,
-		.num_parents = ARRAY_SIZE(gcc_parent_names_1),
+		.parent_data = gcc_parent_data_1,
+		.num_parents = ARRAY_SIZE(gcc_parent_data_1),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -1154,8 +1171,8 @@ static struct clk_rcg2 usb_hs_system_clk_src = {
 	.freq_tbl = ftbl_usb_hs_system_clk_src,
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "usb_hs_system_clk_src",
-		.parent_names = gcc_parent_names_3,
-		.num_parents = ARRAY_SIZE(gcc_parent_names_3),
+		.parent_data = gcc_parent_data_3,
+		.num_parents = ARRAY_SIZE(gcc_parent_data_3),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -1168,8 +1185,8 @@ static struct clk_rcg2 vsync_clk_src = {
 	.freq_tbl = ftbl_esc0_clk_src,
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "vsync_clk_src",
-		.parent_names = gcc_parent_names_15,
-		.num_parents = ARRAY_SIZE(gcc_parent_names_15),
+		.parent_data = gcc_parent_data_15,
+		.num_parents = ARRAY_SIZE(gcc_parent_data_15),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -1190,8 +1207,8 @@ static struct clk_rcg2 cdsp_bimc_clk_src = {
 	.freq_tbl = ftbl_cdsp_bimc_clk_src,
 	.clkr.hw.init = &(struct clk_init_data) {
 		.name = "cdsp_bimc_clk_src",
-		.parent_names = gcc_parent_names_16,
-		.num_parents = ARRAY_SIZE(gcc_parent_names_16),
+		.parent_data = gcc_parent_data_16,
+		.num_parents = ARRAY_SIZE(gcc_parent_data_16),
 		.ops = &clk_rcg2_ops,
 	},
 };
@@ -1204,8 +1221,8 @@ static struct clk_branch gcc_apss_ahb_clk = {
 		.enable_mask = BIT(14),
 		.hw.init = &(struct clk_init_data){
 			.name = "gcc_apss_ahb_clk",
-			.parent_names = (const char *[]){
-				"apss_ahb_clk_src",
+			.parent_hws = (const struct clk_hw*[]) {
+				&apss_ahb_clk_src.clkr.hw,
 			},
 			.num_parents = 1,
 			.flags = CLK_SET_RATE_PARENT,
@@ -1236,8 +1253,8 @@ static struct clk_branch gcc_bimc_gfx_clk = {
 		.hw.init = &(struct clk_init_data){
 			.name = "gcc_bimc_gfx_clk",
 			.ops = &clk_branch2_ops,
-			.parent_names = (const char *[]){
-				"gcc_apss_tcu_clk",
+			.parent_hws = (const struct clk_hw*[]) {
+				&gcc_apss_tcu_clk.clkr.hw,
 			},
 
 		},
@@ -1265,8 +1282,8 @@ static struct clk_branch gcc_bimc_cdsp_clk = {
 		.enable_mask = BIT(0),
 		.hw.init = &(struct clk_init_data) {
 			.name = "gcc_bimc_cdsp_clk",
-			.parent_names = (const char *[]) {
-				"cdsp_bimc_clk_src",
+			.parent_hws = (const struct clk_hw*[]) {
+				&cdsp_bimc_clk_src.clkr.hw
 			},
 			.num_parents = 1,
 			.flags = CLK_SET_RATE_PARENT,
@@ -1335,8 +1352,8 @@ static struct clk_branch gcc_blsp1_qup0_i2c_apps_clk = {
 		.enable_mask = BIT(0),
 		.hw.init = &(struct clk_init_data){
 			.name = "gcc_blsp1_qup0_i2c_apps_clk",
-			.parent_names = (const char *[]){
-				"blsp1_qup0_i2c_apps_clk_src",
+			.parent_hws = (const struct clk_hw*[]) {
+				&blsp1_qup0_i2c_apps_clk_src.clkr.hw,
 			},
 			.num_parents = 1,
 			.flags = CLK_SET_RATE_PARENT,
@@ -1353,8 +1370,8 @@ static struct clk_branch gcc_blsp1_qup0_spi_apps_clk = {
 		.enable_mask = BIT(0),
 		.hw.init = &(struct clk_init_data){
 			.name = "gcc_blsp1_qup0_spi_apps_clk",
-			.parent_names = (const char *[]){
-				"blsp1_qup0_spi_apps_clk_src",
+			.parent_hws = (const struct clk_hw*[]) {
+				&blsp1_qup0_spi_apps_clk_src.clkr.hw,
 			},
 			.num_parents = 1,
 			.flags = CLK_SET_RATE_PARENT,
@@ -1371,8 +1388,8 @@ static struct clk_branch gcc_blsp1_qup1_i2c_apps_clk = {
 		.enable_mask = BIT(0),
 		.hw.init = &(struct clk_init_data){
 			.name = "gcc_blsp1_qup1_i2c_apps_clk",
-			.parent_names = (const char *[]){
-				"blsp1_qup1_i2c_apps_clk_src",
+			.parent_hws = (const struct clk_hw*[]) {
+				&blsp1_qup1_i2c_apps_clk_src.clkr.hw,
 			},
 			.num_parents = 1,
 			.flags = CLK_SET_RATE_PARENT,
@@ -1389,8 +1406,8 @@ static struct clk_branch gcc_blsp1_qup1_spi_apps_clk = {
 		.enable_mask = BIT(0),
 		.hw.init = &(struct clk_init_data){
 			.name = "gcc_blsp1_qup1_spi_apps_clk",
-			.parent_names = (const char *[]){
-				"blsp1_qup1_spi_apps_clk_src",
+			.parent_hws = (const struct clk_hw*[]) {
+				&blsp1_qup1_spi_apps_clk_src.clkr.hw,
 			},
 			.num_parents = 1,
 			.flags = CLK_SET_RATE_PARENT,
@@ -1407,8 +1424,8 @@ static struct clk_branch gcc_blsp1_qup2_i2c_apps_clk = {
 		.enable_mask = BIT(0),
 		.hw.init = &(struct clk_init_data){
 			.name = "gcc_blsp1_qup2_i2c_apps_clk",
-			.parent_names = (const char *[]){
-				"blsp1_qup2_i2c_apps_clk_src",
+			.parent_hws = (const struct clk_hw*[]) {
+				&blsp1_qup2_i2c_apps_clk_src.clkr.hw,
 			},
 			.num_parents = 1,
 			.flags = CLK_SET_RATE_PARENT,
@@ -1425,8 +1442,8 @@ static struct clk_branch gcc_blsp1_qup2_spi_apps_clk = {
 		.enable_mask = BIT(0),
 		.hw.init = &(struct clk_init_data){
 			.name = "gcc_blsp1_qup2_spi_apps_clk",
-			.parent_names = (const char *[]){
-				"blsp1_qup2_spi_apps_clk_src",
+			.parent_hws = (const struct clk_hw*[]) {
+				&blsp1_qup2_spi_apps_clk_src.clkr.hw,
 			},
 			.num_parents = 1,
 			.flags = CLK_SET_RATE_PARENT,
@@ -1443,8 +1460,8 @@ static struct clk_branch gcc_blsp1_qup3_i2c_apps_clk = {
 		.enable_mask = BIT(0),
 		.hw.init = &(struct clk_init_data){
 			.name = "gcc_blsp1_qup3_i2c_apps_clk",
-			.parent_names = (const char *[]){
-				"blsp1_qup3_i2c_apps_clk_src",
+			.parent_hws = (const struct clk_hw*[]) {
+				&blsp1_qup3_i2c_apps_clk_src.clkr.hw,
 			},
 			.num_parents = 1,
 			.flags = CLK_SET_RATE_PARENT,
@@ -1461,8 +1478,8 @@ static struct clk_branch gcc_blsp1_qup3_spi_apps_clk = {
 		.enable_mask = BIT(0),
 		.hw.init = &(struct clk_init_data){
 			.name = "gcc_blsp1_qup3_spi_apps_clk",
-			.parent_names = (const char *[]){
-				"blsp1_qup3_spi_apps_clk_src",
+			.parent_hws = (const struct clk_hw*[]) {
+				&blsp1_qup3_spi_apps_clk_src.clkr.hw,
 			},
 			.num_parents = 1,
 			.flags = CLK_SET_RATE_PARENT,
@@ -1479,8 +1496,8 @@ static struct clk_branch gcc_blsp1_qup4_i2c_apps_clk = {
 		.enable_mask = BIT(0),
 		.hw.init = &(struct clk_init_data){
 			.name = "gcc_blsp1_qup4_i2c_apps_clk",
-			.parent_names = (const char *[]){
-				"blsp1_qup4_i2c_apps_clk_src",
+			.parent_hws = (const struct clk_hw*[]) {
+				&blsp1_qup4_i2c_apps_clk_src.clkr.hw,
 			},
 			.num_parents = 1,
 			.flags = CLK_SET_RATE_PARENT,
@@ -1497,8 +1514,8 @@ static struct clk_branch gcc_blsp1_qup4_spi_apps_clk = {
 		.enable_mask = BIT(0),
 		.hw.init = &(struct clk_init_data){
 			.name = "gcc_blsp1_qup4_spi_apps_clk",
-			.parent_names = (const char *[]){
-				"blsp1_qup4_spi_apps_clk_src",
+			.parent_hws = (const struct clk_hw*[]) {
+				&blsp1_qup4_spi_apps_clk_src.clkr.hw,
 			},
 			.num_parents = 1,
 			.flags = CLK_SET_RATE_PARENT,
@@ -1515,8 +1532,8 @@ static struct clk_branch gcc_blsp1_uart0_apps_clk = {
 		.enable_mask = BIT(0),
 		.hw.init = &(struct clk_init_data){
 			.name = "gcc_blsp1_uart0_apps_clk",
-			.parent_names = (const char *[]){
-				"blsp1_uart0_apps_clk_src",
+			.parent_hws = (const struct clk_hw*[]) {
+				&blsp1_uart0_apps_clk_src.clkr.hw,
 			},
 			.num_parents = 1,
 			.flags = CLK_SET_RATE_PARENT,
@@ -1533,8 +1550,8 @@ static struct clk_branch gcc_blsp1_uart1_apps_clk = {
 		.enable_mask = BIT(0),
 		.hw.init = &(struct clk_init_data){
 			.name = "gcc_blsp1_uart1_apps_clk",
-			.parent_names = (const char *[]){
-				"blsp1_uart1_apps_clk_src",
+			.parent_hws = (const struct clk_hw*[]) {
+				&blsp1_uart1_apps_clk_src.clkr.hw,
 			},
 			.num_parents = 1,
 			.flags = CLK_SET_RATE_PARENT,
@@ -1551,8 +1568,8 @@ static struct clk_branch gcc_blsp1_uart2_apps_clk = {
 		.enable_mask = BIT(0),
 		.hw.init = &(struct clk_init_data){
 			.name = "gcc_blsp1_uart2_apps_clk",
-			.parent_names = (const char *[]){
-				"blsp1_uart2_apps_clk_src",
+			.parent_hws = (const struct clk_hw*[]) {
+				&blsp1_uart2_apps_clk_src.clkr.hw,
 			},
 			.num_parents = 1,
 			.flags = CLK_SET_RATE_PARENT,
@@ -1569,8 +1586,8 @@ static struct clk_branch gcc_blsp1_uart3_apps_clk = {
 		.enable_mask = BIT(0),
 		.hw.init = &(struct clk_init_data){
 			.name = "gcc_blsp1_uart3_apps_clk",
-			.parent_names = (const char *[]){
-				"blsp1_uart3_apps_clk_src",
+			.parent_hws = (const struct clk_hw*[]) {
+				&blsp1_uart3_apps_clk_src.clkr.hw,
 			},
 			.num_parents = 1,
 			.flags = CLK_SET_RATE_PARENT,
@@ -1600,8 +1617,8 @@ static struct clk_branch gcc_blsp2_qup0_i2c_apps_clk = {
 		.enable_mask = BIT(0),
 		.hw.init = &(struct clk_init_data){
 			.name = "gcc_blsp2_qup0_i2c_apps_clk",
-			.parent_names = (const char *[]){
-				"blsp2_qup0_i2c_apps_clk_src",
+			.parent_hws = (const struct clk_hw*[]) {
+				&blsp2_qup0_i2c_apps_clk_src.clkr.hw,
 			},
 			.num_parents = 1,
 			.flags = CLK_SET_RATE_PARENT,
@@ -1618,8 +1635,8 @@ static struct clk_branch gcc_blsp2_qup0_spi_apps_clk = {
 		.enable_mask = BIT(0),
 		.hw.init = &(struct clk_init_data){
 			.name = "gcc_blsp2_qup0_spi_apps_clk",
-			.parent_names = (const char *[]){
-				"blsp2_qup0_spi_apps_clk_src",
+			.parent_hws = (const struct clk_hw*[]) {
+				&blsp2_qup0_spi_apps_clk_src.clkr.hw,
 			},
 			.num_parents = 1,
 			.flags = CLK_SET_RATE_PARENT,
@@ -1636,8 +1653,8 @@ static struct clk_branch gcc_blsp2_uart0_apps_clk = {
 		.enable_mask = BIT(0),
 		.hw.init = &(struct clk_init_data){
 			.name = "gcc_blsp2_uart0_apps_clk",
-			.parent_names = (const char *[]){
-				"blsp2_uart0_apps_clk_src",
+			.parent_hws = (const struct clk_hw*[]) {
+				&blsp2_uart0_apps_clk_src.clkr.hw,
 			},
 			.num_parents = 1,
 			.flags = CLK_SET_RATE_PARENT,
@@ -1719,8 +1736,8 @@ static struct clk_branch gcc_eth_ptp_clk = {
 		.enable_mask = BIT(0),
 		.hw.init = &(struct clk_init_data){
 			.name = "gcc_eth_ptp_clk",
-			.parent_names = (const char *[]){
-				"emac_ptp_clk_src",
+			.parent_hws = (const struct clk_hw*[]) {
+				&emac_ptp_clk_src.clkr.hw,
 			},
 			.num_parents = 1,
 			.flags = CLK_SET_RATE_PARENT,
@@ -1737,8 +1754,8 @@ static struct clk_branch gcc_eth_rgmii_clk = {
 		.enable_mask = BIT(0),
 		.hw.init = &(struct clk_init_data){
 			.name = "gcc_eth_rgmii_clk",
-			.parent_names = (const char *[]){
-				"emac_clk_src",
+			.parent_hws = (const struct clk_hw*[]) {
+				&emac_clk_src.clkr.hw,
 			},
 			.num_parents = 1,
 			.flags = CLK_SET_RATE_PARENT,
@@ -1820,8 +1837,8 @@ static struct clk_branch gcc_cdsp_tbu_clk = {
 		.enable_mask = BIT(9),
 		.hw.init = &(struct clk_init_data) {
 			.name = "gcc_cdsp_tbu_clk",
-			.parent_names = (const char *[]) {
-				"cdsp_bimc_clk_src",
+			.parent_hws = (const struct clk_hw*[]) {
+				&cdsp_bimc_clk_src.clkr.hw
 			},
 			.num_parents = 1,
 			.flags = CLK_SET_RATE_PARENT,
@@ -1838,8 +1855,8 @@ static struct clk_branch gcc_gp1_clk = {
 		.enable_mask = BIT(0),
 		.hw.init = &(struct clk_init_data){
 			.name = "gcc_gp1_clk",
-			.parent_names = (const char *[]){
-				"gp1_clk_src",
+			.parent_hws = (const struct clk_hw*[]) {
+				&gp1_clk_src.clkr.hw,
 			},
 			.num_parents = 1,
 			.flags = CLK_SET_RATE_PARENT,
@@ -1856,8 +1873,8 @@ static struct clk_branch gcc_gp2_clk = {
 		.enable_mask = BIT(0),
 		.hw.init = &(struct clk_init_data){
 			.name = "gcc_gp2_clk",
-			.parent_names = (const char *[]){
-				"gp2_clk_src",
+			.parent_hws = (const struct clk_hw*[]) {
+				&gp2_clk_src.clkr.hw,
 			},
 			.num_parents = 1,
 			.flags = CLK_SET_RATE_PARENT,
@@ -1874,8 +1891,8 @@ static struct clk_branch gcc_gp3_clk = {
 		.enable_mask = BIT(0),
 		.hw.init = &(struct clk_init_data){
 			.name = "gcc_gp3_clk",
-			.parent_names = (const char *[]){
-				"gp3_clk_src",
+			.parent_hws = (const struct clk_hw*[]) {
+				&gp3_clk_src.clkr.hw,
 			},
 			.num_parents = 1,
 			.flags = CLK_SET_RATE_PARENT,
@@ -1944,8 +1961,8 @@ static struct clk_branch gcc_mdss_byte0_clk = {
 		.enable_mask = BIT(0),
 		.hw.init = &(struct clk_init_data){
 			.name = "gcc_mdss_byte0_clk",
-			.parent_names = (const char *[]){
-				"byte0_clk_src",
+			.parent_hws = (const struct clk_hw*[]) {
+				&byte0_clk_src.clkr.hw,
 			},
 			.num_parents = 1,
 			.flags = CLK_SET_RATE_PARENT,
@@ -1962,8 +1979,8 @@ static struct clk_branch gcc_mdss_esc0_clk = {
 		.enable_mask = BIT(0),
 		.hw.init = &(struct clk_init_data){
 			.name = "gcc_mdss_esc0_clk",
-			.parent_names = (const char *[]){
-				"esc0_clk_src",
+			.parent_hws = (const struct clk_hw*[]) {
+				&esc0_clk_src.clkr.hw,
 			},
 			.num_parents = 1,
 			.flags = CLK_SET_RATE_PARENT,
@@ -1980,8 +1997,8 @@ static struct clk_branch gcc_mdss_hdmi_app_clk = {
 		.enable_mask = BIT(0),
 		.hw.init = &(struct clk_init_data){
 			.name = "gcc_mdss_hdmi_app_clk",
-			.parent_names = (const char *[]){
-				"hdmi_app_clk_src",
+			.parent_hws = (const struct clk_hw*[]) {
+				&hdmi_app_clk_src.clkr.hw,
 			},
 			.num_parents = 1,
 			.flags = CLK_SET_RATE_PARENT,
@@ -1998,8 +2015,8 @@ static struct clk_branch gcc_mdss_hdmi_pclk_clk = {
 		.enable_mask = BIT(0),
 		.hw.init = &(struct clk_init_data){
 			.name = "gcc_mdss_hdmi_pclk_clk",
-			.parent_names = (const char *[]){
-				"hdmi_pclk_clk_src",
+			.parent_hws = (const struct clk_hw*[]) {
+				&hdmi_pclk_clk_src.clkr.hw,
 			},
 			.num_parents = 1,
 			.flags = CLK_SET_RATE_PARENT,
@@ -2016,8 +2033,8 @@ static struct clk_branch gcc_mdss_mdp_clk = {
 		.enable_mask = BIT(0),
 		.hw.init = &(struct clk_init_data){
 			.name = "gcc_mdss_mdp_clk",
-			.parent_names = (const char *[]){
-				"mdp_clk_src",
+			.parent_hws = (const struct clk_hw*[]) {
+				&mdp_clk_src.clkr.hw,
 			},
 			.num_parents = 1,
 			.flags = CLK_SET_RATE_PARENT,
@@ -2034,8 +2051,8 @@ static struct clk_branch gcc_mdss_pclk0_clk = {
 		.enable_mask = BIT(0),
 		.hw.init = &(struct clk_init_data){
 			.name = "gcc_mdss_pclk0_clk",
-			.parent_names = (const char *[]){
-				"pclk0_clk_src",
+			.parent_hws = (const struct clk_hw*[]) {
+				&pclk0_clk_src.clkr.hw,
 			},
 			.num_parents = 1,
 			.flags = CLK_SET_RATE_PARENT,
@@ -2052,8 +2069,8 @@ static struct clk_branch gcc_mdss_vsync_clk = {
 		.enable_mask = BIT(0),
 		.hw.init = &(struct clk_init_data){
 			.name = "gcc_mdss_vsync_clk",
-			.parent_names = (const char *[]){
-				"vsync_clk_src",
+			.parent_hws = (const struct clk_hw*[]) {
+				&vsync_clk_src.clkr.hw,
 			},
 			.num_parents = 1,
 			.flags = CLK_SET_RATE_PARENT,
@@ -2083,8 +2100,8 @@ static struct clk_branch gcc_oxili_gfx3d_clk = {
 		.enable_mask = BIT(0),
 		.hw.init = &(struct clk_init_data){
 			.name = "gcc_oxili_gfx3d_clk",
-			.parent_names = (const char *[]){
-				"gfx3d_clk_src",
+			.parent_hws = (const struct clk_hw*[]) {
+				&gfx3d_clk_src.clkr.hw,
 			},
 			.num_parents = 1,
 			.flags = CLK_SET_RATE_PARENT,
@@ -2101,8 +2118,8 @@ static struct clk_branch gcc_pcie_0_aux_clk = {
 		.enable_mask = BIT(27),
 		.hw.init = &(struct clk_init_data){
 			.name = "gcc_pcie_0_aux_clk",
-			.parent_names = (const char *[]){
-				"pcie_0_aux_clk_src",
+			.parent_hws = (const struct clk_hw*[]) {
+				&pcie_0_aux_clk_src.clkr.hw,
 			},
 			.num_parents = 1,
 			.flags = CLK_SET_RATE_PARENT,
@@ -2145,8 +2162,8 @@ static struct clk_branch gcc_pcie_0_pipe_clk = {
 		.enable_mask = BIT(28),
 		.hw.init = &(struct clk_init_data){
 			.name = "gcc_pcie_0_pipe_clk",
-			.parent_names = (const char *[]){
-				"pcie_0_pipe_clk_src",
+			.parent_hws = (const struct clk_hw*[]) {
+				&pcie_0_pipe_clk_src.clkr.hw,
 			},
 			.num_parents = 1,
 			.flags = CLK_SET_RATE_PARENT,
@@ -2204,8 +2221,8 @@ static struct clk_branch gcc_pdm2_clk = {
 		.enable_mask = BIT(0),
 		.hw.init = &(struct clk_init_data){
 			.name = "gcc_pdm2_clk",
-			.parent_names = (const char *[]){
-				"pdm2_clk_src",
+			.parent_hws = (const struct clk_hw*[]) {
+				&pdm2_clk_src.clkr.hw,
 			},
 			.num_parents = 1,
 			.flags = CLK_SET_RATE_PARENT,
@@ -2314,8 +2331,8 @@ static struct clk_branch gcc_sdcc1_apps_clk = {
 		.enable_mask = BIT(0),
 		.hw.init = &(struct clk_init_data){
 			.name = "gcc_sdcc1_apps_clk",
-			.parent_names = (const char *[]){
-				"sdcc1_apps_clk_src",
+			.parent_hws = (const struct clk_hw*[]) {
+				&sdcc1_apps_clk_src.clkr.hw,
 			},
 			.num_parents = 1,
 			.flags = CLK_SET_RATE_PARENT,
@@ -2332,8 +2349,8 @@ static struct clk_branch gcc_sdcc1_ice_core_clk = {
 		.enable_mask = BIT(0),
 		.hw.init = &(struct clk_init_data){
 			.name = "gcc_sdcc1_ice_core_clk",
-			.parent_names = (const char *[]){
-				"sdcc1_ice_core_clk_src",
+			.parent_hws = (const struct clk_hw*[]) {
+				&sdcc1_ice_core_clk_src.clkr.hw,
 			},
 			.num_parents = 1,
 			.flags = CLK_SET_RATE_PARENT,
@@ -2376,8 +2393,8 @@ static struct clk_branch gcc_sdcc2_apps_clk = {
 		.enable_mask = BIT(0),
 		.hw.init = &(struct clk_init_data){
 			.name = "gcc_sdcc2_apps_clk",
-			.parent_names = (const char *[]){
-				"sdcc2_apps_clk_src",
+			.parent_hws = (const struct clk_hw*[]) {
+				&sdcc2_apps_clk_src.clkr.hw,
 			},
 			.num_parents = 1,
 			.flags = CLK_SET_RATE_PARENT,
@@ -2407,8 +2424,8 @@ static struct clk_branch gcc_sys_noc_usb3_clk = {
 		.enable_mask = BIT(0),
 		.hw.init = &(struct clk_init_data){
 			.name = "gcc_sys_noc_usb3_clk",
-			.parent_names = (const char *[]){
-				"usb30_master_clk_src",
+			.parent_hws = (const struct clk_hw*[]) {
+				&usb30_master_clk_src.clkr.hw,
 			},
 			.num_parents = 1,
 			.ops = &clk_branch2_ops,
@@ -2437,8 +2454,8 @@ static struct clk_branch gcc_usb20_mock_utmi_clk = {
 		.enable_mask = BIT(0),
 		.hw.init = &(struct clk_init_data){
 			.name = "gcc_usb20_mock_utmi_clk",
-			.parent_names = (const char *[]){
-				"usb20_mock_utmi_clk_src",
+			.parent_hws = (const struct clk_hw*[]) {
+				&usb20_mock_utmi_clk_src.clkr.hw,
 			},
 			.num_parents = 1,
 			.flags = CLK_SET_RATE_PARENT,
@@ -2468,8 +2485,8 @@ static struct clk_branch gcc_usb30_master_clk = {
 		.enable_mask = BIT(0),
 		.hw.init = &(struct clk_init_data){
 			.name = "gcc_usb30_master_clk",
-			.parent_names = (const char *[]){
-				"usb30_master_clk_src",
+			.parent_hws = (const struct clk_hw*[]) {
+				&usb30_master_clk_src.clkr.hw,
 			},
 			.num_parents = 1,
 			.flags = CLK_SET_RATE_PARENT,
@@ -2486,8 +2503,8 @@ static struct clk_branch gcc_usb30_mock_utmi_clk = {
 		.enable_mask = BIT(0),
 		.hw.init = &(struct clk_init_data){
 			.name = "gcc_usb30_mock_utmi_clk",
-			.parent_names = (const char *[]){
-				"usb30_mock_utmi_clk_src",
+			.parent_hws = (const struct clk_hw*[]) {
+				&usb30_mock_utmi_clk_src.clkr.hw,
 			},
 			.num_parents = 1,
 			.flags = CLK_SET_RATE_PARENT,
@@ -2517,8 +2534,8 @@ static struct clk_branch gcc_usb3_phy_aux_clk = {
 		.enable_mask = BIT(0),
 		.hw.init = &(struct clk_init_data){
 			.name = "gcc_usb3_phy_aux_clk",
-			.parent_names = (const char *[]){
-				"usb3_phy_aux_clk_src",
+			.parent_hws = (const struct clk_hw*[]) {
+				&usb3_phy_aux_clk_src.clkr.hw,
 			},
 			.num_parents = 1,
 			.flags = CLK_SET_RATE_PARENT,
@@ -2560,8 +2577,8 @@ static struct clk_branch gcc_usb_hs_system_clk = {
 		.enable_mask = BIT(0),
 		.hw.init = &(struct clk_init_data){
 			.name = "gcc_usb_hs_system_clk",
-			.parent_names = (const char *[]){
-				"usb_hs_system_clk_src",
+			.parent_hws = (const struct clk_hw*[]) {
+				&usb_hs_system_clk_src.clkr.hw,
 			},
 			.num_parents = 1,
 			.flags = CLK_SET_RATE_PARENT,
-- 
2.35.1

Re: [PATCH 10/15] clk: qcom: gcc-qcs404: use parent_hws/_data instead of parent_names

[Konrad Dybcio]

On 17.12.2022 01:17, Dmitry Baryshkov wrote:
> Convert the clock driver to specify parent data rather than parent
> names, to actually bind using 'clock-names' specified in the DTS rather
> than global clock names. Use parent_hws where possible to refer parent
> clocks directly, skipping the lookup.
> 
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>

Konrad
>  drivers/clk/qcom/gcc-qcs404.c | 515 ++++++++++++++++++----------------
>  1 file changed, 266 insertions(+), 249 deletions(-)
> 
> diff --git a/drivers/clk/qcom/gcc-qcs404.c b/drivers/clk/qcom/gcc-qcs404.c
> index 5ae7a6b2a326..3941175d73a5 100644
> --- a/drivers/clk/qcom/gcc-qcs404.c
> +++ b/drivers/clk/qcom/gcc-qcs404.c
> @@ -42,7 +42,9 @@ static struct clk_fixed_factor cxo = {
>  	.div = 1,
>  	.hw.init = &(struct clk_init_data){
>  		.name = "cxo",
> -		.parent_names = (const char *[]){ "xo-board" },
> +		.parent_data = &(const struct clk_parent_data) {
> +			.name = "xo-board",
> +		},
>  		.num_parents = 1,
>  		.ops = &clk_fixed_factor_ops,
>  	},
> @@ -57,7 +59,9 @@ static struct clk_alpha_pll gpll0_sleep_clk_src = {
>  		.enable_is_inverted = true,
>  		.hw.init = &(struct clk_init_data){
>  			.name = "gpll0_sleep_clk_src",
> -			.parent_names = (const char *[]){ "cxo" },
> +			.parent_data = &(const struct clk_parent_data) {
> +				.hw = &cxo.hw,
> +			},
>  			.num_parents = 1,
>  			.ops = &clk_alpha_pll_ops,
>  		},
> @@ -73,8 +77,9 @@ static struct clk_alpha_pll gpll0_out_main = {
>  		.enable_mask = BIT(0),
>  		.hw.init = &(struct clk_init_data){
>  			.name = "gpll0_out_main",
> -			.parent_names = (const char *[])
> -					{ "cxo" },
> +			.parent_data = &(const struct clk_parent_data) {
> +				.hw = &cxo.hw,
> +			},
>  			.num_parents = 1,
>  			.ops = &clk_alpha_pll_ops,
>  		},
> @@ -90,7 +95,9 @@ static struct clk_alpha_pll gpll0_ao_out_main = {
>  		.enable_mask = BIT(0),
>  		.hw.init = &(struct clk_init_data){
>  			.name = "gpll0_ao_out_main",
> -			.parent_names = (const char *[]){ "cxo" },
> +			.parent_data = &(const struct clk_parent_data) {
> +				.hw = &cxo.hw,
> +			},
>  			.num_parents = 1,
>  			.flags = CLK_IS_CRITICAL,
>  			.ops = &clk_alpha_pll_fixed_ops,
> @@ -106,7 +113,9 @@ static struct clk_alpha_pll gpll1_out_main = {
>  		.enable_mask = BIT(1),
>  		.hw.init = &(struct clk_init_data){
>  			.name = "gpll1_out_main",
> -			.parent_names = (const char *[]){ "cxo" },
> +			.parent_data = &(const struct clk_parent_data) {
> +				.hw = &cxo.hw,
> +			},
>  			.num_parents = 1,
>  			.ops = &clk_alpha_pll_ops,
>  		},
> @@ -137,7 +146,9 @@ static struct clk_alpha_pll gpll3_out_main = {
>  	.clkr = {
>  		.hw.init = &(struct clk_init_data){
>  			.name = "gpll3_out_main",
> -			.parent_names = (const char *[]){ "cxo" },
> +			.parent_data = &(const struct clk_parent_data) {
> +				.hw = &cxo.hw,
> +			},
>  			.num_parents = 1,
>  			.ops = &clk_alpha_pll_ops,
>  		},
> @@ -152,7 +163,9 @@ static struct clk_alpha_pll gpll4_out_main = {
>  		.enable_mask = BIT(5),
>  		.hw.init = &(struct clk_init_data){
>  			.name = "gpll4_out_main",
> -			.parent_names = (const char *[]){ "cxo" },
> +			.parent_data = &(const struct clk_parent_data) {
> +				.hw = &cxo.hw,
> +			},
>  			.num_parents = 1,
>  			.ops = &clk_alpha_pll_ops,
>  		},
> @@ -169,7 +182,9 @@ static struct clk_pll gpll6 = {
>  	.status_bit = 17,
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "gpll6",
> -		.parent_names = (const char *[]){ "cxo" },
> +		.parent_data = &(const struct clk_parent_data) {
> +			.hw = &cxo.hw,
> +		},
>  		.num_parents = 1,
>  		.ops = &clk_pll_ops,
>  	},
> @@ -180,7 +195,9 @@ static struct clk_regmap gpll6_out_aux = {
>  	.enable_mask = BIT(7),
>  	.hw.init = &(struct clk_init_data){
>  		.name = "gpll6_out_aux",
> -		.parent_names = (const char *[]){ "gpll6" },
> +		.parent_hws = (const struct clk_hw*[]) {
> +			&gpll6.clkr.hw,
> +		},
>  		.num_parents = 1,
>  		.ops = &clk_pll_vote_ops,
>  	},
> @@ -191,22 +208,22 @@ static const struct parent_map gcc_parent_map_0[] = {
>  	{ P_GPLL0_OUT_MAIN, 1 },
>  };
>  
> -static const char * const gcc_parent_names_0[] = {
> -	"cxo",
> -	"gpll0_out_main",
> +static const struct clk_parent_data gcc_parent_data_0[] = {
> +	{ .hw = &cxo.hw },
> +	{ .hw = &gpll0_out_main.clkr.hw },
>  };
>  
> -static const char * const gcc_parent_names_ao_0[] = {
> -	"cxo",
> -	"gpll0_ao_out_main",
> +static const struct clk_parent_data gcc_parent_data_ao_0[] = {
> +	{ .hw = &cxo.hw },
> +	{ .hw = &gpll0_ao_out_main.clkr.hw },
>  };
>  
>  static const struct parent_map gcc_parent_map_1[] = {
>  	{ P_XO, 0 },
>  };
>  
> -static const char * const gcc_parent_names_1[] = {
> -	"cxo",
> +static const struct clk_parent_data gcc_parent_data_1[] = {
> +	{ .hw = &cxo.hw },
>  };
>  
>  static const struct parent_map gcc_parent_map_2[] = {
> @@ -216,11 +233,11 @@ static const struct parent_map gcc_parent_map_2[] = {
>  	{ P_SLEEP_CLK, 6 },
>  };
>  
> -static const char * const gcc_parent_names_2[] = {
> -	"cxo",
> -	"gpll0_out_main",
> -	"gpll6_out_aux",
> -	"sleep_clk",
> +static const struct clk_parent_data gcc_parent_data_2[] = {
> +	{ .hw = &cxo.hw },
> +	{ .hw = &gpll0_out_main.clkr.hw },
> +	{ .hw = &gpll6_out_aux.hw },
> +	{ .fw_name = "sleep_clk", .name = "sleep_clk" },
>  };
>  
>  static const struct parent_map gcc_parent_map_3[] = {
> @@ -229,10 +246,10 @@ static const struct parent_map gcc_parent_map_3[] = {
>  	{ P_GPLL6_OUT_AUX, 2 },
>  };
>  
> -static const char * const gcc_parent_names_3[] = {
> -	"cxo",
> -	"gpll0_out_main",
> -	"gpll6_out_aux",
> +static const struct clk_parent_data gcc_parent_data_3[] = {
> +	{ .hw = &cxo.hw },
> +	{ .hw = &gpll0_out_main.clkr.hw },
> +	{ .hw = &gpll6_out_aux.hw },
>  };
>  
>  static const struct parent_map gcc_parent_map_4[] = {
> @@ -240,9 +257,9 @@ static const struct parent_map gcc_parent_map_4[] = {
>  	{ P_GPLL1_OUT_MAIN, 1 },
>  };
>  
> -static const char * const gcc_parent_names_4[] = {
> -	"cxo",
> -	"gpll1_out_main",
> +static const struct clk_parent_data gcc_parent_data_4[] = {
> +	{ .hw = &cxo.hw },
> +	{ .hw = &gpll1_out_main.clkr.hw },
>  };
>  
>  static const struct parent_map gcc_parent_map_5[] = {
> @@ -251,9 +268,9 @@ static const struct parent_map gcc_parent_map_5[] = {
>  	/* { P_GPLL0_OUT_AUX, 2 }, */
>  };
>  
> -static const char * const gcc_parent_names_5[] = {
> -	"cxo",
> -	"dsi0pllbyte",
> +static const struct clk_parent_data gcc_parent_data_5[] = {
> +	{ .hw = &cxo.hw },
> +	{ .fw_name = "dsi0pllbyte", .name = "dsi0pllbyte" },
>  	/* "gpll0_out_aux", */
>  };
>  
> @@ -263,9 +280,9 @@ static const struct parent_map gcc_parent_map_6[] = {
>  	/* { P_GPLL0_OUT_AUX, 3 }, */
>  };
>  
> -static const char * const gcc_parent_names_6[] = {
> -	"cxo",
> -	"dsi0pllbyte",
> +static const struct clk_parent_data gcc_parent_data_6[] = {
> +	{ .hw = &cxo.hw },
> +	{ .fw_name = "dsi0pllbyte", .name = "dsi0pllbyte" },
>  	/* "gpll0_out_aux", */
>  };
>  
> @@ -277,11 +294,11 @@ static const struct parent_map gcc_parent_map_7[] = {
>  	/* { P_GPLL4_OUT_AUX, 4 }, */
>  };
>  
> -static const char * const gcc_parent_names_7[] = {
> -	"cxo",
> -	"gpll0_out_main",
> -	"gpll3_out_main",
> -	"gpll6_out_aux",
> +static const struct clk_parent_data gcc_parent_data_7[] = {
> +	{ .hw = &cxo.hw },
> +	{ .hw = &gpll0_out_main.clkr.hw },
> +	{ .hw = &gpll3_out_main.clkr.hw },
> +	{ .hw = &gpll6_out_aux.hw },
>  	/* "gpll4_out_aux", */
>  };
>  
> @@ -290,9 +307,9 @@ static const struct parent_map gcc_parent_map_8[] = {
>  	{ P_HDMI_PHY_PLL_CLK, 1 },
>  };
>  
> -static const char * const gcc_parent_names_8[] = {
> -	"cxo",
> -	"hdmi_pll",
> +static const struct clk_parent_data gcc_parent_data_8[] = {
> +	{ .hw = &cxo.hw },
> +	{ .fw_name = "hdmi_pll", .name = "hdmi_pll" },
>  };
>  
>  static const struct parent_map gcc_parent_map_9[] = {
> @@ -302,11 +319,11 @@ static const struct parent_map gcc_parent_map_9[] = {
>  	{ P_GPLL6_OUT_AUX, 3 },
>  };
>  
> -static const char * const gcc_parent_names_9[] = {
> -	"cxo",
> -	"gpll0_out_main",
> -	"dsi0pll",
> -	"gpll6_out_aux",
> +static const struct clk_parent_data gcc_parent_data_9[] = {
> +	{ .hw = &cxo.hw },
> +	{ .hw = &gpll0_out_main.clkr.hw },
> +	{ .fw_name = "dsi0pll", .name = "dsi0pll" },
> +	{ .hw = &gpll6_out_aux.hw },
>  };
>  
>  static const struct parent_map gcc_parent_map_10[] = {
> @@ -314,9 +331,9 @@ static const struct parent_map gcc_parent_map_10[] = {
>  	{ P_SLEEP_CLK, 1 },
>  };
>  
> -static const char * const gcc_parent_names_10[] = {
> -	"cxo",
> -	"sleep_clk",
> +static const struct clk_parent_data gcc_parent_data_10[] = {
> +	{ .hw = &cxo.hw },
> +	{ .fw_name = "sleep_clk", .name = "sleep_clk" },
>  };
>  
>  static const struct parent_map gcc_parent_map_11[] = {
> @@ -324,9 +341,9 @@ static const struct parent_map gcc_parent_map_11[] = {
>  	{ P_PCIE_0_PIPE_CLK, 1 },
>  };
>  
> -static const char * const gcc_parent_names_11[] = {
> -	"cxo",
> -	"pcie_0_pipe_clk",
> +static const struct clk_parent_data gcc_parent_data_11[] = {
> +	{ .hw = &cxo.hw },
> +	{ .fw_name = "pcie_0_pipe_clk", .name = "pcie_0_pipe_clk" },
>  };
>  
>  static const struct parent_map gcc_parent_map_12[] = {
> @@ -335,9 +352,9 @@ static const struct parent_map gcc_parent_map_12[] = {
>  	/* { P_GPLL0_OUT_AUX, 2 }, */
>  };
>  
> -static const char * const gcc_parent_names_12[] = {
> -	"cxo",
> -	"dsi0pll",
> +static const struct clk_parent_data gcc_parent_data_12[] = {
> +	{ .hw = &cxo.hw },
> +	{ .fw_name = "dsi0pll", .name = "dsi0pll" },
>  	/* "gpll0_out_aux", */
>  };
>  
> @@ -348,11 +365,11 @@ static const struct parent_map gcc_parent_map_13[] = {
>  	{ P_GPLL6_OUT_AUX, 3 },
>  };
>  
> -static const char * const gcc_parent_names_13[] = {
> -	"cxo",
> -	"gpll0_out_main",
> -	"gpll4_out_main",
> -	"gpll6_out_aux",
> +static const struct clk_parent_data gcc_parent_data_13[] = {
> +	{ .hw = &cxo.hw },
> +	{ .hw = &gpll0_out_main.clkr.hw },
> +	{ .hw = &gpll4_out_main.clkr.hw },
> +	{ .hw = &gpll6_out_aux.hw },
>  };
>  
>  static const struct parent_map gcc_parent_map_14[] = {
> @@ -361,9 +378,9 @@ static const struct parent_map gcc_parent_map_14[] = {
>  	/* { P_GPLL4_OUT_AUX, 2 }, */
>  };
>  
> -static const char * const gcc_parent_names_14[] = {
> -	"cxo",
> -	"gpll0_out_main",
> +static const struct clk_parent_data gcc_parent_data_14[] = {
> +	{ .hw = &cxo.hw },
> +	{ .hw = &gpll0_out_main.clkr.hw },
>  	/* "gpll4_out_aux", */
>  };
>  
> @@ -372,8 +389,8 @@ static const struct parent_map gcc_parent_map_15[] = {
>  	/* { P_GPLL0_OUT_AUX, 2 }, */
>  };
>  
> -static const char * const gcc_parent_names_15[] = {
> -	"cxo",
> +static const struct clk_parent_data gcc_parent_data_15[] = {
> +	{ .hw = &cxo.hw },
>  	/* "gpll0_out_aux", */
>  };
>  
> @@ -383,9 +400,9 @@ static const struct parent_map gcc_parent_map_16[] = {
>  	/* { P_GPLL0_OUT_AUX, 2 }, */
>  };
>  
> -static const char * const gcc_parent_names_16[] = {
> -	"cxo",
> -	"gpll0_out_main",
> +static const struct clk_parent_data gcc_parent_data_16[] = {
> +	{ .hw = &cxo.hw },
> +	{ .hw = &gpll0_out_main.clkr.hw },
>  	/* "gpll0_out_aux", */
>  };
>  
> @@ -405,8 +422,8 @@ static struct clk_rcg2 apss_ahb_clk_src = {
>  	.freq_tbl = ftbl_apss_ahb_clk_src,
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "apss_ahb_clk_src",
> -		.parent_names = gcc_parent_names_ao_0,
> -		.num_parents = ARRAY_SIZE(gcc_parent_names_ao_0),
> +		.parent_data = gcc_parent_data_ao_0,
> +		.num_parents = ARRAY_SIZE(gcc_parent_data_ao_0),
>  		.flags = CLK_IS_CRITICAL,
>  		.ops = &clk_rcg2_ops,
>  	},
> @@ -426,8 +443,8 @@ static struct clk_rcg2 blsp1_qup0_i2c_apps_clk_src = {
>  	.freq_tbl = ftbl_blsp1_qup0_i2c_apps_clk_src,
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "blsp1_qup0_i2c_apps_clk_src",
> -		.parent_names = gcc_parent_names_0,
> -		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
> +		.parent_data = gcc_parent_data_0,
> +		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -451,8 +468,8 @@ static struct clk_rcg2 blsp1_qup0_spi_apps_clk_src = {
>  	.freq_tbl = ftbl_blsp1_qup0_spi_apps_clk_src,
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "blsp1_qup0_spi_apps_clk_src",
> -		.parent_names = gcc_parent_names_0,
> -		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
> +		.parent_data = gcc_parent_data_0,
> +		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -465,8 +482,8 @@ static struct clk_rcg2 blsp1_qup1_i2c_apps_clk_src = {
>  	.freq_tbl = ftbl_blsp1_qup0_i2c_apps_clk_src,
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "blsp1_qup1_i2c_apps_clk_src",
> -		.parent_names = gcc_parent_names_0,
> -		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
> +		.parent_data = gcc_parent_data_0,
> +		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -490,8 +507,8 @@ static struct clk_rcg2 blsp1_qup1_spi_apps_clk_src = {
>  	.freq_tbl = ftbl_blsp1_qup1_spi_apps_clk_src,
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "blsp1_qup1_spi_apps_clk_src",
> -		.parent_names = gcc_parent_names_0,
> -		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
> +		.parent_data = gcc_parent_data_0,
> +		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -504,8 +521,8 @@ static struct clk_rcg2 blsp1_qup2_i2c_apps_clk_src = {
>  	.freq_tbl = ftbl_blsp1_qup0_i2c_apps_clk_src,
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "blsp1_qup2_i2c_apps_clk_src",
> -		.parent_names = gcc_parent_names_0,
> -		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
> +		.parent_data = gcc_parent_data_0,
> +		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -530,8 +547,8 @@ static struct clk_rcg2 blsp1_qup2_spi_apps_clk_src = {
>  	.freq_tbl = ftbl_blsp1_qup2_spi_apps_clk_src,
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "blsp1_qup2_spi_apps_clk_src",
> -		.parent_names = gcc_parent_names_0,
> -		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
> +		.parent_data = gcc_parent_data_0,
> +		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -544,8 +561,8 @@ static struct clk_rcg2 blsp1_qup3_i2c_apps_clk_src = {
>  	.freq_tbl = ftbl_blsp1_qup0_i2c_apps_clk_src,
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "blsp1_qup3_i2c_apps_clk_src",
> -		.parent_names = gcc_parent_names_0,
> -		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
> +		.parent_data = gcc_parent_data_0,
> +		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -558,8 +575,8 @@ static struct clk_rcg2 blsp1_qup3_spi_apps_clk_src = {
>  	.freq_tbl = ftbl_blsp1_qup0_spi_apps_clk_src,
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "blsp1_qup3_spi_apps_clk_src",
> -		.parent_names = gcc_parent_names_0,
> -		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
> +		.parent_data = gcc_parent_data_0,
> +		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -572,8 +589,8 @@ static struct clk_rcg2 blsp1_qup4_i2c_apps_clk_src = {
>  	.freq_tbl = ftbl_blsp1_qup0_i2c_apps_clk_src,
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "blsp1_qup4_i2c_apps_clk_src",
> -		.parent_names = gcc_parent_names_0,
> -		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
> +		.parent_data = gcc_parent_data_0,
> +		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -586,8 +603,8 @@ static struct clk_rcg2 blsp1_qup4_spi_apps_clk_src = {
>  	.freq_tbl = ftbl_blsp1_qup0_spi_apps_clk_src,
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "blsp1_qup4_spi_apps_clk_src",
> -		.parent_names = gcc_parent_names_0,
> -		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
> +		.parent_data = gcc_parent_data_0,
> +		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -620,8 +637,8 @@ static struct clk_rcg2 blsp1_uart0_apps_clk_src = {
>  	.freq_tbl = ftbl_blsp1_uart0_apps_clk_src,
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "blsp1_uart0_apps_clk_src",
> -		.parent_names = gcc_parent_names_0,
> -		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
> +		.parent_data = gcc_parent_data_0,
> +		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -634,8 +651,8 @@ static struct clk_rcg2 blsp1_uart1_apps_clk_src = {
>  	.freq_tbl = ftbl_blsp1_uart0_apps_clk_src,
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "blsp1_uart1_apps_clk_src",
> -		.parent_names = gcc_parent_names_0,
> -		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
> +		.parent_data = gcc_parent_data_0,
> +		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -648,8 +665,8 @@ static struct clk_rcg2 blsp1_uart2_apps_clk_src = {
>  	.freq_tbl = ftbl_blsp1_uart0_apps_clk_src,
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "blsp1_uart2_apps_clk_src",
> -		.parent_names = gcc_parent_names_0,
> -		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
> +		.parent_data = gcc_parent_data_0,
> +		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -663,8 +680,8 @@ static struct clk_rcg2 blsp1_uart3_apps_clk_src = {
>  	.freq_tbl = ftbl_blsp1_uart0_apps_clk_src,
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "blsp1_uart3_apps_clk_src",
> -		.parent_names = gcc_parent_names_0,
> -		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
> +		.parent_data = gcc_parent_data_0,
> +		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -677,8 +694,8 @@ static struct clk_rcg2 blsp2_qup0_i2c_apps_clk_src = {
>  	.freq_tbl = ftbl_blsp1_qup0_i2c_apps_clk_src,
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "blsp2_qup0_i2c_apps_clk_src",
> -		.parent_names = gcc_parent_names_0,
> -		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
> +		.parent_data = gcc_parent_data_0,
> +		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -691,8 +708,8 @@ static struct clk_rcg2 blsp2_qup0_spi_apps_clk_src = {
>  	.freq_tbl = ftbl_blsp1_qup0_spi_apps_clk_src,
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "blsp2_qup0_spi_apps_clk_src",
> -		.parent_names = gcc_parent_names_0,
> -		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
> +		.parent_data = gcc_parent_data_0,
> +		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -705,8 +722,8 @@ static struct clk_rcg2 blsp2_uart0_apps_clk_src = {
>  	.freq_tbl = ftbl_blsp1_uart0_apps_clk_src,
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "blsp2_uart0_apps_clk_src",
> -		.parent_names = gcc_parent_names_0,
> -		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
> +		.parent_data = gcc_parent_data_0,
> +		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -718,8 +735,8 @@ static struct clk_rcg2 byte0_clk_src = {
>  	.parent_map = gcc_parent_map_5,
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "byte0_clk_src",
> -		.parent_names = gcc_parent_names_5,
> -		.num_parents = ARRAY_SIZE(gcc_parent_names_5),
> +		.parent_data = gcc_parent_data_5,
> +		.num_parents = ARRAY_SIZE(gcc_parent_data_5),
>  		.flags = CLK_SET_RATE_PARENT,
>  		.ops = &clk_byte2_ops,
>  	},
> @@ -741,8 +758,8 @@ static struct clk_rcg2 emac_clk_src = {
>  	.freq_tbl = ftbl_emac_clk_src,
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "emac_clk_src",
> -		.parent_names = gcc_parent_names_4,
> -		.num_parents = ARRAY_SIZE(gcc_parent_names_4),
> +		.parent_data = gcc_parent_data_4,
> +		.num_parents = ARRAY_SIZE(gcc_parent_data_4),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -762,8 +779,8 @@ static struct clk_rcg2 emac_ptp_clk_src = {
>  	.freq_tbl = ftbl_emac_ptp_clk_src,
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "emac_ptp_clk_src",
> -		.parent_names = gcc_parent_names_4,
> -		.num_parents = ARRAY_SIZE(gcc_parent_names_4),
> +		.parent_data = gcc_parent_data_4,
> +		.num_parents = ARRAY_SIZE(gcc_parent_data_4),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -781,8 +798,8 @@ static struct clk_rcg2 esc0_clk_src = {
>  	.freq_tbl = ftbl_esc0_clk_src,
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "esc0_clk_src",
> -		.parent_names = gcc_parent_names_6,
> -		.num_parents = ARRAY_SIZE(gcc_parent_names_6),
> +		.parent_data = gcc_parent_data_6,
> +		.num_parents = ARRAY_SIZE(gcc_parent_data_6),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -815,8 +832,8 @@ static struct clk_rcg2 gfx3d_clk_src = {
>  	.freq_tbl = ftbl_gfx3d_clk_src,
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "gfx3d_clk_src",
> -		.parent_names = gcc_parent_names_7,
> -		.num_parents = ARRAY_SIZE(gcc_parent_names_7),
> +		.parent_data = gcc_parent_data_7,
> +		.num_parents = ARRAY_SIZE(gcc_parent_data_7),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -836,8 +853,8 @@ static struct clk_rcg2 gp1_clk_src = {
>  	.freq_tbl = ftbl_gp1_clk_src,
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "gp1_clk_src",
> -		.parent_names = gcc_parent_names_2,
> -		.num_parents = ARRAY_SIZE(gcc_parent_names_2),
> +		.parent_data = gcc_parent_data_2,
> +		.num_parents = ARRAY_SIZE(gcc_parent_data_2),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -850,8 +867,8 @@ static struct clk_rcg2 gp2_clk_src = {
>  	.freq_tbl = ftbl_gp1_clk_src,
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "gp2_clk_src",
> -		.parent_names = gcc_parent_names_2,
> -		.num_parents = ARRAY_SIZE(gcc_parent_names_2),
> +		.parent_data = gcc_parent_data_2,
> +		.num_parents = ARRAY_SIZE(gcc_parent_data_2),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -864,8 +881,8 @@ static struct clk_rcg2 gp3_clk_src = {
>  	.freq_tbl = ftbl_gp1_clk_src,
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "gp3_clk_src",
> -		.parent_names = gcc_parent_names_2,
> -		.num_parents = ARRAY_SIZE(gcc_parent_names_2),
> +		.parent_data = gcc_parent_data_2,
> +		.num_parents = ARRAY_SIZE(gcc_parent_data_2),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -878,8 +895,8 @@ static struct clk_rcg2 hdmi_app_clk_src = {
>  	.freq_tbl = ftbl_esc0_clk_src,
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "hdmi_app_clk_src",
> -		.parent_names = gcc_parent_names_1,
> -		.num_parents = ARRAY_SIZE(gcc_parent_names_1),
> +		.parent_data = gcc_parent_data_1,
> +		.num_parents = ARRAY_SIZE(gcc_parent_data_1),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -892,8 +909,8 @@ static struct clk_rcg2 hdmi_pclk_clk_src = {
>  	.freq_tbl = ftbl_esc0_clk_src,
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "hdmi_pclk_clk_src",
> -		.parent_names = gcc_parent_names_8,
> -		.num_parents = ARRAY_SIZE(gcc_parent_names_8),
> +		.parent_data = gcc_parent_data_8,
> +		.num_parents = ARRAY_SIZE(gcc_parent_data_8),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -919,8 +936,8 @@ static struct clk_rcg2 mdp_clk_src = {
>  	.freq_tbl = ftbl_mdp_clk_src,
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "mdp_clk_src",
> -		.parent_names = gcc_parent_names_9,
> -		.num_parents = ARRAY_SIZE(gcc_parent_names_9),
> +		.parent_data = gcc_parent_data_9,
> +		.num_parents = ARRAY_SIZE(gcc_parent_data_9),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -938,8 +955,8 @@ static struct clk_rcg2 pcie_0_aux_clk_src = {
>  	.freq_tbl = ftbl_pcie_0_aux_clk_src,
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "pcie_0_aux_clk_src",
> -		.parent_names = gcc_parent_names_10,
> -		.num_parents = ARRAY_SIZE(gcc_parent_names_10),
> +		.parent_data = gcc_parent_data_10,
> +		.num_parents = ARRAY_SIZE(gcc_parent_data_10),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -959,8 +976,8 @@ static struct clk_rcg2 pcie_0_pipe_clk_src = {
>  	.freq_tbl = ftbl_pcie_0_pipe_clk_src,
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "pcie_0_pipe_clk_src",
> -		.parent_names = gcc_parent_names_11,
> -		.num_parents = ARRAY_SIZE(gcc_parent_names_11),
> +		.parent_data = gcc_parent_data_11,
> +		.num_parents = ARRAY_SIZE(gcc_parent_data_11),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -972,8 +989,8 @@ static struct clk_rcg2 pclk0_clk_src = {
>  	.parent_map = gcc_parent_map_12,
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "pclk0_clk_src",
> -		.parent_names = gcc_parent_names_12,
> -		.num_parents = ARRAY_SIZE(gcc_parent_names_12),
> +		.parent_data = gcc_parent_data_12,
> +		.num_parents = ARRAY_SIZE(gcc_parent_data_12),
>  		.flags = CLK_SET_RATE_PARENT,
>  		.ops = &clk_pixel_ops,
>  	},
> @@ -993,8 +1010,8 @@ static struct clk_rcg2 pdm2_clk_src = {
>  	.freq_tbl = ftbl_pdm2_clk_src,
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "pdm2_clk_src",
> -		.parent_names = gcc_parent_names_0,
> -		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
> +		.parent_data = gcc_parent_data_0,
> +		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -1021,8 +1038,8 @@ static struct clk_rcg2 sdcc1_apps_clk_src = {
>  	.freq_tbl = ftbl_sdcc1_apps_clk_src,
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "sdcc1_apps_clk_src",
> -		.parent_names = gcc_parent_names_13,
> -		.num_parents = ARRAY_SIZE(gcc_parent_names_13),
> +		.parent_data = gcc_parent_data_13,
> +		.num_parents = ARRAY_SIZE(gcc_parent_data_13),
>  		.ops = &clk_rcg2_floor_ops,
>  	},
>  };
> @@ -1041,8 +1058,8 @@ static struct clk_rcg2 sdcc1_ice_core_clk_src = {
>  	.freq_tbl = ftbl_sdcc1_ice_core_clk_src,
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "sdcc1_ice_core_clk_src",
> -		.parent_names = gcc_parent_names_3,
> -		.num_parents = ARRAY_SIZE(gcc_parent_names_3),
> +		.parent_data = gcc_parent_data_3,
> +		.num_parents = ARRAY_SIZE(gcc_parent_data_3),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -1067,8 +1084,8 @@ static struct clk_rcg2 sdcc2_apps_clk_src = {
>  	.freq_tbl = ftbl_sdcc2_apps_clk_src,
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "sdcc2_apps_clk_src",
> -		.parent_names = gcc_parent_names_14,
> -		.num_parents = ARRAY_SIZE(gcc_parent_names_14),
> +		.parent_data = gcc_parent_data_14,
> +		.num_parents = ARRAY_SIZE(gcc_parent_data_14),
>  		.ops = &clk_rcg2_floor_ops,
>  	},
>  };
> @@ -1081,8 +1098,8 @@ static struct clk_rcg2 usb20_mock_utmi_clk_src = {
>  	.freq_tbl = ftbl_esc0_clk_src,
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "usb20_mock_utmi_clk_src",
> -		.parent_names = gcc_parent_names_1,
> -		.num_parents = ARRAY_SIZE(gcc_parent_names_1),
> +		.parent_data = gcc_parent_data_1,
> +		.num_parents = ARRAY_SIZE(gcc_parent_data_1),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -1103,8 +1120,8 @@ static struct clk_rcg2 usb30_master_clk_src = {
>  	.freq_tbl = ftbl_usb30_master_clk_src,
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "usb30_master_clk_src",
> -		.parent_names = gcc_parent_names_0,
> -		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
> +		.parent_data = gcc_parent_data_0,
> +		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -1117,8 +1134,8 @@ static struct clk_rcg2 usb30_mock_utmi_clk_src = {
>  	.freq_tbl = ftbl_esc0_clk_src,
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "usb30_mock_utmi_clk_src",
> -		.parent_names = gcc_parent_names_1,
> -		.num_parents = ARRAY_SIZE(gcc_parent_names_1),
> +		.parent_data = gcc_parent_data_1,
> +		.num_parents = ARRAY_SIZE(gcc_parent_data_1),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -1131,8 +1148,8 @@ static struct clk_rcg2 usb3_phy_aux_clk_src = {
>  	.freq_tbl = ftbl_pcie_0_aux_clk_src,
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "usb3_phy_aux_clk_src",
> -		.parent_names = gcc_parent_names_1,
> -		.num_parents = ARRAY_SIZE(gcc_parent_names_1),
> +		.parent_data = gcc_parent_data_1,
> +		.num_parents = ARRAY_SIZE(gcc_parent_data_1),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -1154,8 +1171,8 @@ static struct clk_rcg2 usb_hs_system_clk_src = {
>  	.freq_tbl = ftbl_usb_hs_system_clk_src,
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "usb_hs_system_clk_src",
> -		.parent_names = gcc_parent_names_3,
> -		.num_parents = ARRAY_SIZE(gcc_parent_names_3),
> +		.parent_data = gcc_parent_data_3,
> +		.num_parents = ARRAY_SIZE(gcc_parent_data_3),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -1168,8 +1185,8 @@ static struct clk_rcg2 vsync_clk_src = {
>  	.freq_tbl = ftbl_esc0_clk_src,
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "vsync_clk_src",
> -		.parent_names = gcc_parent_names_15,
> -		.num_parents = ARRAY_SIZE(gcc_parent_names_15),
> +		.parent_data = gcc_parent_data_15,
> +		.num_parents = ARRAY_SIZE(gcc_parent_data_15),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -1190,8 +1207,8 @@ static struct clk_rcg2 cdsp_bimc_clk_src = {
>  	.freq_tbl = ftbl_cdsp_bimc_clk_src,
>  	.clkr.hw.init = &(struct clk_init_data) {
>  		.name = "cdsp_bimc_clk_src",
> -		.parent_names = gcc_parent_names_16,
> -		.num_parents = ARRAY_SIZE(gcc_parent_names_16),
> +		.parent_data = gcc_parent_data_16,
> +		.num_parents = ARRAY_SIZE(gcc_parent_data_16),
>  		.ops = &clk_rcg2_ops,
>  	},
>  };
> @@ -1204,8 +1221,8 @@ static struct clk_branch gcc_apss_ahb_clk = {
>  		.enable_mask = BIT(14),
>  		.hw.init = &(struct clk_init_data){
>  			.name = "gcc_apss_ahb_clk",
> -			.parent_names = (const char *[]){
> -				"apss_ahb_clk_src",
> +			.parent_hws = (const struct clk_hw*[]) {
> +				&apss_ahb_clk_src.clkr.hw,
>  			},
>  			.num_parents = 1,
>  			.flags = CLK_SET_RATE_PARENT,
> @@ -1236,8 +1253,8 @@ static struct clk_branch gcc_bimc_gfx_clk = {
>  		.hw.init = &(struct clk_init_data){
>  			.name = "gcc_bimc_gfx_clk",
>  			.ops = &clk_branch2_ops,
> -			.parent_names = (const char *[]){
> -				"gcc_apss_tcu_clk",
> +			.parent_hws = (const struct clk_hw*[]) {
> +				&gcc_apss_tcu_clk.clkr.hw,
>  			},
>  
>  		},
> @@ -1265,8 +1282,8 @@ static struct clk_branch gcc_bimc_cdsp_clk = {
>  		.enable_mask = BIT(0),
>  		.hw.init = &(struct clk_init_data) {
>  			.name = "gcc_bimc_cdsp_clk",
> -			.parent_names = (const char *[]) {
> -				"cdsp_bimc_clk_src",
> +			.parent_hws = (const struct clk_hw*[]) {
> +				&cdsp_bimc_clk_src.clkr.hw
>  			},
>  			.num_parents = 1,
>  			.flags = CLK_SET_RATE_PARENT,
> @@ -1335,8 +1352,8 @@ static struct clk_branch gcc_blsp1_qup0_i2c_apps_clk = {
>  		.enable_mask = BIT(0),
>  		.hw.init = &(struct clk_init_data){
>  			.name = "gcc_blsp1_qup0_i2c_apps_clk",
> -			.parent_names = (const char *[]){
> -				"blsp1_qup0_i2c_apps_clk_src",
> +			.parent_hws = (const struct clk_hw*[]) {
> +				&blsp1_qup0_i2c_apps_clk_src.clkr.hw,
>  			},
>  			.num_parents = 1,
>  			.flags = CLK_SET_RATE_PARENT,
> @@ -1353,8 +1370,8 @@ static struct clk_branch gcc_blsp1_qup0_spi_apps_clk = {
>  		.enable_mask = BIT(0),
>  		.hw.init = &(struct clk_init_data){
>  			.name = "gcc_blsp1_qup0_spi_apps_clk",
> -			.parent_names = (const char *[]){
> -				"blsp1_qup0_spi_apps_clk_src",
> +			.parent_hws = (const struct clk_hw*[]) {
> +				&blsp1_qup0_spi_apps_clk_src.clkr.hw,
>  			},
>  			.num_parents = 1,
>  			.flags = CLK_SET_RATE_PARENT,
> @@ -1371,8 +1388,8 @@ static struct clk_branch gcc_blsp1_qup1_i2c_apps_clk = {
>  		.enable_mask = BIT(0),
>  		.hw.init = &(struct clk_init_data){
>  			.name = "gcc_blsp1_qup1_i2c_apps_clk",
> -			.parent_names = (const char *[]){
> -				"blsp1_qup1_i2c_apps_clk_src",
> +			.parent_hws = (const struct clk_hw*[]) {
> +				&blsp1_qup1_i2c_apps_clk_src.clkr.hw,
>  			},
>  			.num_parents = 1,
>  			.flags = CLK_SET_RATE_PARENT,
> @@ -1389,8 +1406,8 @@ static struct clk_branch gcc_blsp1_qup1_spi_apps_clk = {
>  		.enable_mask = BIT(0),
>  		.hw.init = &(struct clk_init_data){
>  			.name = "gcc_blsp1_qup1_spi_apps_clk",
> -			.parent_names = (const char *[]){
> -				"blsp1_qup1_spi_apps_clk_src",
> +			.parent_hws = (const struct clk_hw*[]) {
> +				&blsp1_qup1_spi_apps_clk_src.clkr.hw,
>  			},
>  			.num_parents = 1,
>  			.flags = CLK_SET_RATE_PARENT,
> @@ -1407,8 +1424,8 @@ static struct clk_branch gcc_blsp1_qup2_i2c_apps_clk = {
>  		.enable_mask = BIT(0),
>  		.hw.init = &(struct clk_init_data){
>  			.name = "gcc_blsp1_qup2_i2c_apps_clk",
> -			.parent_names = (const char *[]){
> -				"blsp1_qup2_i2c_apps_clk_src",
> +			.parent_hws = (const struct clk_hw*[]) {
> +				&blsp1_qup2_i2c_apps_clk_src.clkr.hw,
>  			},
>  			.num_parents = 1,
>  			.flags = CLK_SET_RATE_PARENT,
> @@ -1425,8 +1442,8 @@ static struct clk_branch gcc_blsp1_qup2_spi_apps_clk = {
>  		.enable_mask = BIT(0),
>  		.hw.init = &(struct clk_init_data){
>  			.name = "gcc_blsp1_qup2_spi_apps_clk",
> -			.parent_names = (const char *[]){
> -				"blsp1_qup2_spi_apps_clk_src",
> +			.parent_hws = (const struct clk_hw*[]) {
> +				&blsp1_qup2_spi_apps_clk_src.clkr.hw,
>  			},
>  			.num_parents = 1,
>  			.flags = CLK_SET_RATE_PARENT,
> @@ -1443,8 +1460,8 @@ static struct clk_branch gcc_blsp1_qup3_i2c_apps_clk = {
>  		.enable_mask = BIT(0),
>  		.hw.init = &(struct clk_init_data){
>  			.name = "gcc_blsp1_qup3_i2c_apps_clk",
> -			.parent_names = (const char *[]){
> -				"blsp1_qup3_i2c_apps_clk_src",
> +			.parent_hws = (const struct clk_hw*[]) {
> +				&blsp1_qup3_i2c_apps_clk_src.clkr.hw,
>  			},
>  			.num_parents = 1,
>  			.flags = CLK_SET_RATE_PARENT,
> @@ -1461,8 +1478,8 @@ static struct clk_branch gcc_blsp1_qup3_spi_apps_clk = {
>  		.enable_mask = BIT(0),
>  		.hw.init = &(struct clk_init_data){
>  			.name = "gcc_blsp1_qup3_spi_apps_clk",
> -			.parent_names = (const char *[]){
> -				"blsp1_qup3_spi_apps_clk_src",
> +			.parent_hws = (const struct clk_hw*[]) {
> +				&blsp1_qup3_spi_apps_clk_src.clkr.hw,
>  			},
>  			.num_parents = 1,
>  			.flags = CLK_SET_RATE_PARENT,
> @@ -1479,8 +1496,8 @@ static struct clk_branch gcc_blsp1_qup4_i2c_apps_clk = {
>  		.enable_mask = BIT(0),
>  		.hw.init = &(struct clk_init_data){
>  			.name = "gcc_blsp1_qup4_i2c_apps_clk",
> -			.parent_names = (const char *[]){
> -				"blsp1_qup4_i2c_apps_clk_src",
> +			.parent_hws = (const struct clk_hw*[]) {
> +				&blsp1_qup4_i2c_apps_clk_src.clkr.hw,
>  			},
>  			.num_parents = 1,
>  			.flags = CLK_SET_RATE_PARENT,
> @@ -1497,8 +1514,8 @@ static struct clk_branch gcc_blsp1_qup4_spi_apps_clk = {
>  		.enable_mask = BIT(0),
>  		.hw.init = &(struct clk_init_data){
>  			.name = "gcc_blsp1_qup4_spi_apps_clk",
> -			.parent_names = (const char *[]){
> -				"blsp1_qup4_spi_apps_clk_src",
> +			.parent_hws = (const struct clk_hw*[]) {
> +				&blsp1_qup4_spi_apps_clk_src.clkr.hw,
>  			},
>  			.num_parents = 1,
>  			.flags = CLK_SET_RATE_PARENT,
> @@ -1515,8 +1532,8 @@ static struct clk_branch gcc_blsp1_uart0_apps_clk = {
>  		.enable_mask = BIT(0),
>  		.hw.init = &(struct clk_init_data){
>  			.name = "gcc_blsp1_uart0_apps_clk",
> -			.parent_names = (const char *[]){
> -				"blsp1_uart0_apps_clk_src",
> +			.parent_hws = (const struct clk_hw*[]) {
> +				&blsp1_uart0_apps_clk_src.clkr.hw,
>  			},
>  			.num_parents = 1,
>  			.flags = CLK_SET_RATE_PARENT,
> @@ -1533,8 +1550,8 @@ static struct clk_branch gcc_blsp1_uart1_apps_clk = {
>  		.enable_mask = BIT(0),
>  		.hw.init = &(struct clk_init_data){
>  			.name = "gcc_blsp1_uart1_apps_clk",
> -			.parent_names = (const char *[]){
> -				"blsp1_uart1_apps_clk_src",
> +			.parent_hws = (const struct clk_hw*[]) {
> +				&blsp1_uart1_apps_clk_src.clkr.hw,
>  			},
>  			.num_parents = 1,
>  			.flags = CLK_SET_RATE_PARENT,
> @@ -1551,8 +1568,8 @@ static struct clk_branch gcc_blsp1_uart2_apps_clk = {
>  		.enable_mask = BIT(0),
>  		.hw.init = &(struct clk_init_data){
>  			.name = "gcc_blsp1_uart2_apps_clk",
> -			.parent_names = (const char *[]){
> -				"blsp1_uart2_apps_clk_src",
> +			.parent_hws = (const struct clk_hw*[]) {
> +				&blsp1_uart2_apps_clk_src.clkr.hw,
>  			},
>  			.num_parents = 1,
>  			.flags = CLK_SET_RATE_PARENT,
> @@ -1569,8 +1586,8 @@ static struct clk_branch gcc_blsp1_uart3_apps_clk = {
>  		.enable_mask = BIT(0),
>  		.hw.init = &(struct clk_init_data){
>  			.name = "gcc_blsp1_uart3_apps_clk",
> -			.parent_names = (const char *[]){
> -				"blsp1_uart3_apps_clk_src",
> +			.parent_hws = (const struct clk_hw*[]) {
> +				&blsp1_uart3_apps_clk_src.clkr.hw,
>  			},
>  			.num_parents = 1,
>  			.flags = CLK_SET_RATE_PARENT,
> @@ -1600,8 +1617,8 @@ static struct clk_branch gcc_blsp2_qup0_i2c_apps_clk = {
>  		.enable_mask = BIT(0),
>  		.hw.init = &(struct clk_init_data){
>  			.name = "gcc_blsp2_qup0_i2c_apps_clk",
> -			.parent_names = (const char *[]){
> -				"blsp2_qup0_i2c_apps_clk_src",
> +			.parent_hws = (const struct clk_hw*[]) {
> +				&blsp2_qup0_i2c_apps_clk_src.clkr.hw,
>  			},
>  			.num_parents = 1,
>  			.flags = CLK_SET_RATE_PARENT,
> @@ -1618,8 +1635,8 @@ static struct clk_branch gcc_blsp2_qup0_spi_apps_clk = {
>  		.enable_mask = BIT(0),
>  		.hw.init = &(struct clk_init_data){
>  			.name = "gcc_blsp2_qup0_spi_apps_clk",
> -			.parent_names = (const char *[]){
> -				"blsp2_qup0_spi_apps_clk_src",
> +			.parent_hws = (const struct clk_hw*[]) {
> +				&blsp2_qup0_spi_apps_clk_src.clkr.hw,
>  			},
>  			.num_parents = 1,
>  			.flags = CLK_SET_RATE_PARENT,
> @@ -1636,8 +1653,8 @@ static struct clk_branch gcc_blsp2_uart0_apps_clk = {
>  		.enable_mask = BIT(0),
>  		.hw.init = &(struct clk_init_data){
>  			.name = "gcc_blsp2_uart0_apps_clk",
> -			.parent_names = (const char *[]){
> -				"blsp2_uart0_apps_clk_src",
> +			.parent_hws = (const struct clk_hw*[]) {
> +				&blsp2_uart0_apps_clk_src.clkr.hw,
>  			},
>  			.num_parents = 1,
>  			.flags = CLK_SET_RATE_PARENT,
> @@ -1719,8 +1736,8 @@ static struct clk_branch gcc_eth_ptp_clk = {
>  		.enable_mask = BIT(0),
>  		.hw.init = &(struct clk_init_data){
>  			.name = "gcc_eth_ptp_clk",
> -			.parent_names = (const char *[]){
> -				"emac_ptp_clk_src",
> +			.parent_hws = (const struct clk_hw*[]) {
> +				&emac_ptp_clk_src.clkr.hw,
>  			},
>  			.num_parents = 1,
>  			.flags = CLK_SET_RATE_PARENT,
> @@ -1737,8 +1754,8 @@ static struct clk_branch gcc_eth_rgmii_clk = {
>  		.enable_mask = BIT(0),
>  		.hw.init = &(struct clk_init_data){
>  			.name = "gcc_eth_rgmii_clk",
> -			.parent_names = (const char *[]){
> -				"emac_clk_src",
> +			.parent_hws = (const struct clk_hw*[]) {
> +				&emac_clk_src.clkr.hw,
>  			},
>  			.num_parents = 1,
>  			.flags = CLK_SET_RATE_PARENT,
> @@ -1820,8 +1837,8 @@ static struct clk_branch gcc_cdsp_tbu_clk = {
>  		.enable_mask = BIT(9),
>  		.hw.init = &(struct clk_init_data) {
>  			.name = "gcc_cdsp_tbu_clk",
> -			.parent_names = (const char *[]) {
> -				"cdsp_bimc_clk_src",
> +			.parent_hws = (const struct clk_hw*[]) {
> +				&cdsp_bimc_clk_src.clkr.hw
>  			},
>  			.num_parents = 1,
>  			.flags = CLK_SET_RATE_PARENT,
> @@ -1838,8 +1855,8 @@ static struct clk_branch gcc_gp1_clk = {
>  		.enable_mask = BIT(0),
>  		.hw.init = &(struct clk_init_data){
>  			.name = "gcc_gp1_clk",
> -			.parent_names = (const char *[]){
> -				"gp1_clk_src",
> +			.parent_hws = (const struct clk_hw*[]) {
> +				&gp1_clk_src.clkr.hw,
>  			},
>  			.num_parents = 1,
>  			.flags = CLK_SET_RATE_PARENT,
> @@ -1856,8 +1873,8 @@ static struct clk_branch gcc_gp2_clk = {
>  		.enable_mask = BIT(0),
>  		.hw.init = &(struct clk_init_data){
>  			.name = "gcc_gp2_clk",
> -			.parent_names = (const char *[]){
> -				"gp2_clk_src",
> +			.parent_hws = (const struct clk_hw*[]) {
> +				&gp2_clk_src.clkr.hw,
>  			},
>  			.num_parents = 1,
>  			.flags = CLK_SET_RATE_PARENT,
> @@ -1874,8 +1891,8 @@ static struct clk_branch gcc_gp3_clk = {
>  		.enable_mask = BIT(0),
>  		.hw.init = &(struct clk_init_data){
>  			.name = "gcc_gp3_clk",
> -			.parent_names = (const char *[]){
> -				"gp3_clk_src",
> +			.parent_hws = (const struct clk_hw*[]) {
> +				&gp3_clk_src.clkr.hw,
>  			},
>  			.num_parents = 1,
>  			.flags = CLK_SET_RATE_PARENT,
> @@ -1944,8 +1961,8 @@ static struct clk_branch gcc_mdss_byte0_clk = {
>  		.enable_mask = BIT(0),
>  		.hw.init = &(struct clk_init_data){
>  			.name = "gcc_mdss_byte0_clk",
> -			.parent_names = (const char *[]){
> -				"byte0_clk_src",
> +			.parent_hws = (const struct clk_hw*[]) {
> +				&byte0_clk_src.clkr.hw,
>  			},
>  			.num_parents = 1,
>  			.flags = CLK_SET_RATE_PARENT,
> @@ -1962,8 +1979,8 @@ static struct clk_branch gcc_mdss_esc0_clk = {
>  		.enable_mask = BIT(0),
>  		.hw.init = &(struct clk_init_data){
>  			.name = "gcc_mdss_esc0_clk",
> -			.parent_names = (const char *[]){
> -				"esc0_clk_src",
> +			.parent_hws = (const struct clk_hw*[]) {
> +				&esc0_clk_src.clkr.hw,
>  			},
>  			.num_parents = 1,
>  			.flags = CLK_SET_RATE_PARENT,
> @@ -1980,8 +1997,8 @@ static struct clk_branch gcc_mdss_hdmi_app_clk = {
>  		.enable_mask = BIT(0),
>  		.hw.init = &(struct clk_init_data){
>  			.name = "gcc_mdss_hdmi_app_clk",
> -			.parent_names = (const char *[]){
> -				"hdmi_app_clk_src",
> +			.parent_hws = (const struct clk_hw*[]) {
> +				&hdmi_app_clk_src.clkr.hw,
>  			},
>  			.num_parents = 1,
>  			.flags = CLK_SET_RATE_PARENT,
> @@ -1998,8 +2015,8 @@ static struct clk_branch gcc_mdss_hdmi_pclk_clk = {
>  		.enable_mask = BIT(0),
>  		.hw.init = &(struct clk_init_data){
>  			.name = "gcc_mdss_hdmi_pclk_clk",
> -			.parent_names = (const char *[]){
> -				"hdmi_pclk_clk_src",
> +			.parent_hws = (const struct clk_hw*[]) {
> +				&hdmi_pclk_clk_src.clkr.hw,
>  			},
>  			.num_parents = 1,
>  			.flags = CLK_SET_RATE_PARENT,
> @@ -2016,8 +2033,8 @@ static struct clk_branch gcc_mdss_mdp_clk = {
>  		.enable_mask = BIT(0),
>  		.hw.init = &(struct clk_init_data){
>  			.name = "gcc_mdss_mdp_clk",
> -			.parent_names = (const char *[]){
> -				"mdp_clk_src",
> +			.parent_hws = (const struct clk_hw*[]) {
> +				&mdp_clk_src.clkr.hw,
>  			},
>  			.num_parents = 1,
>  			.flags = CLK_SET_RATE_PARENT,
> @@ -2034,8 +2051,8 @@ static struct clk_branch gcc_mdss_pclk0_clk = {
>  		.enable_mask = BIT(0),
>  		.hw.init = &(struct clk_init_data){
>  			.name = "gcc_mdss_pclk0_clk",
> -			.parent_names = (const char *[]){
> -				"pclk0_clk_src",
> +			.parent_hws = (const struct clk_hw*[]) {
> +				&pclk0_clk_src.clkr.hw,
>  			},
>  			.num_parents = 1,
>  			.flags = CLK_SET_RATE_PARENT,
> @@ -2052,8 +2069,8 @@ static struct clk_branch gcc_mdss_vsync_clk = {
>  		.enable_mask = BIT(0),
>  		.hw.init = &(struct clk_init_data){
>  			.name = "gcc_mdss_vsync_clk",
> -			.parent_names = (const char *[]){
> -				"vsync_clk_src",
> +			.parent_hws = (const struct clk_hw*[]) {
> +				&vsync_clk_src.clkr.hw,
>  			},
>  			.num_parents = 1,
>  			.flags = CLK_SET_RATE_PARENT,
> @@ -2083,8 +2100,8 @@ static struct clk_branch gcc_oxili_gfx3d_clk = {
>  		.enable_mask = BIT(0),
>  		.hw.init = &(struct clk_init_data){
>  			.name = "gcc_oxili_gfx3d_clk",
> -			.parent_names = (const char *[]){
> -				"gfx3d_clk_src",
> +			.parent_hws = (const struct clk_hw*[]) {
> +				&gfx3d_clk_src.clkr.hw,
>  			},
>  			.num_parents = 1,
>  			.flags = CLK_SET_RATE_PARENT,
> @@ -2101,8 +2118,8 @@ static struct clk_branch gcc_pcie_0_aux_clk = {
>  		.enable_mask = BIT(27),
>  		.hw.init = &(struct clk_init_data){
>  			.name = "gcc_pcie_0_aux_clk",
> -			.parent_names = (const char *[]){
> -				"pcie_0_aux_clk_src",
> +			.parent_hws = (const struct clk_hw*[]) {
> +				&pcie_0_aux_clk_src.clkr.hw,
>  			},
>  			.num_parents = 1,
>  			.flags = CLK_SET_RATE_PARENT,
> @@ -2145,8 +2162,8 @@ static struct clk_branch gcc_pcie_0_pipe_clk = {
>  		.enable_mask = BIT(28),
>  		.hw.init = &(struct clk_init_data){
>  			.name = "gcc_pcie_0_pipe_clk",
> -			.parent_names = (const char *[]){
> -				"pcie_0_pipe_clk_src",
> +			.parent_hws = (const struct clk_hw*[]) {
> +				&pcie_0_pipe_clk_src.clkr.hw,
>  			},
>  			.num_parents = 1,
>  			.flags = CLK_SET_RATE_PARENT,
> @@ -2204,8 +2221,8 @@ static struct clk_branch gcc_pdm2_clk = {
>  		.enable_mask = BIT(0),
>  		.hw.init = &(struct clk_init_data){
>  			.name = "gcc_pdm2_clk",
> -			.parent_names = (const char *[]){
> -				"pdm2_clk_src",
> +			.parent_hws = (const struct clk_hw*[]) {
> +				&pdm2_clk_src.clkr.hw,
>  			},
>  			.num_parents = 1,
>  			.flags = CLK_SET_RATE_PARENT,
> @@ -2314,8 +2331,8 @@ static struct clk_branch gcc_sdcc1_apps_clk = {
>  		.enable_mask = BIT(0),
>  		.hw.init = &(struct clk_init_data){
>  			.name = "gcc_sdcc1_apps_clk",
> -			.parent_names = (const char *[]){
> -				"sdcc1_apps_clk_src",
> +			.parent_hws = (const struct clk_hw*[]) {
> +				&sdcc1_apps_clk_src.clkr.hw,
>  			},
>  			.num_parents = 1,
>  			.flags = CLK_SET_RATE_PARENT,
> @@ -2332,8 +2349,8 @@ static struct clk_branch gcc_sdcc1_ice_core_clk = {
>  		.enable_mask = BIT(0),
>  		.hw.init = &(struct clk_init_data){
>  			.name = "gcc_sdcc1_ice_core_clk",
> -			.parent_names = (const char *[]){
> -				"sdcc1_ice_core_clk_src",
> +			.parent_hws = (const struct clk_hw*[]) {
> +				&sdcc1_ice_core_clk_src.clkr.hw,
>  			},
>  			.num_parents = 1,
>  			.flags = CLK_SET_RATE_PARENT,
> @@ -2376,8 +2393,8 @@ static struct clk_branch gcc_sdcc2_apps_clk = {
>  		.enable_mask = BIT(0),
>  		.hw.init = &(struct clk_init_data){
>  			.name = "gcc_sdcc2_apps_clk",
> -			.parent_names = (const char *[]){
> -				"sdcc2_apps_clk_src",
> +			.parent_hws = (const struct clk_hw*[]) {
> +				&sdcc2_apps_clk_src.clkr.hw,
>  			},
>  			.num_parents = 1,
>  			.flags = CLK_SET_RATE_PARENT,
> @@ -2407,8 +2424,8 @@ static struct clk_branch gcc_sys_noc_usb3_clk = {
>  		.enable_mask = BIT(0),
>  		.hw.init = &(struct clk_init_data){
>  			.name = "gcc_sys_noc_usb3_clk",
> -			.parent_names = (const char *[]){
> -				"usb30_master_clk_src",
> +			.parent_hws = (const struct clk_hw*[]) {
> +				&usb30_master_clk_src.clkr.hw,
>  			},
>  			.num_parents = 1,
>  			.ops = &clk_branch2_ops,
> @@ -2437,8 +2454,8 @@ static struct clk_branch gcc_usb20_mock_utmi_clk = {
>  		.enable_mask = BIT(0),
>  		.hw.init = &(struct clk_init_data){
>  			.name = "gcc_usb20_mock_utmi_clk",
> -			.parent_names = (const char *[]){
> -				"usb20_mock_utmi_clk_src",
> +			.parent_hws = (const struct clk_hw*[]) {
> +				&usb20_mock_utmi_clk_src.clkr.hw,
>  			},
>  			.num_parents = 1,
>  			.flags = CLK_SET_RATE_PARENT,
> @@ -2468,8 +2485,8 @@ static struct clk_branch gcc_usb30_master_clk = {
>  		.enable_mask = BIT(0),
>  		.hw.init = &(struct clk_init_data){
>  			.name = "gcc_usb30_master_clk",
> -			.parent_names = (const char *[]){
> -				"usb30_master_clk_src",
> +			.parent_hws = (const struct clk_hw*[]) {
> +				&usb30_master_clk_src.clkr.hw,
>  			},
>  			.num_parents = 1,
>  			.flags = CLK_SET_RATE_PARENT,
> @@ -2486,8 +2503,8 @@ static struct clk_branch gcc_usb30_mock_utmi_clk = {
>  		.enable_mask = BIT(0),
>  		.hw.init = &(struct clk_init_data){
>  			.name = "gcc_usb30_mock_utmi_clk",
> -			.parent_names = (const char *[]){
> -				"usb30_mock_utmi_clk_src",
> +			.parent_hws = (const struct clk_hw*[]) {
> +				&usb30_mock_utmi_clk_src.clkr.hw,
>  			},
>  			.num_parents = 1,
>  			.flags = CLK_SET_RATE_PARENT,
> @@ -2517,8 +2534,8 @@ static struct clk_branch gcc_usb3_phy_aux_clk = {
>  		.enable_mask = BIT(0),
>  		.hw.init = &(struct clk_init_data){
>  			.name = "gcc_usb3_phy_aux_clk",
> -			.parent_names = (const char *[]){
> -				"usb3_phy_aux_clk_src",
> +			.parent_hws = (const struct clk_hw*[]) {
> +				&usb3_phy_aux_clk_src.clkr.hw,
>  			},
>  			.num_parents = 1,
>  			.flags = CLK_SET_RATE_PARENT,
> @@ -2560,8 +2577,8 @@ static struct clk_branch gcc_usb_hs_system_clk = {
>  		.enable_mask = BIT(0),
>  		.hw.init = &(struct clk_init_data){
>  			.name = "gcc_usb_hs_system_clk",
> -			.parent_names = (const char *[]){
> -				"usb_hs_system_clk_src",
> +			.parent_hws = (const struct clk_hw*[]) {
> +				&usb_hs_system_clk_src.clkr.hw,
>  			},
>  			.num_parents = 1,
>  			.flags = CLK_SET_RATE_PARENT,

Re: [PATCH 10/15] clk: qcom: gcc-qcs404: use parent_hws/_data instead of parent_names

[Konrad Dybcio]

On 17.12.2022 16:13, Konrad Dybcio wrote:
> 
> 
> On 17.12.2022 01:17, Dmitry Baryshkov wrote:
>> Convert the clock driver to specify parent data rather than parent
>> names, to actually bind using 'clock-names' specified in the DTS rather
>> than global clock names. Use parent_hws where possible to refer parent
>> clocks directly, skipping the lookup.
>>
>> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
>> ---
> Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
> 
> Konrad
Actually, on a second thought - why not switch to .index
like on the newer clk drivers?

Konrad
>>  drivers/clk/qcom/gcc-qcs404.c | 515 ++++++++++++++++++----------------
>>  1 file changed, 266 insertions(+), 249 deletions(-)
>>
>> diff --git a/drivers/clk/qcom/gcc-qcs404.c b/drivers/clk/qcom/gcc-qcs404.c
>> index 5ae7a6b2a326..3941175d73a5 100644
>> --- a/drivers/clk/qcom/gcc-qcs404.c
>> +++ b/drivers/clk/qcom/gcc-qcs404.c
>> @@ -42,7 +42,9 @@ static struct clk_fixed_factor cxo = {
>>  	.div = 1,
>>  	.hw.init = &(struct clk_init_data){
>>  		.name = "cxo",
>> -		.parent_names = (const char *[]){ "xo-board" },
>> +		.parent_data = &(const struct clk_parent_data) {
>> +			.name = "xo-board",
>> +		},
>>  		.num_parents = 1,
>>  		.ops = &clk_fixed_factor_ops,
>>  	},
>> @@ -57,7 +59,9 @@ static struct clk_alpha_pll gpll0_sleep_clk_src = {
>>  		.enable_is_inverted = true,
>>  		.hw.init = &(struct clk_init_data){
>>  			.name = "gpll0_sleep_clk_src",
>> -			.parent_names = (const char *[]){ "cxo" },
>> +			.parent_data = &(const struct clk_parent_data) {
>> +				.hw = &cxo.hw,
>> +			},
>>  			.num_parents = 1,
>>  			.ops = &clk_alpha_pll_ops,
>>  		},
>> @@ -73,8 +77,9 @@ static struct clk_alpha_pll gpll0_out_main = {
>>  		.enable_mask = BIT(0),
>>  		.hw.init = &(struct clk_init_data){
>>  			.name = "gpll0_out_main",
>> -			.parent_names = (const char *[])
>> -					{ "cxo" },
>> +			.parent_data = &(const struct clk_parent_data) {
>> +				.hw = &cxo.hw,
>> +			},
>>  			.num_parents = 1,
>>  			.ops = &clk_alpha_pll_ops,
>>  		},
>> @@ -90,7 +95,9 @@ static struct clk_alpha_pll gpll0_ao_out_main = {
>>  		.enable_mask = BIT(0),
>>  		.hw.init = &(struct clk_init_data){
>>  			.name = "gpll0_ao_out_main",
>> -			.parent_names = (const char *[]){ "cxo" },
>> +			.parent_data = &(const struct clk_parent_data) {
>> +				.hw = &cxo.hw,
>> +			},
>>  			.num_parents = 1,
>>  			.flags = CLK_IS_CRITICAL,
>>  			.ops = &clk_alpha_pll_fixed_ops,
>> @@ -106,7 +113,9 @@ static struct clk_alpha_pll gpll1_out_main = {
>>  		.enable_mask = BIT(1),
>>  		.hw.init = &(struct clk_init_data){
>>  			.name = "gpll1_out_main",
>> -			.parent_names = (const char *[]){ "cxo" },
>> +			.parent_data = &(const struct clk_parent_data) {
>> +				.hw = &cxo.hw,
>> +			},
>>  			.num_parents = 1,
>>  			.ops = &clk_alpha_pll_ops,
>>  		},
>> @@ -137,7 +146,9 @@ static struct clk_alpha_pll gpll3_out_main = {
>>  	.clkr = {
>>  		.hw.init = &(struct clk_init_data){
>>  			.name = "gpll3_out_main",
>> -			.parent_names = (const char *[]){ "cxo" },
>> +			.parent_data = &(const struct clk_parent_data) {
>> +				.hw = &cxo.hw,
>> +			},
>>  			.num_parents = 1,
>>  			.ops = &clk_alpha_pll_ops,
>>  		},
>> @@ -152,7 +163,9 @@ static struct clk_alpha_pll gpll4_out_main = {
>>  		.enable_mask = BIT(5),
>>  		.hw.init = &(struct clk_init_data){
>>  			.name = "gpll4_out_main",
>> -			.parent_names = (const char *[]){ "cxo" },
>> +			.parent_data = &(const struct clk_parent_data) {
>> +				.hw = &cxo.hw,
>> +			},
>>  			.num_parents = 1,
>>  			.ops = &clk_alpha_pll_ops,
>>  		},
>> @@ -169,7 +182,9 @@ static struct clk_pll gpll6 = {
>>  	.status_bit = 17,
>>  	.clkr.hw.init = &(struct clk_init_data){
>>  		.name = "gpll6",
>> -		.parent_names = (const char *[]){ "cxo" },
>> +		.parent_data = &(const struct clk_parent_data) {
>> +			.hw = &cxo.hw,
>> +		},
>>  		.num_parents = 1,
>>  		.ops = &clk_pll_ops,
>>  	},
>> @@ -180,7 +195,9 @@ static struct clk_regmap gpll6_out_aux = {
>>  	.enable_mask = BIT(7),
>>  	.hw.init = &(struct clk_init_data){
>>  		.name = "gpll6_out_aux",
>> -		.parent_names = (const char *[]){ "gpll6" },
>> +		.parent_hws = (const struct clk_hw*[]) {
>> +			&gpll6.clkr.hw,
>> +		},
>>  		.num_parents = 1,
>>  		.ops = &clk_pll_vote_ops,
>>  	},
>> @@ -191,22 +208,22 @@ static const struct parent_map gcc_parent_map_0[] = {
>>  	{ P_GPLL0_OUT_MAIN, 1 },
>>  };
>>  
>> -static const char * const gcc_parent_names_0[] = {
>> -	"cxo",
>> -	"gpll0_out_main",
>> +static const struct clk_parent_data gcc_parent_data_0[] = {
>> +	{ .hw = &cxo.hw },
>> +	{ .hw = &gpll0_out_main.clkr.hw },
>>  };
>>  
>> -static const char * const gcc_parent_names_ao_0[] = {
>> -	"cxo",
>> -	"gpll0_ao_out_main",
>> +static const struct clk_parent_data gcc_parent_data_ao_0[] = {
>> +	{ .hw = &cxo.hw },
>> +	{ .hw = &gpll0_ao_out_main.clkr.hw },
>>  };
>>  
>>  static const struct parent_map gcc_parent_map_1[] = {
>>  	{ P_XO, 0 },
>>  };
>>  
>> -static const char * const gcc_parent_names_1[] = {
>> -	"cxo",
>> +static const struct clk_parent_data gcc_parent_data_1[] = {
>> +	{ .hw = &cxo.hw },
>>  };
>>  
>>  static const struct parent_map gcc_parent_map_2[] = {
>> @@ -216,11 +233,11 @@ static const struct parent_map gcc_parent_map_2[] = {
>>  	{ P_SLEEP_CLK, 6 },
>>  };
>>  
>> -static const char * const gcc_parent_names_2[] = {
>> -	"cxo",
>> -	"gpll0_out_main",
>> -	"gpll6_out_aux",
>> -	"sleep_clk",
>> +static const struct clk_parent_data gcc_parent_data_2[] = {
>> +	{ .hw = &cxo.hw },
>> +	{ .hw = &gpll0_out_main.clkr.hw },
>> +	{ .hw = &gpll6_out_aux.hw },
>> +	{ .fw_name = "sleep_clk", .name = "sleep_clk" },
>>  };
>>  
>>  static const struct parent_map gcc_parent_map_3[] = {
>> @@ -229,10 +246,10 @@ static const struct parent_map gcc_parent_map_3[] = {
>>  	{ P_GPLL6_OUT_AUX, 2 },
>>  };
>>  
>> -static const char * const gcc_parent_names_3[] = {
>> -	"cxo",
>> -	"gpll0_out_main",
>> -	"gpll6_out_aux",
>> +static const struct clk_parent_data gcc_parent_data_3[] = {
>> +	{ .hw = &cxo.hw },
>> +	{ .hw = &gpll0_out_main.clkr.hw },
>> +	{ .hw = &gpll6_out_aux.hw },
>>  };
>>  
>>  static const struct parent_map gcc_parent_map_4[] = {
>> @@ -240,9 +257,9 @@ static const struct parent_map gcc_parent_map_4[] = {
>>  	{ P_GPLL1_OUT_MAIN, 1 },
>>  };
>>  
>> -static const char * const gcc_parent_names_4[] = {
>> -	"cxo",
>> -	"gpll1_out_main",
>> +static const struct clk_parent_data gcc_parent_data_4[] = {
>> +	{ .hw = &cxo.hw },
>> +	{ .hw = &gpll1_out_main.clkr.hw },
>>  };
>>  
>>  static const struct parent_map gcc_parent_map_5[] = {
>> @@ -251,9 +268,9 @@ static const struct parent_map gcc_parent_map_5[] = {
>>  	/* { P_GPLL0_OUT_AUX, 2 }, */
>>  };
>>  
>> -static const char * const gcc_parent_names_5[] = {
>> -	"cxo",
>> -	"dsi0pllbyte",
>> +static const struct clk_parent_data gcc_parent_data_5[] = {
>> +	{ .hw = &cxo.hw },
>> +	{ .fw_name = "dsi0pllbyte", .name = "dsi0pllbyte" },
>>  	/* "gpll0_out_aux", */
>>  };
>>  
>> @@ -263,9 +280,9 @@ static const struct parent_map gcc_parent_map_6[] = {
>>  	/* { P_GPLL0_OUT_AUX, 3 }, */
>>  };
>>  
>> -static const char * const gcc_parent_names_6[] = {
>> -	"cxo",
>> -	"dsi0pllbyte",
>> +static const struct clk_parent_data gcc_parent_data_6[] = {
>> +	{ .hw = &cxo.hw },
>> +	{ .fw_name = "dsi0pllbyte", .name = "dsi0pllbyte" },
>>  	/* "gpll0_out_aux", */
>>  };
>>  
>> @@ -277,11 +294,11 @@ static const struct parent_map gcc_parent_map_7[] = {
>>  	/* { P_GPLL4_OUT_AUX, 4 }, */
>>  };
>>  
>> -static const char * const gcc_parent_names_7[] = {
>> -	"cxo",
>> -	"gpll0_out_main",
>> -	"gpll3_out_main",
>> -	"gpll6_out_aux",
>> +static const struct clk_parent_data gcc_parent_data_7[] = {
>> +	{ .hw = &cxo.hw },
>> +	{ .hw = &gpll0_out_main.clkr.hw },
>> +	{ .hw = &gpll3_out_main.clkr.hw },
>> +	{ .hw = &gpll6_out_aux.hw },
>>  	/* "gpll4_out_aux", */
>>  };
>>  
>> @@ -290,9 +307,9 @@ static const struct parent_map gcc_parent_map_8[] = {
>>  	{ P_HDMI_PHY_PLL_CLK, 1 },
>>  };
>>  
>> -static const char * const gcc_parent_names_8[] = {
>> -	"cxo",
>> -	"hdmi_pll",
>> +static const struct clk_parent_data gcc_parent_data_8[] = {
>> +	{ .hw = &cxo.hw },
>> +	{ .fw_name = "hdmi_pll", .name = "hdmi_pll" },
>>  };
>>  
>>  static const struct parent_map gcc_parent_map_9[] = {
>> @@ -302,11 +319,11 @@ static const struct parent_map gcc_parent_map_9[] = {
>>  	{ P_GPLL6_OUT_AUX, 3 },
>>  };
>>  
>> -static const char * const gcc_parent_names_9[] = {
>> -	"cxo",
>> -	"gpll0_out_main",
>> -	"dsi0pll",
>> -	"gpll6_out_aux",
>> +static const struct clk_parent_data gcc_parent_data_9[] = {
>> +	{ .hw = &cxo.hw },
>> +	{ .hw = &gpll0_out_main.clkr.hw },
>> +	{ .fw_name = "dsi0pll", .name = "dsi0pll" },
>> +	{ .hw = &gpll6_out_aux.hw },
>>  };
>>  
>>  static const struct parent_map gcc_parent_map_10[] = {
>> @@ -314,9 +331,9 @@ static const struct parent_map gcc_parent_map_10[] = {
>>  	{ P_SLEEP_CLK, 1 },
>>  };
>>  
>> -static const char * const gcc_parent_names_10[] = {
>> -	"cxo",
>> -	"sleep_clk",
>> +static const struct clk_parent_data gcc_parent_data_10[] = {
>> +	{ .hw = &cxo.hw },
>> +	{ .fw_name = "sleep_clk", .name = "sleep_clk" },
>>  };
>>  
>>  static const struct parent_map gcc_parent_map_11[] = {
>> @@ -324,9 +341,9 @@ static const struct parent_map gcc_parent_map_11[] = {
>>  	{ P_PCIE_0_PIPE_CLK, 1 },
>>  };
>>  
>> -static const char * const gcc_parent_names_11[] = {
>> -	"cxo",
>> -	"pcie_0_pipe_clk",
>> +static const struct clk_parent_data gcc_parent_data_11[] = {
>> +	{ .hw = &cxo.hw },
>> +	{ .fw_name = "pcie_0_pipe_clk", .name = "pcie_0_pipe_clk" },
>>  };
>>  
>>  static const struct parent_map gcc_parent_map_12[] = {
>> @@ -335,9 +352,9 @@ static const struct parent_map gcc_parent_map_12[] = {
>>  	/* { P_GPLL0_OUT_AUX, 2 }, */
>>  };
>>  
>> -static const char * const gcc_parent_names_12[] = {
>> -	"cxo",
>> -	"dsi0pll",
>> +static const struct clk_parent_data gcc_parent_data_12[] = {
>> +	{ .hw = &cxo.hw },
>> +	{ .fw_name = "dsi0pll", .name = "dsi0pll" },
>>  	/* "gpll0_out_aux", */
>>  };
>>  
>> @@ -348,11 +365,11 @@ static const struct parent_map gcc_parent_map_13[] = {
>>  	{ P_GPLL6_OUT_AUX, 3 },
>>  };
>>  
>> -static const char * const gcc_parent_names_13[] = {
>> -	"cxo",
>> -	"gpll0_out_main",
>> -	"gpll4_out_main",
>> -	"gpll6_out_aux",
>> +static const struct clk_parent_data gcc_parent_data_13[] = {
>> +	{ .hw = &cxo.hw },
>> +	{ .hw = &gpll0_out_main.clkr.hw },
>> +	{ .hw = &gpll4_out_main.clkr.hw },
>> +	{ .hw = &gpll6_out_aux.hw },
>>  };
>>  
>>  static const struct parent_map gcc_parent_map_14[] = {
>> @@ -361,9 +378,9 @@ static const struct parent_map gcc_parent_map_14[] = {
>>  	/* { P_GPLL4_OUT_AUX, 2 }, */
>>  };
>>  
>> -static const char * const gcc_parent_names_14[] = {
>> -	"cxo",
>> -	"gpll0_out_main",
>> +static const struct clk_parent_data gcc_parent_data_14[] = {
>> +	{ .hw = &cxo.hw },
>> +	{ .hw = &gpll0_out_main.clkr.hw },
>>  	/* "gpll4_out_aux", */
>>  };
>>  
>> @@ -372,8 +389,8 @@ static const struct parent_map gcc_parent_map_15[] = {
>>  	/* { P_GPLL0_OUT_AUX, 2 }, */
>>  };
>>  
>> -static const char * const gcc_parent_names_15[] = {
>> -	"cxo",
>> +static const struct clk_parent_data gcc_parent_data_15[] = {
>> +	{ .hw = &cxo.hw },
>>  	/* "gpll0_out_aux", */
>>  };
>>  
>> @@ -383,9 +400,9 @@ static const struct parent_map gcc_parent_map_16[] = {
>>  	/* { P_GPLL0_OUT_AUX, 2 }, */
>>  };
>>  
>> -static const char * const gcc_parent_names_16[] = {
>> -	"cxo",
>> -	"gpll0_out_main",
>> +static const struct clk_parent_data gcc_parent_data_16[] = {
>> +	{ .hw = &cxo.hw },
>> +	{ .hw = &gpll0_out_main.clkr.hw },
>>  	/* "gpll0_out_aux", */
>>  };
>>  
>> @@ -405,8 +422,8 @@ static struct clk_rcg2 apss_ahb_clk_src = {
>>  	.freq_tbl = ftbl_apss_ahb_clk_src,
>>  	.clkr.hw.init = &(struct clk_init_data){
>>  		.name = "apss_ahb_clk_src",
>> -		.parent_names = gcc_parent_names_ao_0,
>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_ao_0),
>> +		.parent_data = gcc_parent_data_ao_0,
>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_ao_0),
>>  		.flags = CLK_IS_CRITICAL,
>>  		.ops = &clk_rcg2_ops,
>>  	},
>> @@ -426,8 +443,8 @@ static struct clk_rcg2 blsp1_qup0_i2c_apps_clk_src = {
>>  	.freq_tbl = ftbl_blsp1_qup0_i2c_apps_clk_src,
>>  	.clkr.hw.init = &(struct clk_init_data){
>>  		.name = "blsp1_qup0_i2c_apps_clk_src",
>> -		.parent_names = gcc_parent_names_0,
>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
>> +		.parent_data = gcc_parent_data_0,
>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
>>  		.ops = &clk_rcg2_ops,
>>  	},
>>  };
>> @@ -451,8 +468,8 @@ static struct clk_rcg2 blsp1_qup0_spi_apps_clk_src = {
>>  	.freq_tbl = ftbl_blsp1_qup0_spi_apps_clk_src,
>>  	.clkr.hw.init = &(struct clk_init_data){
>>  		.name = "blsp1_qup0_spi_apps_clk_src",
>> -		.parent_names = gcc_parent_names_0,
>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
>> +		.parent_data = gcc_parent_data_0,
>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
>>  		.ops = &clk_rcg2_ops,
>>  	},
>>  };
>> @@ -465,8 +482,8 @@ static struct clk_rcg2 blsp1_qup1_i2c_apps_clk_src = {
>>  	.freq_tbl = ftbl_blsp1_qup0_i2c_apps_clk_src,
>>  	.clkr.hw.init = &(struct clk_init_data){
>>  		.name = "blsp1_qup1_i2c_apps_clk_src",
>> -		.parent_names = gcc_parent_names_0,
>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
>> +		.parent_data = gcc_parent_data_0,
>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
>>  		.ops = &clk_rcg2_ops,
>>  	},
>>  };
>> @@ -490,8 +507,8 @@ static struct clk_rcg2 blsp1_qup1_spi_apps_clk_src = {
>>  	.freq_tbl = ftbl_blsp1_qup1_spi_apps_clk_src,
>>  	.clkr.hw.init = &(struct clk_init_data){
>>  		.name = "blsp1_qup1_spi_apps_clk_src",
>> -		.parent_names = gcc_parent_names_0,
>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
>> +		.parent_data = gcc_parent_data_0,
>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
>>  		.ops = &clk_rcg2_ops,
>>  	},
>>  };
>> @@ -504,8 +521,8 @@ static struct clk_rcg2 blsp1_qup2_i2c_apps_clk_src = {
>>  	.freq_tbl = ftbl_blsp1_qup0_i2c_apps_clk_src,
>>  	.clkr.hw.init = &(struct clk_init_data){
>>  		.name = "blsp1_qup2_i2c_apps_clk_src",
>> -		.parent_names = gcc_parent_names_0,
>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
>> +		.parent_data = gcc_parent_data_0,
>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
>>  		.ops = &clk_rcg2_ops,
>>  	},
>>  };
>> @@ -530,8 +547,8 @@ static struct clk_rcg2 blsp1_qup2_spi_apps_clk_src = {
>>  	.freq_tbl = ftbl_blsp1_qup2_spi_apps_clk_src,
>>  	.clkr.hw.init = &(struct clk_init_data){
>>  		.name = "blsp1_qup2_spi_apps_clk_src",
>> -		.parent_names = gcc_parent_names_0,
>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
>> +		.parent_data = gcc_parent_data_0,
>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
>>  		.ops = &clk_rcg2_ops,
>>  	},
>>  };
>> @@ -544,8 +561,8 @@ static struct clk_rcg2 blsp1_qup3_i2c_apps_clk_src = {
>>  	.freq_tbl = ftbl_blsp1_qup0_i2c_apps_clk_src,
>>  	.clkr.hw.init = &(struct clk_init_data){
>>  		.name = "blsp1_qup3_i2c_apps_clk_src",
>> -		.parent_names = gcc_parent_names_0,
>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
>> +		.parent_data = gcc_parent_data_0,
>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
>>  		.ops = &clk_rcg2_ops,
>>  	},
>>  };
>> @@ -558,8 +575,8 @@ static struct clk_rcg2 blsp1_qup3_spi_apps_clk_src = {
>>  	.freq_tbl = ftbl_blsp1_qup0_spi_apps_clk_src,
>>  	.clkr.hw.init = &(struct clk_init_data){
>>  		.name = "blsp1_qup3_spi_apps_clk_src",
>> -		.parent_names = gcc_parent_names_0,
>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
>> +		.parent_data = gcc_parent_data_0,
>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
>>  		.ops = &clk_rcg2_ops,
>>  	},
>>  };
>> @@ -572,8 +589,8 @@ static struct clk_rcg2 blsp1_qup4_i2c_apps_clk_src = {
>>  	.freq_tbl = ftbl_blsp1_qup0_i2c_apps_clk_src,
>>  	.clkr.hw.init = &(struct clk_init_data){
>>  		.name = "blsp1_qup4_i2c_apps_clk_src",
>> -		.parent_names = gcc_parent_names_0,
>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
>> +		.parent_data = gcc_parent_data_0,
>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
>>  		.ops = &clk_rcg2_ops,
>>  	},
>>  };
>> @@ -586,8 +603,8 @@ static struct clk_rcg2 blsp1_qup4_spi_apps_clk_src = {
>>  	.freq_tbl = ftbl_blsp1_qup0_spi_apps_clk_src,
>>  	.clkr.hw.init = &(struct clk_init_data){
>>  		.name = "blsp1_qup4_spi_apps_clk_src",
>> -		.parent_names = gcc_parent_names_0,
>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
>> +		.parent_data = gcc_parent_data_0,
>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
>>  		.ops = &clk_rcg2_ops,
>>  	},
>>  };
>> @@ -620,8 +637,8 @@ static struct clk_rcg2 blsp1_uart0_apps_clk_src = {
>>  	.freq_tbl = ftbl_blsp1_uart0_apps_clk_src,
>>  	.clkr.hw.init = &(struct clk_init_data){
>>  		.name = "blsp1_uart0_apps_clk_src",
>> -		.parent_names = gcc_parent_names_0,
>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
>> +		.parent_data = gcc_parent_data_0,
>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
>>  		.ops = &clk_rcg2_ops,
>>  	},
>>  };
>> @@ -634,8 +651,8 @@ static struct clk_rcg2 blsp1_uart1_apps_clk_src = {
>>  	.freq_tbl = ftbl_blsp1_uart0_apps_clk_src,
>>  	.clkr.hw.init = &(struct clk_init_data){
>>  		.name = "blsp1_uart1_apps_clk_src",
>> -		.parent_names = gcc_parent_names_0,
>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
>> +		.parent_data = gcc_parent_data_0,
>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
>>  		.ops = &clk_rcg2_ops,
>>  	},
>>  };
>> @@ -648,8 +665,8 @@ static struct clk_rcg2 blsp1_uart2_apps_clk_src = {
>>  	.freq_tbl = ftbl_blsp1_uart0_apps_clk_src,
>>  	.clkr.hw.init = &(struct clk_init_data){
>>  		.name = "blsp1_uart2_apps_clk_src",
>> -		.parent_names = gcc_parent_names_0,
>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
>> +		.parent_data = gcc_parent_data_0,
>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
>>  		.ops = &clk_rcg2_ops,
>>  	},
>>  };
>> @@ -663,8 +680,8 @@ static struct clk_rcg2 blsp1_uart3_apps_clk_src = {
>>  	.freq_tbl = ftbl_blsp1_uart0_apps_clk_src,
>>  	.clkr.hw.init = &(struct clk_init_data){
>>  		.name = "blsp1_uart3_apps_clk_src",
>> -		.parent_names = gcc_parent_names_0,
>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
>> +		.parent_data = gcc_parent_data_0,
>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
>>  		.ops = &clk_rcg2_ops,
>>  	},
>>  };
>> @@ -677,8 +694,8 @@ static struct clk_rcg2 blsp2_qup0_i2c_apps_clk_src = {
>>  	.freq_tbl = ftbl_blsp1_qup0_i2c_apps_clk_src,
>>  	.clkr.hw.init = &(struct clk_init_data){
>>  		.name = "blsp2_qup0_i2c_apps_clk_src",
>> -		.parent_names = gcc_parent_names_0,
>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
>> +		.parent_data = gcc_parent_data_0,
>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
>>  		.ops = &clk_rcg2_ops,
>>  	},
>>  };
>> @@ -691,8 +708,8 @@ static struct clk_rcg2 blsp2_qup0_spi_apps_clk_src = {
>>  	.freq_tbl = ftbl_blsp1_qup0_spi_apps_clk_src,
>>  	.clkr.hw.init = &(struct clk_init_data){
>>  		.name = "blsp2_qup0_spi_apps_clk_src",
>> -		.parent_names = gcc_parent_names_0,
>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
>> +		.parent_data = gcc_parent_data_0,
>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
>>  		.ops = &clk_rcg2_ops,
>>  	},
>>  };
>> @@ -705,8 +722,8 @@ static struct clk_rcg2 blsp2_uart0_apps_clk_src = {
>>  	.freq_tbl = ftbl_blsp1_uart0_apps_clk_src,
>>  	.clkr.hw.init = &(struct clk_init_data){
>>  		.name = "blsp2_uart0_apps_clk_src",
>> -		.parent_names = gcc_parent_names_0,
>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
>> +		.parent_data = gcc_parent_data_0,
>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
>>  		.ops = &clk_rcg2_ops,
>>  	},
>>  };
>> @@ -718,8 +735,8 @@ static struct clk_rcg2 byte0_clk_src = {
>>  	.parent_map = gcc_parent_map_5,
>>  	.clkr.hw.init = &(struct clk_init_data){
>>  		.name = "byte0_clk_src",
>> -		.parent_names = gcc_parent_names_5,
>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_5),
>> +		.parent_data = gcc_parent_data_5,
>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_5),
>>  		.flags = CLK_SET_RATE_PARENT,
>>  		.ops = &clk_byte2_ops,
>>  	},
>> @@ -741,8 +758,8 @@ static struct clk_rcg2 emac_clk_src = {
>>  	.freq_tbl = ftbl_emac_clk_src,
>>  	.clkr.hw.init = &(struct clk_init_data){
>>  		.name = "emac_clk_src",
>> -		.parent_names = gcc_parent_names_4,
>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_4),
>> +		.parent_data = gcc_parent_data_4,
>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_4),
>>  		.ops = &clk_rcg2_ops,
>>  	},
>>  };
>> @@ -762,8 +779,8 @@ static struct clk_rcg2 emac_ptp_clk_src = {
>>  	.freq_tbl = ftbl_emac_ptp_clk_src,
>>  	.clkr.hw.init = &(struct clk_init_data){
>>  		.name = "emac_ptp_clk_src",
>> -		.parent_names = gcc_parent_names_4,
>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_4),
>> +		.parent_data = gcc_parent_data_4,
>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_4),
>>  		.ops = &clk_rcg2_ops,
>>  	},
>>  };
>> @@ -781,8 +798,8 @@ static struct clk_rcg2 esc0_clk_src = {
>>  	.freq_tbl = ftbl_esc0_clk_src,
>>  	.clkr.hw.init = &(struct clk_init_data){
>>  		.name = "esc0_clk_src",
>> -		.parent_names = gcc_parent_names_6,
>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_6),
>> +		.parent_data = gcc_parent_data_6,
>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_6),
>>  		.ops = &clk_rcg2_ops,
>>  	},
>>  };
>> @@ -815,8 +832,8 @@ static struct clk_rcg2 gfx3d_clk_src = {
>>  	.freq_tbl = ftbl_gfx3d_clk_src,
>>  	.clkr.hw.init = &(struct clk_init_data){
>>  		.name = "gfx3d_clk_src",
>> -		.parent_names = gcc_parent_names_7,
>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_7),
>> +		.parent_data = gcc_parent_data_7,
>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_7),
>>  		.ops = &clk_rcg2_ops,
>>  	},
>>  };
>> @@ -836,8 +853,8 @@ static struct clk_rcg2 gp1_clk_src = {
>>  	.freq_tbl = ftbl_gp1_clk_src,
>>  	.clkr.hw.init = &(struct clk_init_data){
>>  		.name = "gp1_clk_src",
>> -		.parent_names = gcc_parent_names_2,
>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_2),
>> +		.parent_data = gcc_parent_data_2,
>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_2),
>>  		.ops = &clk_rcg2_ops,
>>  	},
>>  };
>> @@ -850,8 +867,8 @@ static struct clk_rcg2 gp2_clk_src = {
>>  	.freq_tbl = ftbl_gp1_clk_src,
>>  	.clkr.hw.init = &(struct clk_init_data){
>>  		.name = "gp2_clk_src",
>> -		.parent_names = gcc_parent_names_2,
>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_2),
>> +		.parent_data = gcc_parent_data_2,
>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_2),
>>  		.ops = &clk_rcg2_ops,
>>  	},
>>  };
>> @@ -864,8 +881,8 @@ static struct clk_rcg2 gp3_clk_src = {
>>  	.freq_tbl = ftbl_gp1_clk_src,
>>  	.clkr.hw.init = &(struct clk_init_data){
>>  		.name = "gp3_clk_src",
>> -		.parent_names = gcc_parent_names_2,
>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_2),
>> +		.parent_data = gcc_parent_data_2,
>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_2),
>>  		.ops = &clk_rcg2_ops,
>>  	},
>>  };
>> @@ -878,8 +895,8 @@ static struct clk_rcg2 hdmi_app_clk_src = {
>>  	.freq_tbl = ftbl_esc0_clk_src,
>>  	.clkr.hw.init = &(struct clk_init_data){
>>  		.name = "hdmi_app_clk_src",
>> -		.parent_names = gcc_parent_names_1,
>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_1),
>> +		.parent_data = gcc_parent_data_1,
>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_1),
>>  		.ops = &clk_rcg2_ops,
>>  	},
>>  };
>> @@ -892,8 +909,8 @@ static struct clk_rcg2 hdmi_pclk_clk_src = {
>>  	.freq_tbl = ftbl_esc0_clk_src,
>>  	.clkr.hw.init = &(struct clk_init_data){
>>  		.name = "hdmi_pclk_clk_src",
>> -		.parent_names = gcc_parent_names_8,
>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_8),
>> +		.parent_data = gcc_parent_data_8,
>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_8),
>>  		.ops = &clk_rcg2_ops,
>>  	},
>>  };
>> @@ -919,8 +936,8 @@ static struct clk_rcg2 mdp_clk_src = {
>>  	.freq_tbl = ftbl_mdp_clk_src,
>>  	.clkr.hw.init = &(struct clk_init_data){
>>  		.name = "mdp_clk_src",
>> -		.parent_names = gcc_parent_names_9,
>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_9),
>> +		.parent_data = gcc_parent_data_9,
>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_9),
>>  		.ops = &clk_rcg2_ops,
>>  	},
>>  };
>> @@ -938,8 +955,8 @@ static struct clk_rcg2 pcie_0_aux_clk_src = {
>>  	.freq_tbl = ftbl_pcie_0_aux_clk_src,
>>  	.clkr.hw.init = &(struct clk_init_data){
>>  		.name = "pcie_0_aux_clk_src",
>> -		.parent_names = gcc_parent_names_10,
>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_10),
>> +		.parent_data = gcc_parent_data_10,
>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_10),
>>  		.ops = &clk_rcg2_ops,
>>  	},
>>  };
>> @@ -959,8 +976,8 @@ static struct clk_rcg2 pcie_0_pipe_clk_src = {
>>  	.freq_tbl = ftbl_pcie_0_pipe_clk_src,
>>  	.clkr.hw.init = &(struct clk_init_data){
>>  		.name = "pcie_0_pipe_clk_src",
>> -		.parent_names = gcc_parent_names_11,
>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_11),
>> +		.parent_data = gcc_parent_data_11,
>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_11),
>>  		.ops = &clk_rcg2_ops,
>>  	},
>>  };
>> @@ -972,8 +989,8 @@ static struct clk_rcg2 pclk0_clk_src = {
>>  	.parent_map = gcc_parent_map_12,
>>  	.clkr.hw.init = &(struct clk_init_data){
>>  		.name = "pclk0_clk_src",
>> -		.parent_names = gcc_parent_names_12,
>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_12),
>> +		.parent_data = gcc_parent_data_12,
>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_12),
>>  		.flags = CLK_SET_RATE_PARENT,
>>  		.ops = &clk_pixel_ops,
>>  	},
>> @@ -993,8 +1010,8 @@ static struct clk_rcg2 pdm2_clk_src = {
>>  	.freq_tbl = ftbl_pdm2_clk_src,
>>  	.clkr.hw.init = &(struct clk_init_data){
>>  		.name = "pdm2_clk_src",
>> -		.parent_names = gcc_parent_names_0,
>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
>> +		.parent_data = gcc_parent_data_0,
>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
>>  		.ops = &clk_rcg2_ops,
>>  	},
>>  };
>> @@ -1021,8 +1038,8 @@ static struct clk_rcg2 sdcc1_apps_clk_src = {
>>  	.freq_tbl = ftbl_sdcc1_apps_clk_src,
>>  	.clkr.hw.init = &(struct clk_init_data){
>>  		.name = "sdcc1_apps_clk_src",
>> -		.parent_names = gcc_parent_names_13,
>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_13),
>> +		.parent_data = gcc_parent_data_13,
>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_13),
>>  		.ops = &clk_rcg2_floor_ops,
>>  	},
>>  };
>> @@ -1041,8 +1058,8 @@ static struct clk_rcg2 sdcc1_ice_core_clk_src = {
>>  	.freq_tbl = ftbl_sdcc1_ice_core_clk_src,
>>  	.clkr.hw.init = &(struct clk_init_data){
>>  		.name = "sdcc1_ice_core_clk_src",
>> -		.parent_names = gcc_parent_names_3,
>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_3),
>> +		.parent_data = gcc_parent_data_3,
>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_3),
>>  		.ops = &clk_rcg2_ops,
>>  	},
>>  };
>> @@ -1067,8 +1084,8 @@ static struct clk_rcg2 sdcc2_apps_clk_src = {
>>  	.freq_tbl = ftbl_sdcc2_apps_clk_src,
>>  	.clkr.hw.init = &(struct clk_init_data){
>>  		.name = "sdcc2_apps_clk_src",
>> -		.parent_names = gcc_parent_names_14,
>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_14),
>> +		.parent_data = gcc_parent_data_14,
>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_14),
>>  		.ops = &clk_rcg2_floor_ops,
>>  	},
>>  };
>> @@ -1081,8 +1098,8 @@ static struct clk_rcg2 usb20_mock_utmi_clk_src = {
>>  	.freq_tbl = ftbl_esc0_clk_src,
>>  	.clkr.hw.init = &(struct clk_init_data){
>>  		.name = "usb20_mock_utmi_clk_src",
>> -		.parent_names = gcc_parent_names_1,
>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_1),
>> +		.parent_data = gcc_parent_data_1,
>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_1),
>>  		.ops = &clk_rcg2_ops,
>>  	},
>>  };
>> @@ -1103,8 +1120,8 @@ static struct clk_rcg2 usb30_master_clk_src = {
>>  	.freq_tbl = ftbl_usb30_master_clk_src,
>>  	.clkr.hw.init = &(struct clk_init_data){
>>  		.name = "usb30_master_clk_src",
>> -		.parent_names = gcc_parent_names_0,
>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
>> +		.parent_data = gcc_parent_data_0,
>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
>>  		.ops = &clk_rcg2_ops,
>>  	},
>>  };
>> @@ -1117,8 +1134,8 @@ static struct clk_rcg2 usb30_mock_utmi_clk_src = {
>>  	.freq_tbl = ftbl_esc0_clk_src,
>>  	.clkr.hw.init = &(struct clk_init_data){
>>  		.name = "usb30_mock_utmi_clk_src",
>> -		.parent_names = gcc_parent_names_1,
>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_1),
>> +		.parent_data = gcc_parent_data_1,
>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_1),
>>  		.ops = &clk_rcg2_ops,
>>  	},
>>  };
>> @@ -1131,8 +1148,8 @@ static struct clk_rcg2 usb3_phy_aux_clk_src = {
>>  	.freq_tbl = ftbl_pcie_0_aux_clk_src,
>>  	.clkr.hw.init = &(struct clk_init_data){
>>  		.name = "usb3_phy_aux_clk_src",
>> -		.parent_names = gcc_parent_names_1,
>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_1),
>> +		.parent_data = gcc_parent_data_1,
>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_1),
>>  		.ops = &clk_rcg2_ops,
>>  	},
>>  };
>> @@ -1154,8 +1171,8 @@ static struct clk_rcg2 usb_hs_system_clk_src = {
>>  	.freq_tbl = ftbl_usb_hs_system_clk_src,
>>  	.clkr.hw.init = &(struct clk_init_data){
>>  		.name = "usb_hs_system_clk_src",
>> -		.parent_names = gcc_parent_names_3,
>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_3),
>> +		.parent_data = gcc_parent_data_3,
>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_3),
>>  		.ops = &clk_rcg2_ops,
>>  	},
>>  };
>> @@ -1168,8 +1185,8 @@ static struct clk_rcg2 vsync_clk_src = {
>>  	.freq_tbl = ftbl_esc0_clk_src,
>>  	.clkr.hw.init = &(struct clk_init_data){
>>  		.name = "vsync_clk_src",
>> -		.parent_names = gcc_parent_names_15,
>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_15),
>> +		.parent_data = gcc_parent_data_15,
>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_15),
>>  		.ops = &clk_rcg2_ops,
>>  	},
>>  };
>> @@ -1190,8 +1207,8 @@ static struct clk_rcg2 cdsp_bimc_clk_src = {
>>  	.freq_tbl = ftbl_cdsp_bimc_clk_src,
>>  	.clkr.hw.init = &(struct clk_init_data) {
>>  		.name = "cdsp_bimc_clk_src",
>> -		.parent_names = gcc_parent_names_16,
>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_16),
>> +		.parent_data = gcc_parent_data_16,
>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_16),
>>  		.ops = &clk_rcg2_ops,
>>  	},
>>  };
>> @@ -1204,8 +1221,8 @@ static struct clk_branch gcc_apss_ahb_clk = {
>>  		.enable_mask = BIT(14),
>>  		.hw.init = &(struct clk_init_data){
>>  			.name = "gcc_apss_ahb_clk",
>> -			.parent_names = (const char *[]){
>> -				"apss_ahb_clk_src",
>> +			.parent_hws = (const struct clk_hw*[]) {
>> +				&apss_ahb_clk_src.clkr.hw,
>>  			},
>>  			.num_parents = 1,
>>  			.flags = CLK_SET_RATE_PARENT,
>> @@ -1236,8 +1253,8 @@ static struct clk_branch gcc_bimc_gfx_clk = {
>>  		.hw.init = &(struct clk_init_data){
>>  			.name = "gcc_bimc_gfx_clk",
>>  			.ops = &clk_branch2_ops,
>> -			.parent_names = (const char *[]){
>> -				"gcc_apss_tcu_clk",
>> +			.parent_hws = (const struct clk_hw*[]) {
>> +				&gcc_apss_tcu_clk.clkr.hw,
>>  			},
>>  
>>  		},
>> @@ -1265,8 +1282,8 @@ static struct clk_branch gcc_bimc_cdsp_clk = {
>>  		.enable_mask = BIT(0),
>>  		.hw.init = &(struct clk_init_data) {
>>  			.name = "gcc_bimc_cdsp_clk",
>> -			.parent_names = (const char *[]) {
>> -				"cdsp_bimc_clk_src",
>> +			.parent_hws = (const struct clk_hw*[]) {
>> +				&cdsp_bimc_clk_src.clkr.hw
>>  			},
>>  			.num_parents = 1,
>>  			.flags = CLK_SET_RATE_PARENT,
>> @@ -1335,8 +1352,8 @@ static struct clk_branch gcc_blsp1_qup0_i2c_apps_clk = {
>>  		.enable_mask = BIT(0),
>>  		.hw.init = &(struct clk_init_data){
>>  			.name = "gcc_blsp1_qup0_i2c_apps_clk",
>> -			.parent_names = (const char *[]){
>> -				"blsp1_qup0_i2c_apps_clk_src",
>> +			.parent_hws = (const struct clk_hw*[]) {
>> +				&blsp1_qup0_i2c_apps_clk_src.clkr.hw,
>>  			},
>>  			.num_parents = 1,
>>  			.flags = CLK_SET_RATE_PARENT,
>> @@ -1353,8 +1370,8 @@ static struct clk_branch gcc_blsp1_qup0_spi_apps_clk = {
>>  		.enable_mask = BIT(0),
>>  		.hw.init = &(struct clk_init_data){
>>  			.name = "gcc_blsp1_qup0_spi_apps_clk",
>> -			.parent_names = (const char *[]){
>> -				"blsp1_qup0_spi_apps_clk_src",
>> +			.parent_hws = (const struct clk_hw*[]) {
>> +				&blsp1_qup0_spi_apps_clk_src.clkr.hw,
>>  			},
>>  			.num_parents = 1,
>>  			.flags = CLK_SET_RATE_PARENT,
>> @@ -1371,8 +1388,8 @@ static struct clk_branch gcc_blsp1_qup1_i2c_apps_clk = {
>>  		.enable_mask = BIT(0),
>>  		.hw.init = &(struct clk_init_data){
>>  			.name = "gcc_blsp1_qup1_i2c_apps_clk",
>> -			.parent_names = (const char *[]){
>> -				"blsp1_qup1_i2c_apps_clk_src",
>> +			.parent_hws = (const struct clk_hw*[]) {
>> +				&blsp1_qup1_i2c_apps_clk_src.clkr.hw,
>>  			},
>>  			.num_parents = 1,
>>  			.flags = CLK_SET_RATE_PARENT,
>> @@ -1389,8 +1406,8 @@ static struct clk_branch gcc_blsp1_qup1_spi_apps_clk = {
>>  		.enable_mask = BIT(0),
>>  		.hw.init = &(struct clk_init_data){
>>  			.name = "gcc_blsp1_qup1_spi_apps_clk",
>> -			.parent_names = (const char *[]){
>> -				"blsp1_qup1_spi_apps_clk_src",
>> +			.parent_hws = (const struct clk_hw*[]) {
>> +				&blsp1_qup1_spi_apps_clk_src.clkr.hw,
>>  			},
>>  			.num_parents = 1,
>>  			.flags = CLK_SET_RATE_PARENT,
>> @@ -1407,8 +1424,8 @@ static struct clk_branch gcc_blsp1_qup2_i2c_apps_clk = {
>>  		.enable_mask = BIT(0),
>>  		.hw.init = &(struct clk_init_data){
>>  			.name = "gcc_blsp1_qup2_i2c_apps_clk",
>> -			.parent_names = (const char *[]){
>> -				"blsp1_qup2_i2c_apps_clk_src",
>> +			.parent_hws = (const struct clk_hw*[]) {
>> +				&blsp1_qup2_i2c_apps_clk_src.clkr.hw,
>>  			},
>>  			.num_parents = 1,
>>  			.flags = CLK_SET_RATE_PARENT,
>> @@ -1425,8 +1442,8 @@ static struct clk_branch gcc_blsp1_qup2_spi_apps_clk = {
>>  		.enable_mask = BIT(0),
>>  		.hw.init = &(struct clk_init_data){
>>  			.name = "gcc_blsp1_qup2_spi_apps_clk",
>> -			.parent_names = (const char *[]){
>> -				"blsp1_qup2_spi_apps_clk_src",
>> +			.parent_hws = (const struct clk_hw*[]) {
>> +				&blsp1_qup2_spi_apps_clk_src.clkr.hw,
>>  			},
>>  			.num_parents = 1,
>>  			.flags = CLK_SET_RATE_PARENT,
>> @@ -1443,8 +1460,8 @@ static struct clk_branch gcc_blsp1_qup3_i2c_apps_clk = {
>>  		.enable_mask = BIT(0),
>>  		.hw.init = &(struct clk_init_data){
>>  			.name = "gcc_blsp1_qup3_i2c_apps_clk",
>> -			.parent_names = (const char *[]){
>> -				"blsp1_qup3_i2c_apps_clk_src",
>> +			.parent_hws = (const struct clk_hw*[]) {
>> +				&blsp1_qup3_i2c_apps_clk_src.clkr.hw,
>>  			},
>>  			.num_parents = 1,
>>  			.flags = CLK_SET_RATE_PARENT,
>> @@ -1461,8 +1478,8 @@ static struct clk_branch gcc_blsp1_qup3_spi_apps_clk = {
>>  		.enable_mask = BIT(0),
>>  		.hw.init = &(struct clk_init_data){
>>  			.name = "gcc_blsp1_qup3_spi_apps_clk",
>> -			.parent_names = (const char *[]){
>> -				"blsp1_qup3_spi_apps_clk_src",
>> +			.parent_hws = (const struct clk_hw*[]) {
>> +				&blsp1_qup3_spi_apps_clk_src.clkr.hw,
>>  			},
>>  			.num_parents = 1,
>>  			.flags = CLK_SET_RATE_PARENT,
>> @@ -1479,8 +1496,8 @@ static struct clk_branch gcc_blsp1_qup4_i2c_apps_clk = {
>>  		.enable_mask = BIT(0),
>>  		.hw.init = &(struct clk_init_data){
>>  			.name = "gcc_blsp1_qup4_i2c_apps_clk",
>> -			.parent_names = (const char *[]){
>> -				"blsp1_qup4_i2c_apps_clk_src",
>> +			.parent_hws = (const struct clk_hw*[]) {
>> +				&blsp1_qup4_i2c_apps_clk_src.clkr.hw,
>>  			},
>>  			.num_parents = 1,
>>  			.flags = CLK_SET_RATE_PARENT,
>> @@ -1497,8 +1514,8 @@ static struct clk_branch gcc_blsp1_qup4_spi_apps_clk = {
>>  		.enable_mask = BIT(0),
>>  		.hw.init = &(struct clk_init_data){
>>  			.name = "gcc_blsp1_qup4_spi_apps_clk",
>> -			.parent_names = (const char *[]){
>> -				"blsp1_qup4_spi_apps_clk_src",
>> +			.parent_hws = (const struct clk_hw*[]) {
>> +				&blsp1_qup4_spi_apps_clk_src.clkr.hw,
>>  			},
>>  			.num_parents = 1,
>>  			.flags = CLK_SET_RATE_PARENT,
>> @@ -1515,8 +1532,8 @@ static struct clk_branch gcc_blsp1_uart0_apps_clk = {
>>  		.enable_mask = BIT(0),
>>  		.hw.init = &(struct clk_init_data){
>>  			.name = "gcc_blsp1_uart0_apps_clk",
>> -			.parent_names = (const char *[]){
>> -				"blsp1_uart0_apps_clk_src",
>> +			.parent_hws = (const struct clk_hw*[]) {
>> +				&blsp1_uart0_apps_clk_src.clkr.hw,
>>  			},
>>  			.num_parents = 1,
>>  			.flags = CLK_SET_RATE_PARENT,
>> @@ -1533,8 +1550,8 @@ static struct clk_branch gcc_blsp1_uart1_apps_clk = {
>>  		.enable_mask = BIT(0),
>>  		.hw.init = &(struct clk_init_data){
>>  			.name = "gcc_blsp1_uart1_apps_clk",
>> -			.parent_names = (const char *[]){
>> -				"blsp1_uart1_apps_clk_src",
>> +			.parent_hws = (const struct clk_hw*[]) {
>> +				&blsp1_uart1_apps_clk_src.clkr.hw,
>>  			},
>>  			.num_parents = 1,
>>  			.flags = CLK_SET_RATE_PARENT,
>> @@ -1551,8 +1568,8 @@ static struct clk_branch gcc_blsp1_uart2_apps_clk = {
>>  		.enable_mask = BIT(0),
>>  		.hw.init = &(struct clk_init_data){
>>  			.name = "gcc_blsp1_uart2_apps_clk",
>> -			.parent_names = (const char *[]){
>> -				"blsp1_uart2_apps_clk_src",
>> +			.parent_hws = (const struct clk_hw*[]) {
>> +				&blsp1_uart2_apps_clk_src.clkr.hw,
>>  			},
>>  			.num_parents = 1,
>>  			.flags = CLK_SET_RATE_PARENT,
>> @@ -1569,8 +1586,8 @@ static struct clk_branch gcc_blsp1_uart3_apps_clk = {
>>  		.enable_mask = BIT(0),
>>  		.hw.init = &(struct clk_init_data){
>>  			.name = "gcc_blsp1_uart3_apps_clk",
>> -			.parent_names = (const char *[]){
>> -				"blsp1_uart3_apps_clk_src",
>> +			.parent_hws = (const struct clk_hw*[]) {
>> +				&blsp1_uart3_apps_clk_src.clkr.hw,
>>  			},
>>  			.num_parents = 1,
>>  			.flags = CLK_SET_RATE_PARENT,
>> @@ -1600,8 +1617,8 @@ static struct clk_branch gcc_blsp2_qup0_i2c_apps_clk = {
>>  		.enable_mask = BIT(0),
>>  		.hw.init = &(struct clk_init_data){
>>  			.name = "gcc_blsp2_qup0_i2c_apps_clk",
>> -			.parent_names = (const char *[]){
>> -				"blsp2_qup0_i2c_apps_clk_src",
>> +			.parent_hws = (const struct clk_hw*[]) {
>> +				&blsp2_qup0_i2c_apps_clk_src.clkr.hw,
>>  			},
>>  			.num_parents = 1,
>>  			.flags = CLK_SET_RATE_PARENT,
>> @@ -1618,8 +1635,8 @@ static struct clk_branch gcc_blsp2_qup0_spi_apps_clk = {
>>  		.enable_mask = BIT(0),
>>  		.hw.init = &(struct clk_init_data){
>>  			.name = "gcc_blsp2_qup0_spi_apps_clk",
>> -			.parent_names = (const char *[]){
>> -				"blsp2_qup0_spi_apps_clk_src",
>> +			.parent_hws = (const struct clk_hw*[]) {
>> +				&blsp2_qup0_spi_apps_clk_src.clkr.hw,
>>  			},
>>  			.num_parents = 1,
>>  			.flags = CLK_SET_RATE_PARENT,
>> @@ -1636,8 +1653,8 @@ static struct clk_branch gcc_blsp2_uart0_apps_clk = {
>>  		.enable_mask = BIT(0),
>>  		.hw.init = &(struct clk_init_data){
>>  			.name = "gcc_blsp2_uart0_apps_clk",
>> -			.parent_names = (const char *[]){
>> -				"blsp2_uart0_apps_clk_src",
>> +			.parent_hws = (const struct clk_hw*[]) {
>> +				&blsp2_uart0_apps_clk_src.clkr.hw,
>>  			},
>>  			.num_parents = 1,
>>  			.flags = CLK_SET_RATE_PARENT,
>> @@ -1719,8 +1736,8 @@ static struct clk_branch gcc_eth_ptp_clk = {
>>  		.enable_mask = BIT(0),
>>  		.hw.init = &(struct clk_init_data){
>>  			.name = "gcc_eth_ptp_clk",
>> -			.parent_names = (const char *[]){
>> -				"emac_ptp_clk_src",
>> +			.parent_hws = (const struct clk_hw*[]) {
>> +				&emac_ptp_clk_src.clkr.hw,
>>  			},
>>  			.num_parents = 1,
>>  			.flags = CLK_SET_RATE_PARENT,
>> @@ -1737,8 +1754,8 @@ static struct clk_branch gcc_eth_rgmii_clk = {
>>  		.enable_mask = BIT(0),
>>  		.hw.init = &(struct clk_init_data){
>>  			.name = "gcc_eth_rgmii_clk",
>> -			.parent_names = (const char *[]){
>> -				"emac_clk_src",
>> +			.parent_hws = (const struct clk_hw*[]) {
>> +				&emac_clk_src.clkr.hw,
>>  			},
>>  			.num_parents = 1,
>>  			.flags = CLK_SET_RATE_PARENT,
>> @@ -1820,8 +1837,8 @@ static struct clk_branch gcc_cdsp_tbu_clk = {
>>  		.enable_mask = BIT(9),
>>  		.hw.init = &(struct clk_init_data) {
>>  			.name = "gcc_cdsp_tbu_clk",
>> -			.parent_names = (const char *[]) {
>> -				"cdsp_bimc_clk_src",
>> +			.parent_hws = (const struct clk_hw*[]) {
>> +				&cdsp_bimc_clk_src.clkr.hw
>>  			},
>>  			.num_parents = 1,
>>  			.flags = CLK_SET_RATE_PARENT,
>> @@ -1838,8 +1855,8 @@ static struct clk_branch gcc_gp1_clk = {
>>  		.enable_mask = BIT(0),
>>  		.hw.init = &(struct clk_init_data){
>>  			.name = "gcc_gp1_clk",
>> -			.parent_names = (const char *[]){
>> -				"gp1_clk_src",
>> +			.parent_hws = (const struct clk_hw*[]) {
>> +				&gp1_clk_src.clkr.hw,
>>  			},
>>  			.num_parents = 1,
>>  			.flags = CLK_SET_RATE_PARENT,
>> @@ -1856,8 +1873,8 @@ static struct clk_branch gcc_gp2_clk = {
>>  		.enable_mask = BIT(0),
>>  		.hw.init = &(struct clk_init_data){
>>  			.name = "gcc_gp2_clk",
>> -			.parent_names = (const char *[]){
>> -				"gp2_clk_src",
>> +			.parent_hws = (const struct clk_hw*[]) {
>> +				&gp2_clk_src.clkr.hw,
>>  			},
>>  			.num_parents = 1,
>>  			.flags = CLK_SET_RATE_PARENT,
>> @@ -1874,8 +1891,8 @@ static struct clk_branch gcc_gp3_clk = {
>>  		.enable_mask = BIT(0),
>>  		.hw.init = &(struct clk_init_data){
>>  			.name = "gcc_gp3_clk",
>> -			.parent_names = (const char *[]){
>> -				"gp3_clk_src",
>> +			.parent_hws = (const struct clk_hw*[]) {
>> +				&gp3_clk_src.clkr.hw,
>>  			},
>>  			.num_parents = 1,
>>  			.flags = CLK_SET_RATE_PARENT,
>> @@ -1944,8 +1961,8 @@ static struct clk_branch gcc_mdss_byte0_clk = {
>>  		.enable_mask = BIT(0),
>>  		.hw.init = &(struct clk_init_data){
>>  			.name = "gcc_mdss_byte0_clk",
>> -			.parent_names = (const char *[]){
>> -				"byte0_clk_src",
>> +			.parent_hws = (const struct clk_hw*[]) {
>> +				&byte0_clk_src.clkr.hw,
>>  			},
>>  			.num_parents = 1,
>>  			.flags = CLK_SET_RATE_PARENT,
>> @@ -1962,8 +1979,8 @@ static struct clk_branch gcc_mdss_esc0_clk = {
>>  		.enable_mask = BIT(0),
>>  		.hw.init = &(struct clk_init_data){
>>  			.name = "gcc_mdss_esc0_clk",
>> -			.parent_names = (const char *[]){
>> -				"esc0_clk_src",
>> +			.parent_hws = (const struct clk_hw*[]) {
>> +				&esc0_clk_src.clkr.hw,
>>  			},
>>  			.num_parents = 1,
>>  			.flags = CLK_SET_RATE_PARENT,
>> @@ -1980,8 +1997,8 @@ static struct clk_branch gcc_mdss_hdmi_app_clk = {
>>  		.enable_mask = BIT(0),
>>  		.hw.init = &(struct clk_init_data){
>>  			.name = "gcc_mdss_hdmi_app_clk",
>> -			.parent_names = (const char *[]){
>> -				"hdmi_app_clk_src",
>> +			.parent_hws = (const struct clk_hw*[]) {
>> +				&hdmi_app_clk_src.clkr.hw,
>>  			},
>>  			.num_parents = 1,
>>  			.flags = CLK_SET_RATE_PARENT,
>> @@ -1998,8 +2015,8 @@ static struct clk_branch gcc_mdss_hdmi_pclk_clk = {
>>  		.enable_mask = BIT(0),
>>  		.hw.init = &(struct clk_init_data){
>>  			.name = "gcc_mdss_hdmi_pclk_clk",
>> -			.parent_names = (const char *[]){
>> -				"hdmi_pclk_clk_src",
>> +			.parent_hws = (const struct clk_hw*[]) {
>> +				&hdmi_pclk_clk_src.clkr.hw,
>>  			},
>>  			.num_parents = 1,
>>  			.flags = CLK_SET_RATE_PARENT,
>> @@ -2016,8 +2033,8 @@ static struct clk_branch gcc_mdss_mdp_clk = {
>>  		.enable_mask = BIT(0),
>>  		.hw.init = &(struct clk_init_data){
>>  			.name = "gcc_mdss_mdp_clk",
>> -			.parent_names = (const char *[]){
>> -				"mdp_clk_src",
>> +			.parent_hws = (const struct clk_hw*[]) {
>> +				&mdp_clk_src.clkr.hw,
>>  			},
>>  			.num_parents = 1,
>>  			.flags = CLK_SET_RATE_PARENT,
>> @@ -2034,8 +2051,8 @@ static struct clk_branch gcc_mdss_pclk0_clk = {
>>  		.enable_mask = BIT(0),
>>  		.hw.init = &(struct clk_init_data){
>>  			.name = "gcc_mdss_pclk0_clk",
>> -			.parent_names = (const char *[]){
>> -				"pclk0_clk_src",
>> +			.parent_hws = (const struct clk_hw*[]) {
>> +				&pclk0_clk_src.clkr.hw,
>>  			},
>>  			.num_parents = 1,
>>  			.flags = CLK_SET_RATE_PARENT,
>> @@ -2052,8 +2069,8 @@ static struct clk_branch gcc_mdss_vsync_clk = {
>>  		.enable_mask = BIT(0),
>>  		.hw.init = &(struct clk_init_data){
>>  			.name = "gcc_mdss_vsync_clk",
>> -			.parent_names = (const char *[]){
>> -				"vsync_clk_src",
>> +			.parent_hws = (const struct clk_hw*[]) {
>> +				&vsync_clk_src.clkr.hw,
>>  			},
>>  			.num_parents = 1,
>>  			.flags = CLK_SET_RATE_PARENT,
>> @@ -2083,8 +2100,8 @@ static struct clk_branch gcc_oxili_gfx3d_clk = {
>>  		.enable_mask = BIT(0),
>>  		.hw.init = &(struct clk_init_data){
>>  			.name = "gcc_oxili_gfx3d_clk",
>> -			.parent_names = (const char *[]){
>> -				"gfx3d_clk_src",
>> +			.parent_hws = (const struct clk_hw*[]) {
>> +				&gfx3d_clk_src.clkr.hw,
>>  			},
>>  			.num_parents = 1,
>>  			.flags = CLK_SET_RATE_PARENT,
>> @@ -2101,8 +2118,8 @@ static struct clk_branch gcc_pcie_0_aux_clk = {
>>  		.enable_mask = BIT(27),
>>  		.hw.init = &(struct clk_init_data){
>>  			.name = "gcc_pcie_0_aux_clk",
>> -			.parent_names = (const char *[]){
>> -				"pcie_0_aux_clk_src",
>> +			.parent_hws = (const struct clk_hw*[]) {
>> +				&pcie_0_aux_clk_src.clkr.hw,
>>  			},
>>  			.num_parents = 1,
>>  			.flags = CLK_SET_RATE_PARENT,
>> @@ -2145,8 +2162,8 @@ static struct clk_branch gcc_pcie_0_pipe_clk = {
>>  		.enable_mask = BIT(28),
>>  		.hw.init = &(struct clk_init_data){
>>  			.name = "gcc_pcie_0_pipe_clk",
>> -			.parent_names = (const char *[]){
>> -				"pcie_0_pipe_clk_src",
>> +			.parent_hws = (const struct clk_hw*[]) {
>> +				&pcie_0_pipe_clk_src.clkr.hw,
>>  			},
>>  			.num_parents = 1,
>>  			.flags = CLK_SET_RATE_PARENT,
>> @@ -2204,8 +2221,8 @@ static struct clk_branch gcc_pdm2_clk = {
>>  		.enable_mask = BIT(0),
>>  		.hw.init = &(struct clk_init_data){
>>  			.name = "gcc_pdm2_clk",
>> -			.parent_names = (const char *[]){
>> -				"pdm2_clk_src",
>> +			.parent_hws = (const struct clk_hw*[]) {
>> +				&pdm2_clk_src.clkr.hw,
>>  			},
>>  			.num_parents = 1,
>>  			.flags = CLK_SET_RATE_PARENT,
>> @@ -2314,8 +2331,8 @@ static struct clk_branch gcc_sdcc1_apps_clk = {
>>  		.enable_mask = BIT(0),
>>  		.hw.init = &(struct clk_init_data){
>>  			.name = "gcc_sdcc1_apps_clk",
>> -			.parent_names = (const char *[]){
>> -				"sdcc1_apps_clk_src",
>> +			.parent_hws = (const struct clk_hw*[]) {
>> +				&sdcc1_apps_clk_src.clkr.hw,
>>  			},
>>  			.num_parents = 1,
>>  			.flags = CLK_SET_RATE_PARENT,
>> @@ -2332,8 +2349,8 @@ static struct clk_branch gcc_sdcc1_ice_core_clk = {
>>  		.enable_mask = BIT(0),
>>  		.hw.init = &(struct clk_init_data){
>>  			.name = "gcc_sdcc1_ice_core_clk",
>> -			.parent_names = (const char *[]){
>> -				"sdcc1_ice_core_clk_src",
>> +			.parent_hws = (const struct clk_hw*[]) {
>> +				&sdcc1_ice_core_clk_src.clkr.hw,
>>  			},
>>  			.num_parents = 1,
>>  			.flags = CLK_SET_RATE_PARENT,
>> @@ -2376,8 +2393,8 @@ static struct clk_branch gcc_sdcc2_apps_clk = {
>>  		.enable_mask = BIT(0),
>>  		.hw.init = &(struct clk_init_data){
>>  			.name = "gcc_sdcc2_apps_clk",
>> -			.parent_names = (const char *[]){
>> -				"sdcc2_apps_clk_src",
>> +			.parent_hws = (const struct clk_hw*[]) {
>> +				&sdcc2_apps_clk_src.clkr.hw,
>>  			},
>>  			.num_parents = 1,
>>  			.flags = CLK_SET_RATE_PARENT,
>> @@ -2407,8 +2424,8 @@ static struct clk_branch gcc_sys_noc_usb3_clk = {
>>  		.enable_mask = BIT(0),
>>  		.hw.init = &(struct clk_init_data){
>>  			.name = "gcc_sys_noc_usb3_clk",
>> -			.parent_names = (const char *[]){
>> -				"usb30_master_clk_src",
>> +			.parent_hws = (const struct clk_hw*[]) {
>> +				&usb30_master_clk_src.clkr.hw,
>>  			},
>>  			.num_parents = 1,
>>  			.ops = &clk_branch2_ops,
>> @@ -2437,8 +2454,8 @@ static struct clk_branch gcc_usb20_mock_utmi_clk = {
>>  		.enable_mask = BIT(0),
>>  		.hw.init = &(struct clk_init_data){
>>  			.name = "gcc_usb20_mock_utmi_clk",
>> -			.parent_names = (const char *[]){
>> -				"usb20_mock_utmi_clk_src",
>> +			.parent_hws = (const struct clk_hw*[]) {
>> +				&usb20_mock_utmi_clk_src.clkr.hw,
>>  			},
>>  			.num_parents = 1,
>>  			.flags = CLK_SET_RATE_PARENT,
>> @@ -2468,8 +2485,8 @@ static struct clk_branch gcc_usb30_master_clk = {
>>  		.enable_mask = BIT(0),
>>  		.hw.init = &(struct clk_init_data){
>>  			.name = "gcc_usb30_master_clk",
>> -			.parent_names = (const char *[]){
>> -				"usb30_master_clk_src",
>> +			.parent_hws = (const struct clk_hw*[]) {
>> +				&usb30_master_clk_src.clkr.hw,
>>  			},
>>  			.num_parents = 1,
>>  			.flags = CLK_SET_RATE_PARENT,
>> @@ -2486,8 +2503,8 @@ static struct clk_branch gcc_usb30_mock_utmi_clk = {
>>  		.enable_mask = BIT(0),
>>  		.hw.init = &(struct clk_init_data){
>>  			.name = "gcc_usb30_mock_utmi_clk",
>> -			.parent_names = (const char *[]){
>> -				"usb30_mock_utmi_clk_src",
>> +			.parent_hws = (const struct clk_hw*[]) {
>> +				&usb30_mock_utmi_clk_src.clkr.hw,
>>  			},
>>  			.num_parents = 1,
>>  			.flags = CLK_SET_RATE_PARENT,
>> @@ -2517,8 +2534,8 @@ static struct clk_branch gcc_usb3_phy_aux_clk = {
>>  		.enable_mask = BIT(0),
>>  		.hw.init = &(struct clk_init_data){
>>  			.name = "gcc_usb3_phy_aux_clk",
>> -			.parent_names = (const char *[]){
>> -				"usb3_phy_aux_clk_src",
>> +			.parent_hws = (const struct clk_hw*[]) {
>> +				&usb3_phy_aux_clk_src.clkr.hw,
>>  			},
>>  			.num_parents = 1,
>>  			.flags = CLK_SET_RATE_PARENT,
>> @@ -2560,8 +2577,8 @@ static struct clk_branch gcc_usb_hs_system_clk = {
>>  		.enable_mask = BIT(0),
>>  		.hw.init = &(struct clk_init_data){
>>  			.name = "gcc_usb_hs_system_clk",
>> -			.parent_names = (const char *[]){
>> -				"usb_hs_system_clk_src",
>> +			.parent_hws = (const struct clk_hw*[]) {
>> +				&usb_hs_system_clk_src.clkr.hw,
>>  			},
>>  			.num_parents = 1,
>>  			.flags = CLK_SET_RATE_PARENT,

Re: [PATCH 10/15] clk: qcom: gcc-qcs404: use parent_hws/_data instead of parent_names

[Dmitry Baryshkov]

17 декабря 2022 г. 17:14:36 GMT+02:00, Konrad Dybcio <konrad.dybcio@linaro.org> пишет:
>
>
>On 17.12.2022 16:13, Konrad Dybcio wrote:
>> 
>> 
>> On 17.12.2022 01:17, Dmitry Baryshkov wrote:
>>> Convert the clock driver to specify parent data rather than parent
>>> names, to actually bind using 'clock-names' specified in the DTS rather
>>> than global clock names. Use parent_hws where possible to refer parent
>>> clocks directly, skipping the lookup.
>>>
>>> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
>>> ---
>> Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
>> 
>> Konrad
>Actually, on a second thought - why not switch to .index
>like on the newer clk drivers?

I thought we should use clock-names with old drivers for the sake of keeping compatibility with partial clocks specifications. In this case we do not have one. Let me check if it we can live without .fw_name.

>
>Konrad
>>>  drivers/clk/qcom/gcc-qcs404.c | 515 ++++++++++++++++++----------------
>>>  1 file changed, 266 insertions(+), 249 deletions(-)
>>>
>>> diff --git a/drivers/clk/qcom/gcc-qcs404.c b/drivers/clk/qcom/gcc-qcs404.c
>>> index 5ae7a6b2a326..3941175d73a5 100644
>>> --- a/drivers/clk/qcom/gcc-qcs404.c
>>> +++ b/drivers/clk/qcom/gcc-qcs404.c
>>> @@ -42,7 +42,9 @@ static struct clk_fixed_factor cxo = {
>>>  	.div = 1,
>>>  	.hw.init = &(struct clk_init_data){
>>>  		.name = "cxo",
>>> -		.parent_names = (const char *[]){ "xo-board" },
>>> +		.parent_data = &(const struct clk_parent_data) {
>>> +			.name = "xo-board",
>>> +		},
>>>  		.num_parents = 1,
>>>  		.ops = &clk_fixed_factor_ops,
>>>  	},
>>> @@ -57,7 +59,9 @@ static struct clk_alpha_pll gpll0_sleep_clk_src = {
>>>  		.enable_is_inverted = true,
>>>  		.hw.init = &(struct clk_init_data){
>>>  			.name = "gpll0_sleep_clk_src",
>>> -			.parent_names = (const char *[]){ "cxo" },
>>> +			.parent_data = &(const struct clk_parent_data) {
>>> +				.hw = &cxo.hw,
>>> +			},
>>>  			.num_parents = 1,
>>>  			.ops = &clk_alpha_pll_ops,
>>>  		},
>>> @@ -73,8 +77,9 @@ static struct clk_alpha_pll gpll0_out_main = {
>>>  		.enable_mask = BIT(0),
>>>  		.hw.init = &(struct clk_init_data){
>>>  			.name = "gpll0_out_main",
>>> -			.parent_names = (const char *[])
>>> -					{ "cxo" },
>>> +			.parent_data = &(const struct clk_parent_data) {
>>> +				.hw = &cxo.hw,
>>> +			},
>>>  			.num_parents = 1,
>>>  			.ops = &clk_alpha_pll_ops,
>>>  		},
>>> @@ -90,7 +95,9 @@ static struct clk_alpha_pll gpll0_ao_out_main = {
>>>  		.enable_mask = BIT(0),
>>>  		.hw.init = &(struct clk_init_data){
>>>  			.name = "gpll0_ao_out_main",
>>> -			.parent_names = (const char *[]){ "cxo" },
>>> +			.parent_data = &(const struct clk_parent_data) {
>>> +				.hw = &cxo.hw,
>>> +			},
>>>  			.num_parents = 1,
>>>  			.flags = CLK_IS_CRITICAL,
>>>  			.ops = &clk_alpha_pll_fixed_ops,
>>> @@ -106,7 +113,9 @@ static struct clk_alpha_pll gpll1_out_main = {
>>>  		.enable_mask = BIT(1),
>>>  		.hw.init = &(struct clk_init_data){
>>>  			.name = "gpll1_out_main",
>>> -			.parent_names = (const char *[]){ "cxo" },
>>> +			.parent_data = &(const struct clk_parent_data) {
>>> +				.hw = &cxo.hw,
>>> +			},
>>>  			.num_parents = 1,
>>>  			.ops = &clk_alpha_pll_ops,
>>>  		},
>>> @@ -137,7 +146,9 @@ static struct clk_alpha_pll gpll3_out_main = {
>>>  	.clkr = {
>>>  		.hw.init = &(struct clk_init_data){
>>>  			.name = "gpll3_out_main",
>>> -			.parent_names = (const char *[]){ "cxo" },
>>> +			.parent_data = &(const struct clk_parent_data) {
>>> +				.hw = &cxo.hw,
>>> +			},
>>>  			.num_parents = 1,
>>>  			.ops = &clk_alpha_pll_ops,
>>>  		},
>>> @@ -152,7 +163,9 @@ static struct clk_alpha_pll gpll4_out_main = {
>>>  		.enable_mask = BIT(5),
>>>  		.hw.init = &(struct clk_init_data){
>>>  			.name = "gpll4_out_main",
>>> -			.parent_names = (const char *[]){ "cxo" },
>>> +			.parent_data = &(const struct clk_parent_data) {
>>> +				.hw = &cxo.hw,
>>> +			},
>>>  			.num_parents = 1,
>>>  			.ops = &clk_alpha_pll_ops,
>>>  		},
>>> @@ -169,7 +182,9 @@ static struct clk_pll gpll6 = {
>>>  	.status_bit = 17,
>>>  	.clkr.hw.init = &(struct clk_init_data){
>>>  		.name = "gpll6",
>>> -		.parent_names = (const char *[]){ "cxo" },
>>> +		.parent_data = &(const struct clk_parent_data) {
>>> +			.hw = &cxo.hw,
>>> +		},
>>>  		.num_parents = 1,
>>>  		.ops = &clk_pll_ops,
>>>  	},
>>> @@ -180,7 +195,9 @@ static struct clk_regmap gpll6_out_aux = {
>>>  	.enable_mask = BIT(7),
>>>  	.hw.init = &(struct clk_init_data){
>>>  		.name = "gpll6_out_aux",
>>> -		.parent_names = (const char *[]){ "gpll6" },
>>> +		.parent_hws = (const struct clk_hw*[]) {
>>> +			&gpll6.clkr.hw,
>>> +		},
>>>  		.num_parents = 1,
>>>  		.ops = &clk_pll_vote_ops,
>>>  	},
>>> @@ -191,22 +208,22 @@ static const struct parent_map gcc_parent_map_0[] = {
>>>  	{ P_GPLL0_OUT_MAIN, 1 },
>>>  };
>>>  
>>> -static const char * const gcc_parent_names_0[] = {
>>> -	"cxo",
>>> -	"gpll0_out_main",
>>> +static const struct clk_parent_data gcc_parent_data_0[] = {
>>> +	{ .hw = &cxo.hw },
>>> +	{ .hw = &gpll0_out_main.clkr.hw },
>>>  };
>>>  
>>> -static const char * const gcc_parent_names_ao_0[] = {
>>> -	"cxo",
>>> -	"gpll0_ao_out_main",
>>> +static const struct clk_parent_data gcc_parent_data_ao_0[] = {
>>> +	{ .hw = &cxo.hw },
>>> +	{ .hw = &gpll0_ao_out_main.clkr.hw },
>>>  };
>>>  
>>>  static const struct parent_map gcc_parent_map_1[] = {
>>>  	{ P_XO, 0 },
>>>  };
>>>  
>>> -static const char * const gcc_parent_names_1[] = {
>>> -	"cxo",
>>> +static const struct clk_parent_data gcc_parent_data_1[] = {
>>> +	{ .hw = &cxo.hw },
>>>  };
>>>  
>>>  static const struct parent_map gcc_parent_map_2[] = {
>>> @@ -216,11 +233,11 @@ static const struct parent_map gcc_parent_map_2[] = {
>>>  	{ P_SLEEP_CLK, 6 },
>>>  };
>>>  
>>> -static const char * const gcc_parent_names_2[] = {
>>> -	"cxo",
>>> -	"gpll0_out_main",
>>> -	"gpll6_out_aux",
>>> -	"sleep_clk",
>>> +static const struct clk_parent_data gcc_parent_data_2[] = {
>>> +	{ .hw = &cxo.hw },
>>> +	{ .hw = &gpll0_out_main.clkr.hw },
>>> +	{ .hw = &gpll6_out_aux.hw },
>>> +	{ .fw_name = "sleep_clk", .name = "sleep_clk" },
>>>  };
>>>  
>>>  static const struct parent_map gcc_parent_map_3[] = {
>>> @@ -229,10 +246,10 @@ static const struct parent_map gcc_parent_map_3[] = {
>>>  	{ P_GPLL6_OUT_AUX, 2 },
>>>  };
>>>  
>>> -static const char * const gcc_parent_names_3[] = {
>>> -	"cxo",
>>> -	"gpll0_out_main",
>>> -	"gpll6_out_aux",
>>> +static const struct clk_parent_data gcc_parent_data_3[] = {
>>> +	{ .hw = &cxo.hw },
>>> +	{ .hw = &gpll0_out_main.clkr.hw },
>>> +	{ .hw = &gpll6_out_aux.hw },
>>>  };
>>>  
>>>  static const struct parent_map gcc_parent_map_4[] = {
>>> @@ -240,9 +257,9 @@ static const struct parent_map gcc_parent_map_4[] = {
>>>  	{ P_GPLL1_OUT_MAIN, 1 },
>>>  };
>>>  
>>> -static const char * const gcc_parent_names_4[] = {
>>> -	"cxo",
>>> -	"gpll1_out_main",
>>> +static const struct clk_parent_data gcc_parent_data_4[] = {
>>> +	{ .hw = &cxo.hw },
>>> +	{ .hw = &gpll1_out_main.clkr.hw },
>>>  };
>>>  
>>>  static const struct parent_map gcc_parent_map_5[] = {
>>> @@ -251,9 +268,9 @@ static const struct parent_map gcc_parent_map_5[] = {
>>>  	/* { P_GPLL0_OUT_AUX, 2 }, */
>>>  };
>>>  
>>> -static const char * const gcc_parent_names_5[] = {
>>> -	"cxo",
>>> -	"dsi0pllbyte",
>>> +static const struct clk_parent_data gcc_parent_data_5[] = {
>>> +	{ .hw = &cxo.hw },
>>> +	{ .fw_name = "dsi0pllbyte", .name = "dsi0pllbyte" },
>>>  	/* "gpll0_out_aux", */
>>>  };
>>>  
>>> @@ -263,9 +280,9 @@ static const struct parent_map gcc_parent_map_6[] = {
>>>  	/* { P_GPLL0_OUT_AUX, 3 }, */
>>>  };
>>>  
>>> -static const char * const gcc_parent_names_6[] = {
>>> -	"cxo",
>>> -	"dsi0pllbyte",
>>> +static const struct clk_parent_data gcc_parent_data_6[] = {
>>> +	{ .hw = &cxo.hw },
>>> +	{ .fw_name = "dsi0pllbyte", .name = "dsi0pllbyte" },
>>>  	/* "gpll0_out_aux", */
>>>  };
>>>  
>>> @@ -277,11 +294,11 @@ static const struct parent_map gcc_parent_map_7[] = {
>>>  	/* { P_GPLL4_OUT_AUX, 4 }, */
>>>  };
>>>  
>>> -static const char * const gcc_parent_names_7[] = {
>>> -	"cxo",
>>> -	"gpll0_out_main",
>>> -	"gpll3_out_main",
>>> -	"gpll6_out_aux",
>>> +static const struct clk_parent_data gcc_parent_data_7[] = {
>>> +	{ .hw = &cxo.hw },
>>> +	{ .hw = &gpll0_out_main.clkr.hw },
>>> +	{ .hw = &gpll3_out_main.clkr.hw },
>>> +	{ .hw = &gpll6_out_aux.hw },
>>>  	/* "gpll4_out_aux", */
>>>  };
>>>  
>>> @@ -290,9 +307,9 @@ static const struct parent_map gcc_parent_map_8[] = {
>>>  	{ P_HDMI_PHY_PLL_CLK, 1 },
>>>  };
>>>  
>>> -static const char * const gcc_parent_names_8[] = {
>>> -	"cxo",
>>> -	"hdmi_pll",
>>> +static const struct clk_parent_data gcc_parent_data_8[] = {
>>> +	{ .hw = &cxo.hw },
>>> +	{ .fw_name = "hdmi_pll", .name = "hdmi_pll" },
>>>  };
>>>  
>>>  static const struct parent_map gcc_parent_map_9[] = {
>>> @@ -302,11 +319,11 @@ static const struct parent_map gcc_parent_map_9[] = {
>>>  	{ P_GPLL6_OUT_AUX, 3 },
>>>  };
>>>  
>>> -static const char * const gcc_parent_names_9[] = {
>>> -	"cxo",
>>> -	"gpll0_out_main",
>>> -	"dsi0pll",
>>> -	"gpll6_out_aux",
>>> +static const struct clk_parent_data gcc_parent_data_9[] = {
>>> +	{ .hw = &cxo.hw },
>>> +	{ .hw = &gpll0_out_main.clkr.hw },
>>> +	{ .fw_name = "dsi0pll", .name = "dsi0pll" },
>>> +	{ .hw = &gpll6_out_aux.hw },
>>>  };
>>>  
>>>  static const struct parent_map gcc_parent_map_10[] = {
>>> @@ -314,9 +331,9 @@ static const struct parent_map gcc_parent_map_10[] = {
>>>  	{ P_SLEEP_CLK, 1 },
>>>  };
>>>  
>>> -static const char * const gcc_parent_names_10[] = {
>>> -	"cxo",
>>> -	"sleep_clk",
>>> +static const struct clk_parent_data gcc_parent_data_10[] = {
>>> +	{ .hw = &cxo.hw },
>>> +	{ .fw_name = "sleep_clk", .name = "sleep_clk" },
>>>  };
>>>  
>>>  static const struct parent_map gcc_parent_map_11[] = {
>>> @@ -324,9 +341,9 @@ static const struct parent_map gcc_parent_map_11[] = {
>>>  	{ P_PCIE_0_PIPE_CLK, 1 },
>>>  };
>>>  
>>> -static const char * const gcc_parent_names_11[] = {
>>> -	"cxo",
>>> -	"pcie_0_pipe_clk",
>>> +static const struct clk_parent_data gcc_parent_data_11[] = {
>>> +	{ .hw = &cxo.hw },
>>> +	{ .fw_name = "pcie_0_pipe_clk", .name = "pcie_0_pipe_clk" },
>>>  };
>>>  
>>>  static const struct parent_map gcc_parent_map_12[] = {
>>> @@ -335,9 +352,9 @@ static const struct parent_map gcc_parent_map_12[] = {
>>>  	/* { P_GPLL0_OUT_AUX, 2 }, */
>>>  };
>>>  
>>> -static const char * const gcc_parent_names_12[] = {
>>> -	"cxo",
>>> -	"dsi0pll",
>>> +static const struct clk_parent_data gcc_parent_data_12[] = {
>>> +	{ .hw = &cxo.hw },
>>> +	{ .fw_name = "dsi0pll", .name = "dsi0pll" },
>>>  	/* "gpll0_out_aux", */
>>>  };
>>>  
>>> @@ -348,11 +365,11 @@ static const struct parent_map gcc_parent_map_13[] = {
>>>  	{ P_GPLL6_OUT_AUX, 3 },
>>>  };
>>>  
>>> -static const char * const gcc_parent_names_13[] = {
>>> -	"cxo",
>>> -	"gpll0_out_main",
>>> -	"gpll4_out_main",
>>> -	"gpll6_out_aux",
>>> +static const struct clk_parent_data gcc_parent_data_13[] = {
>>> +	{ .hw = &cxo.hw },
>>> +	{ .hw = &gpll0_out_main.clkr.hw },
>>> +	{ .hw = &gpll4_out_main.clkr.hw },
>>> +	{ .hw = &gpll6_out_aux.hw },
>>>  };
>>>  
>>>  static const struct parent_map gcc_parent_map_14[] = {
>>> @@ -361,9 +378,9 @@ static const struct parent_map gcc_parent_map_14[] = {
>>>  	/* { P_GPLL4_OUT_AUX, 2 }, */
>>>  };
>>>  
>>> -static const char * const gcc_parent_names_14[] = {
>>> -	"cxo",
>>> -	"gpll0_out_main",
>>> +static const struct clk_parent_data gcc_parent_data_14[] = {
>>> +	{ .hw = &cxo.hw },
>>> +	{ .hw = &gpll0_out_main.clkr.hw },
>>>  	/* "gpll4_out_aux", */
>>>  };
>>>  
>>> @@ -372,8 +389,8 @@ static const struct parent_map gcc_parent_map_15[] = {
>>>  	/* { P_GPLL0_OUT_AUX, 2 }, */
>>>  };
>>>  
>>> -static const char * const gcc_parent_names_15[] = {
>>> -	"cxo",
>>> +static const struct clk_parent_data gcc_parent_data_15[] = {
>>> +	{ .hw = &cxo.hw },
>>>  	/* "gpll0_out_aux", */
>>>  };
>>>  
>>> @@ -383,9 +400,9 @@ static const struct parent_map gcc_parent_map_16[] = {
>>>  	/* { P_GPLL0_OUT_AUX, 2 }, */
>>>  };
>>>  
>>> -static const char * const gcc_parent_names_16[] = {
>>> -	"cxo",
>>> -	"gpll0_out_main",
>>> +static const struct clk_parent_data gcc_parent_data_16[] = {
>>> +	{ .hw = &cxo.hw },
>>> +	{ .hw = &gpll0_out_main.clkr.hw },
>>>  	/* "gpll0_out_aux", */
>>>  };
>>>  
>>> @@ -405,8 +422,8 @@ static struct clk_rcg2 apss_ahb_clk_src = {
>>>  	.freq_tbl = ftbl_apss_ahb_clk_src,
>>>  	.clkr.hw.init = &(struct clk_init_data){
>>>  		.name = "apss_ahb_clk_src",
>>> -		.parent_names = gcc_parent_names_ao_0,
>>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_ao_0),
>>> +		.parent_data = gcc_parent_data_ao_0,
>>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_ao_0),
>>>  		.flags = CLK_IS_CRITICAL,
>>>  		.ops = &clk_rcg2_ops,
>>>  	},
>>> @@ -426,8 +443,8 @@ static struct clk_rcg2 blsp1_qup0_i2c_apps_clk_src = {
>>>  	.freq_tbl = ftbl_blsp1_qup0_i2c_apps_clk_src,
>>>  	.clkr.hw.init = &(struct clk_init_data){
>>>  		.name = "blsp1_qup0_i2c_apps_clk_src",
>>> -		.parent_names = gcc_parent_names_0,
>>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
>>> +		.parent_data = gcc_parent_data_0,
>>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
>>>  		.ops = &clk_rcg2_ops,
>>>  	},
>>>  };
>>> @@ -451,8 +468,8 @@ static struct clk_rcg2 blsp1_qup0_spi_apps_clk_src = {
>>>  	.freq_tbl = ftbl_blsp1_qup0_spi_apps_clk_src,
>>>  	.clkr.hw.init = &(struct clk_init_data){
>>>  		.name = "blsp1_qup0_spi_apps_clk_src",
>>> -		.parent_names = gcc_parent_names_0,
>>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
>>> +		.parent_data = gcc_parent_data_0,
>>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
>>>  		.ops = &clk_rcg2_ops,
>>>  	},
>>>  };
>>> @@ -465,8 +482,8 @@ static struct clk_rcg2 blsp1_qup1_i2c_apps_clk_src = {
>>>  	.freq_tbl = ftbl_blsp1_qup0_i2c_apps_clk_src,
>>>  	.clkr.hw.init = &(struct clk_init_data){
>>>  		.name = "blsp1_qup1_i2c_apps_clk_src",
>>> -		.parent_names = gcc_parent_names_0,
>>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
>>> +		.parent_data = gcc_parent_data_0,
>>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
>>>  		.ops = &clk_rcg2_ops,
>>>  	},
>>>  };
>>> @@ -490,8 +507,8 @@ static struct clk_rcg2 blsp1_qup1_spi_apps_clk_src = {
>>>  	.freq_tbl = ftbl_blsp1_qup1_spi_apps_clk_src,
>>>  	.clkr.hw.init = &(struct clk_init_data){
>>>  		.name = "blsp1_qup1_spi_apps_clk_src",
>>> -		.parent_names = gcc_parent_names_0,
>>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
>>> +		.parent_data = gcc_parent_data_0,
>>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
>>>  		.ops = &clk_rcg2_ops,
>>>  	},
>>>  };
>>> @@ -504,8 +521,8 @@ static struct clk_rcg2 blsp1_qup2_i2c_apps_clk_src = {
>>>  	.freq_tbl = ftbl_blsp1_qup0_i2c_apps_clk_src,
>>>  	.clkr.hw.init = &(struct clk_init_data){
>>>  		.name = "blsp1_qup2_i2c_apps_clk_src",
>>> -		.parent_names = gcc_parent_names_0,
>>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
>>> +		.parent_data = gcc_parent_data_0,
>>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
>>>  		.ops = &clk_rcg2_ops,
>>>  	},
>>>  };
>>> @@ -530,8 +547,8 @@ static struct clk_rcg2 blsp1_qup2_spi_apps_clk_src = {
>>>  	.freq_tbl = ftbl_blsp1_qup2_spi_apps_clk_src,
>>>  	.clkr.hw.init = &(struct clk_init_data){
>>>  		.name = "blsp1_qup2_spi_apps_clk_src",
>>> -		.parent_names = gcc_parent_names_0,
>>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
>>> +		.parent_data = gcc_parent_data_0,
>>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
>>>  		.ops = &clk_rcg2_ops,
>>>  	},
>>>  };
>>> @@ -544,8 +561,8 @@ static struct clk_rcg2 blsp1_qup3_i2c_apps_clk_src = {
>>>  	.freq_tbl = ftbl_blsp1_qup0_i2c_apps_clk_src,
>>>  	.clkr.hw.init = &(struct clk_init_data){
>>>  		.name = "blsp1_qup3_i2c_apps_clk_src",
>>> -		.parent_names = gcc_parent_names_0,
>>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
>>> +		.parent_data = gcc_parent_data_0,
>>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
>>>  		.ops = &clk_rcg2_ops,
>>>  	},
>>>  };
>>> @@ -558,8 +575,8 @@ static struct clk_rcg2 blsp1_qup3_spi_apps_clk_src = {
>>>  	.freq_tbl = ftbl_blsp1_qup0_spi_apps_clk_src,
>>>  	.clkr.hw.init = &(struct clk_init_data){
>>>  		.name = "blsp1_qup3_spi_apps_clk_src",
>>> -		.parent_names = gcc_parent_names_0,
>>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
>>> +		.parent_data = gcc_parent_data_0,
>>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
>>>  		.ops = &clk_rcg2_ops,
>>>  	},
>>>  };
>>> @@ -572,8 +589,8 @@ static struct clk_rcg2 blsp1_qup4_i2c_apps_clk_src = {
>>>  	.freq_tbl = ftbl_blsp1_qup0_i2c_apps_clk_src,
>>>  	.clkr.hw.init = &(struct clk_init_data){
>>>  		.name = "blsp1_qup4_i2c_apps_clk_src",
>>> -		.parent_names = gcc_parent_names_0,
>>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
>>> +		.parent_data = gcc_parent_data_0,
>>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
>>>  		.ops = &clk_rcg2_ops,
>>>  	},
>>>  };
>>> @@ -586,8 +603,8 @@ static struct clk_rcg2 blsp1_qup4_spi_apps_clk_src = {
>>>  	.freq_tbl = ftbl_blsp1_qup0_spi_apps_clk_src,
>>>  	.clkr.hw.init = &(struct clk_init_data){
>>>  		.name = "blsp1_qup4_spi_apps_clk_src",
>>> -		.parent_names = gcc_parent_names_0,
>>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
>>> +		.parent_data = gcc_parent_data_0,
>>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
>>>  		.ops = &clk_rcg2_ops,
>>>  	},
>>>  };
>>> @@ -620,8 +637,8 @@ static struct clk_rcg2 blsp1_uart0_apps_clk_src = {
>>>  	.freq_tbl = ftbl_blsp1_uart0_apps_clk_src,
>>>  	.clkr.hw.init = &(struct clk_init_data){
>>>  		.name = "blsp1_uart0_apps_clk_src",
>>> -		.parent_names = gcc_parent_names_0,
>>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
>>> +		.parent_data = gcc_parent_data_0,
>>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
>>>  		.ops = &clk_rcg2_ops,
>>>  	},
>>>  };
>>> @@ -634,8 +651,8 @@ static struct clk_rcg2 blsp1_uart1_apps_clk_src = {
>>>  	.freq_tbl = ftbl_blsp1_uart0_apps_clk_src,
>>>  	.clkr.hw.init = &(struct clk_init_data){
>>>  		.name = "blsp1_uart1_apps_clk_src",
>>> -		.parent_names = gcc_parent_names_0,
>>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
>>> +		.parent_data = gcc_parent_data_0,
>>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
>>>  		.ops = &clk_rcg2_ops,
>>>  	},
>>>  };
>>> @@ -648,8 +665,8 @@ static struct clk_rcg2 blsp1_uart2_apps_clk_src = {
>>>  	.freq_tbl = ftbl_blsp1_uart0_apps_clk_src,
>>>  	.clkr.hw.init = &(struct clk_init_data){
>>>  		.name = "blsp1_uart2_apps_clk_src",
>>> -		.parent_names = gcc_parent_names_0,
>>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
>>> +		.parent_data = gcc_parent_data_0,
>>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
>>>  		.ops = &clk_rcg2_ops,
>>>  	},
>>>  };
>>> @@ -663,8 +680,8 @@ static struct clk_rcg2 blsp1_uart3_apps_clk_src = {
>>>  	.freq_tbl = ftbl_blsp1_uart0_apps_clk_src,
>>>  	.clkr.hw.init = &(struct clk_init_data){
>>>  		.name = "blsp1_uart3_apps_clk_src",
>>> -		.parent_names = gcc_parent_names_0,
>>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
>>> +		.parent_data = gcc_parent_data_0,
>>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
>>>  		.ops = &clk_rcg2_ops,
>>>  	},
>>>  };
>>> @@ -677,8 +694,8 @@ static struct clk_rcg2 blsp2_qup0_i2c_apps_clk_src = {
>>>  	.freq_tbl = ftbl_blsp1_qup0_i2c_apps_clk_src,
>>>  	.clkr.hw.init = &(struct clk_init_data){
>>>  		.name = "blsp2_qup0_i2c_apps_clk_src",
>>> -		.parent_names = gcc_parent_names_0,
>>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
>>> +		.parent_data = gcc_parent_data_0,
>>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
>>>  		.ops = &clk_rcg2_ops,
>>>  	},
>>>  };
>>> @@ -691,8 +708,8 @@ static struct clk_rcg2 blsp2_qup0_spi_apps_clk_src = {
>>>  	.freq_tbl = ftbl_blsp1_qup0_spi_apps_clk_src,
>>>  	.clkr.hw.init = &(struct clk_init_data){
>>>  		.name = "blsp2_qup0_spi_apps_clk_src",
>>> -		.parent_names = gcc_parent_names_0,
>>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
>>> +		.parent_data = gcc_parent_data_0,
>>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
>>>  		.ops = &clk_rcg2_ops,
>>>  	},
>>>  };
>>> @@ -705,8 +722,8 @@ static struct clk_rcg2 blsp2_uart0_apps_clk_src = {
>>>  	.freq_tbl = ftbl_blsp1_uart0_apps_clk_src,
>>>  	.clkr.hw.init = &(struct clk_init_data){
>>>  		.name = "blsp2_uart0_apps_clk_src",
>>> -		.parent_names = gcc_parent_names_0,
>>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
>>> +		.parent_data = gcc_parent_data_0,
>>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
>>>  		.ops = &clk_rcg2_ops,
>>>  	},
>>>  };
>>> @@ -718,8 +735,8 @@ static struct clk_rcg2 byte0_clk_src = {
>>>  	.parent_map = gcc_parent_map_5,
>>>  	.clkr.hw.init = &(struct clk_init_data){
>>>  		.name = "byte0_clk_src",
>>> -		.parent_names = gcc_parent_names_5,
>>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_5),
>>> +		.parent_data = gcc_parent_data_5,
>>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_5),
>>>  		.flags = CLK_SET_RATE_PARENT,
>>>  		.ops = &clk_byte2_ops,
>>>  	},
>>> @@ -741,8 +758,8 @@ static struct clk_rcg2 emac_clk_src = {
>>>  	.freq_tbl = ftbl_emac_clk_src,
>>>  	.clkr.hw.init = &(struct clk_init_data){
>>>  		.name = "emac_clk_src",
>>> -		.parent_names = gcc_parent_names_4,
>>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_4),
>>> +		.parent_data = gcc_parent_data_4,
>>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_4),
>>>  		.ops = &clk_rcg2_ops,
>>>  	},
>>>  };
>>> @@ -762,8 +779,8 @@ static struct clk_rcg2 emac_ptp_clk_src = {
>>>  	.freq_tbl = ftbl_emac_ptp_clk_src,
>>>  	.clkr.hw.init = &(struct clk_init_data){
>>>  		.name = "emac_ptp_clk_src",
>>> -		.parent_names = gcc_parent_names_4,
>>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_4),
>>> +		.parent_data = gcc_parent_data_4,
>>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_4),
>>>  		.ops = &clk_rcg2_ops,
>>>  	},
>>>  };
>>> @@ -781,8 +798,8 @@ static struct clk_rcg2 esc0_clk_src = {
>>>  	.freq_tbl = ftbl_esc0_clk_src,
>>>  	.clkr.hw.init = &(struct clk_init_data){
>>>  		.name = "esc0_clk_src",
>>> -		.parent_names = gcc_parent_names_6,
>>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_6),
>>> +		.parent_data = gcc_parent_data_6,
>>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_6),
>>>  		.ops = &clk_rcg2_ops,
>>>  	},
>>>  };
>>> @@ -815,8 +832,8 @@ static struct clk_rcg2 gfx3d_clk_src = {
>>>  	.freq_tbl = ftbl_gfx3d_clk_src,
>>>  	.clkr.hw.init = &(struct clk_init_data){
>>>  		.name = "gfx3d_clk_src",
>>> -		.parent_names = gcc_parent_names_7,
>>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_7),
>>> +		.parent_data = gcc_parent_data_7,
>>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_7),
>>>  		.ops = &clk_rcg2_ops,
>>>  	},
>>>  };
>>> @@ -836,8 +853,8 @@ static struct clk_rcg2 gp1_clk_src = {
>>>  	.freq_tbl = ftbl_gp1_clk_src,
>>>  	.clkr.hw.init = &(struct clk_init_data){
>>>  		.name = "gp1_clk_src",
>>> -		.parent_names = gcc_parent_names_2,
>>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_2),
>>> +		.parent_data = gcc_parent_data_2,
>>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_2),
>>>  		.ops = &clk_rcg2_ops,
>>>  	},
>>>  };
>>> @@ -850,8 +867,8 @@ static struct clk_rcg2 gp2_clk_src = {
>>>  	.freq_tbl = ftbl_gp1_clk_src,
>>>  	.clkr.hw.init = &(struct clk_init_data){
>>>  		.name = "gp2_clk_src",
>>> -		.parent_names = gcc_parent_names_2,
>>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_2),
>>> +		.parent_data = gcc_parent_data_2,
>>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_2),
>>>  		.ops = &clk_rcg2_ops,
>>>  	},
>>>  };
>>> @@ -864,8 +881,8 @@ static struct clk_rcg2 gp3_clk_src = {
>>>  	.freq_tbl = ftbl_gp1_clk_src,
>>>  	.clkr.hw.init = &(struct clk_init_data){
>>>  		.name = "gp3_clk_src",
>>> -		.parent_names = gcc_parent_names_2,
>>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_2),
>>> +		.parent_data = gcc_parent_data_2,
>>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_2),
>>>  		.ops = &clk_rcg2_ops,
>>>  	},
>>>  };
>>> @@ -878,8 +895,8 @@ static struct clk_rcg2 hdmi_app_clk_src = {
>>>  	.freq_tbl = ftbl_esc0_clk_src,
>>>  	.clkr.hw.init = &(struct clk_init_data){
>>>  		.name = "hdmi_app_clk_src",
>>> -		.parent_names = gcc_parent_names_1,
>>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_1),
>>> +		.parent_data = gcc_parent_data_1,
>>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_1),
>>>  		.ops = &clk_rcg2_ops,
>>>  	},
>>>  };
>>> @@ -892,8 +909,8 @@ static struct clk_rcg2 hdmi_pclk_clk_src = {
>>>  	.freq_tbl = ftbl_esc0_clk_src,
>>>  	.clkr.hw.init = &(struct clk_init_data){
>>>  		.name = "hdmi_pclk_clk_src",
>>> -		.parent_names = gcc_parent_names_8,
>>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_8),
>>> +		.parent_data = gcc_parent_data_8,
>>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_8),
>>>  		.ops = &clk_rcg2_ops,
>>>  	},
>>>  };
>>> @@ -919,8 +936,8 @@ static struct clk_rcg2 mdp_clk_src = {
>>>  	.freq_tbl = ftbl_mdp_clk_src,
>>>  	.clkr.hw.init = &(struct clk_init_data){
>>>  		.name = "mdp_clk_src",
>>> -		.parent_names = gcc_parent_names_9,
>>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_9),
>>> +		.parent_data = gcc_parent_data_9,
>>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_9),
>>>  		.ops = &clk_rcg2_ops,
>>>  	},
>>>  };
>>> @@ -938,8 +955,8 @@ static struct clk_rcg2 pcie_0_aux_clk_src = {
>>>  	.freq_tbl = ftbl_pcie_0_aux_clk_src,
>>>  	.clkr.hw.init = &(struct clk_init_data){
>>>  		.name = "pcie_0_aux_clk_src",
>>> -		.parent_names = gcc_parent_names_10,
>>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_10),
>>> +		.parent_data = gcc_parent_data_10,
>>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_10),
>>>  		.ops = &clk_rcg2_ops,
>>>  	},
>>>  };
>>> @@ -959,8 +976,8 @@ static struct clk_rcg2 pcie_0_pipe_clk_src = {
>>>  	.freq_tbl = ftbl_pcie_0_pipe_clk_src,
>>>  	.clkr.hw.init = &(struct clk_init_data){
>>>  		.name = "pcie_0_pipe_clk_src",
>>> -		.parent_names = gcc_parent_names_11,
>>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_11),
>>> +		.parent_data = gcc_parent_data_11,
>>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_11),
>>>  		.ops = &clk_rcg2_ops,
>>>  	},
>>>  };
>>> @@ -972,8 +989,8 @@ static struct clk_rcg2 pclk0_clk_src = {
>>>  	.parent_map = gcc_parent_map_12,
>>>  	.clkr.hw.init = &(struct clk_init_data){
>>>  		.name = "pclk0_clk_src",
>>> -		.parent_names = gcc_parent_names_12,
>>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_12),
>>> +		.parent_data = gcc_parent_data_12,
>>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_12),
>>>  		.flags = CLK_SET_RATE_PARENT,
>>>  		.ops = &clk_pixel_ops,
>>>  	},
>>> @@ -993,8 +1010,8 @@ static struct clk_rcg2 pdm2_clk_src = {
>>>  	.freq_tbl = ftbl_pdm2_clk_src,
>>>  	.clkr.hw.init = &(struct clk_init_data){
>>>  		.name = "pdm2_clk_src",
>>> -		.parent_names = gcc_parent_names_0,
>>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
>>> +		.parent_data = gcc_parent_data_0,
>>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
>>>  		.ops = &clk_rcg2_ops,
>>>  	},
>>>  };
>>> @@ -1021,8 +1038,8 @@ static struct clk_rcg2 sdcc1_apps_clk_src = {
>>>  	.freq_tbl = ftbl_sdcc1_apps_clk_src,
>>>  	.clkr.hw.init = &(struct clk_init_data){
>>>  		.name = "sdcc1_apps_clk_src",
>>> -		.parent_names = gcc_parent_names_13,
>>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_13),
>>> +		.parent_data = gcc_parent_data_13,
>>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_13),
>>>  		.ops = &clk_rcg2_floor_ops,
>>>  	},
>>>  };
>>> @@ -1041,8 +1058,8 @@ static struct clk_rcg2 sdcc1_ice_core_clk_src = {
>>>  	.freq_tbl = ftbl_sdcc1_ice_core_clk_src,
>>>  	.clkr.hw.init = &(struct clk_init_data){
>>>  		.name = "sdcc1_ice_core_clk_src",
>>> -		.parent_names = gcc_parent_names_3,
>>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_3),
>>> +		.parent_data = gcc_parent_data_3,
>>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_3),
>>>  		.ops = &clk_rcg2_ops,
>>>  	},
>>>  };
>>> @@ -1067,8 +1084,8 @@ static struct clk_rcg2 sdcc2_apps_clk_src = {
>>>  	.freq_tbl = ftbl_sdcc2_apps_clk_src,
>>>  	.clkr.hw.init = &(struct clk_init_data){
>>>  		.name = "sdcc2_apps_clk_src",
>>> -		.parent_names = gcc_parent_names_14,
>>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_14),
>>> +		.parent_data = gcc_parent_data_14,
>>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_14),
>>>  		.ops = &clk_rcg2_floor_ops,
>>>  	},
>>>  };
>>> @@ -1081,8 +1098,8 @@ static struct clk_rcg2 usb20_mock_utmi_clk_src = {
>>>  	.freq_tbl = ftbl_esc0_clk_src,
>>>  	.clkr.hw.init = &(struct clk_init_data){
>>>  		.name = "usb20_mock_utmi_clk_src",
>>> -		.parent_names = gcc_parent_names_1,
>>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_1),
>>> +		.parent_data = gcc_parent_data_1,
>>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_1),
>>>  		.ops = &clk_rcg2_ops,
>>>  	},
>>>  };
>>> @@ -1103,8 +1120,8 @@ static struct clk_rcg2 usb30_master_clk_src = {
>>>  	.freq_tbl = ftbl_usb30_master_clk_src,
>>>  	.clkr.hw.init = &(struct clk_init_data){
>>>  		.name = "usb30_master_clk_src",
>>> -		.parent_names = gcc_parent_names_0,
>>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_0),
>>> +		.parent_data = gcc_parent_data_0,
>>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_0),
>>>  		.ops = &clk_rcg2_ops,
>>>  	},
>>>  };
>>> @@ -1117,8 +1134,8 @@ static struct clk_rcg2 usb30_mock_utmi_clk_src = {
>>>  	.freq_tbl = ftbl_esc0_clk_src,
>>>  	.clkr.hw.init = &(struct clk_init_data){
>>>  		.name = "usb30_mock_utmi_clk_src",
>>> -		.parent_names = gcc_parent_names_1,
>>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_1),
>>> +		.parent_data = gcc_parent_data_1,
>>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_1),
>>>  		.ops = &clk_rcg2_ops,
>>>  	},
>>>  };
>>> @@ -1131,8 +1148,8 @@ static struct clk_rcg2 usb3_phy_aux_clk_src = {
>>>  	.freq_tbl = ftbl_pcie_0_aux_clk_src,
>>>  	.clkr.hw.init = &(struct clk_init_data){
>>>  		.name = "usb3_phy_aux_clk_src",
>>> -		.parent_names = gcc_parent_names_1,
>>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_1),
>>> +		.parent_data = gcc_parent_data_1,
>>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_1),
>>>  		.ops = &clk_rcg2_ops,
>>>  	},
>>>  };
>>> @@ -1154,8 +1171,8 @@ static struct clk_rcg2 usb_hs_system_clk_src = {
>>>  	.freq_tbl = ftbl_usb_hs_system_clk_src,
>>>  	.clkr.hw.init = &(struct clk_init_data){
>>>  		.name = "usb_hs_system_clk_src",
>>> -		.parent_names = gcc_parent_names_3,
>>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_3),
>>> +		.parent_data = gcc_parent_data_3,
>>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_3),
>>>  		.ops = &clk_rcg2_ops,
>>>  	},
>>>  };
>>> @@ -1168,8 +1185,8 @@ static struct clk_rcg2 vsync_clk_src = {
>>>  	.freq_tbl = ftbl_esc0_clk_src,
>>>  	.clkr.hw.init = &(struct clk_init_data){
>>>  		.name = "vsync_clk_src",
>>> -		.parent_names = gcc_parent_names_15,
>>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_15),
>>> +		.parent_data = gcc_parent_data_15,
>>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_15),
>>>  		.ops = &clk_rcg2_ops,
>>>  	},
>>>  };
>>> @@ -1190,8 +1207,8 @@ static struct clk_rcg2 cdsp_bimc_clk_src = {
>>>  	.freq_tbl = ftbl_cdsp_bimc_clk_src,
>>>  	.clkr.hw.init = &(struct clk_init_data) {
>>>  		.name = "cdsp_bimc_clk_src",
>>> -		.parent_names = gcc_parent_names_16,
>>> -		.num_parents = ARRAY_SIZE(gcc_parent_names_16),
>>> +		.parent_data = gcc_parent_data_16,
>>> +		.num_parents = ARRAY_SIZE(gcc_parent_data_16),
>>>  		.ops = &clk_rcg2_ops,
>>>  	},
>>>  };
>>> @@ -1204,8 +1221,8 @@ static struct clk_branch gcc_apss_ahb_clk = {
>>>  		.enable_mask = BIT(14),
>>>  		.hw.init = &(struct clk_init_data){
>>>  			.name = "gcc_apss_ahb_clk",
>>> -			.parent_names = (const char *[]){
>>> -				"apss_ahb_clk_src",
>>> +			.parent_hws = (const struct clk_hw*[]) {
>>> +				&apss_ahb_clk_src.clkr.hw,
>>>  			},
>>>  			.num_parents = 1,
>>>  			.flags = CLK_SET_RATE_PARENT,
>>> @@ -1236,8 +1253,8 @@ static struct clk_branch gcc_bimc_gfx_clk = {
>>>  		.hw.init = &(struct clk_init_data){
>>>  			.name = "gcc_bimc_gfx_clk",
>>>  			.ops = &clk_branch2_ops,
>>> -			.parent_names = (const char *[]){
>>> -				"gcc_apss_tcu_clk",
>>> +			.parent_hws = (const struct clk_hw*[]) {
>>> +				&gcc_apss_tcu_clk.clkr.hw,
>>>  			},
>>>  
>>>  		},
>>> @@ -1265,8 +1282,8 @@ static struct clk_branch gcc_bimc_cdsp_clk = {
>>>  		.enable_mask = BIT(0),
>>>  		.hw.init = &(struct clk_init_data) {
>>>  			.name = "gcc_bimc_cdsp_clk",
>>> -			.parent_names = (const char *[]) {
>>> -				"cdsp_bimc_clk_src",
>>> +			.parent_hws = (const struct clk_hw*[]) {
>>> +				&cdsp_bimc_clk_src.clkr.hw
>>>  			},
>>>  			.num_parents = 1,
>>>  			.flags = CLK_SET_RATE_PARENT,
>>> @@ -1335,8 +1352,8 @@ static struct clk_branch gcc_blsp1_qup0_i2c_apps_clk = {
>>>  		.enable_mask = BIT(0),
>>>  		.hw.init = &(struct clk_init_data){
>>>  			.name = "gcc_blsp1_qup0_i2c_apps_clk",
>>> -			.parent_names = (const char *[]){
>>> -				"blsp1_qup0_i2c_apps_clk_src",
>>> +			.parent_hws = (const struct clk_hw*[]) {
>>> +				&blsp1_qup0_i2c_apps_clk_src.clkr.hw,
>>>  			},
>>>  			.num_parents = 1,
>>>  			.flags 

[PATCH 11/15] clk: qcom: gcc-qcs404: sort out the cxo clock

[Dmitry Baryshkov]

The GCC driver registers the cxo clock as a thin wrapper around board's
xo_board clock. Nowadays we can use the xo_board directly in all the
clocks that use it. Use the fw_name "cxo" for this clock.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 drivers/clk/qcom/gcc-qcs404.c | 97 +++++++++++++++--------------------
 1 file changed, 41 insertions(+), 56 deletions(-)

diff --git a/drivers/clk/qcom/gcc-qcs404.c b/drivers/clk/qcom/gcc-qcs404.c
index 3941175d73a5..8fb268671f0c 100644
--- a/drivers/clk/qcom/gcc-qcs404.c
+++ b/drivers/clk/qcom/gcc-qcs404.c
@@ -37,14 +37,21 @@ enum {
 	P_XO,
 };
 
+static const struct parent_map gcc_parent_map_1[] = {
+	{ P_XO, 0 },
+};
+
+static const struct clk_parent_data gcc_parent_data_1[] = {
+	{ .fw_name = "cxo", .name = "xo-board" },
+};
+
 static struct clk_fixed_factor cxo = {
 	.mult = 1,
 	.div = 1,
 	.hw.init = &(struct clk_init_data){
 		.name = "cxo",
-		.parent_data = &(const struct clk_parent_data) {
-			.name = "xo-board",
-		},
+		.parent_data = gcc_parent_data_1,
+		.num_parents = ARRAY_SIZE(gcc_parent_data_1),
 		.num_parents = 1,
 		.ops = &clk_fixed_factor_ops,
 	},
@@ -59,10 +66,8 @@ static struct clk_alpha_pll gpll0_sleep_clk_src = {
 		.enable_is_inverted = true,
 		.hw.init = &(struct clk_init_data){
 			.name = "gpll0_sleep_clk_src",
-			.parent_data = &(const struct clk_parent_data) {
-				.hw = &cxo.hw,
-			},
-			.num_parents = 1,
+			.parent_data = gcc_parent_data_1,
+			.num_parents = ARRAY_SIZE(gcc_parent_data_1),
 			.ops = &clk_alpha_pll_ops,
 		},
 	},
@@ -77,10 +82,8 @@ static struct clk_alpha_pll gpll0_out_main = {
 		.enable_mask = BIT(0),
 		.hw.init = &(struct clk_init_data){
 			.name = "gpll0_out_main",
-			.parent_data = &(const struct clk_parent_data) {
-				.hw = &cxo.hw,
-			},
-			.num_parents = 1,
+			.parent_data = gcc_parent_data_1,
+			.num_parents = ARRAY_SIZE(gcc_parent_data_1),
 			.ops = &clk_alpha_pll_ops,
 		},
 	},
@@ -95,10 +98,8 @@ static struct clk_alpha_pll gpll0_ao_out_main = {
 		.enable_mask = BIT(0),
 		.hw.init = &(struct clk_init_data){
 			.name = "gpll0_ao_out_main",
-			.parent_data = &(const struct clk_parent_data) {
-				.hw = &cxo.hw,
-			},
-			.num_parents = 1,
+			.parent_data = gcc_parent_data_1,
+			.num_parents = ARRAY_SIZE(gcc_parent_data_1),
 			.flags = CLK_IS_CRITICAL,
 			.ops = &clk_alpha_pll_fixed_ops,
 		},
@@ -113,10 +114,8 @@ static struct clk_alpha_pll gpll1_out_main = {
 		.enable_mask = BIT(1),
 		.hw.init = &(struct clk_init_data){
 			.name = "gpll1_out_main",
-			.parent_data = &(const struct clk_parent_data) {
-				.hw = &cxo.hw,
-			},
-			.num_parents = 1,
+			.parent_data = gcc_parent_data_1,
+			.num_parents = ARRAY_SIZE(gcc_parent_data_1),
 			.ops = &clk_alpha_pll_ops,
 		},
 	},
@@ -146,10 +145,8 @@ static struct clk_alpha_pll gpll3_out_main = {
 	.clkr = {
 		.hw.init = &(struct clk_init_data){
 			.name = "gpll3_out_main",
-			.parent_data = &(const struct clk_parent_data) {
-				.hw = &cxo.hw,
-			},
-			.num_parents = 1,
+			.parent_data = gcc_parent_data_1,
+			.num_parents = ARRAY_SIZE(gcc_parent_data_1),
 			.ops = &clk_alpha_pll_ops,
 		},
 	},
@@ -163,10 +160,8 @@ static struct clk_alpha_pll gpll4_out_main = {
 		.enable_mask = BIT(5),
 		.hw.init = &(struct clk_init_data){
 			.name = "gpll4_out_main",
-			.parent_data = &(const struct clk_parent_data) {
-				.hw = &cxo.hw,
-			},
-			.num_parents = 1,
+			.parent_data = gcc_parent_data_1,
+			.num_parents = ARRAY_SIZE(gcc_parent_data_1),
 			.ops = &clk_alpha_pll_ops,
 		},
 	},
@@ -182,10 +177,8 @@ static struct clk_pll gpll6 = {
 	.status_bit = 17,
 	.clkr.hw.init = &(struct clk_init_data){
 		.name = "gpll6",
-		.parent_data = &(const struct clk_parent_data) {
-			.hw = &cxo.hw,
-		},
-		.num_parents = 1,
+		.parent_data = gcc_parent_data_1,
+		.num_parents = ARRAY_SIZE(gcc_parent_data_1),
 		.ops = &clk_pll_ops,
 	},
 };
@@ -209,23 +202,15 @@ static const struct parent_map gcc_parent_map_0[] = {
 };
 
 static const struct clk_parent_data gcc_parent_data_0[] = {
-	{ .hw = &cxo.hw },
+	{ .fw_name = "cxo", .name = "xo-board" },
 	{ .hw = &gpll0_out_main.clkr.hw },
 };
 
 static const struct clk_parent_data gcc_parent_data_ao_0[] = {
-	{ .hw = &cxo.hw },
+	{ .fw_name = "cxo", .name = "xo-board" },
 	{ .hw = &gpll0_ao_out_main.clkr.hw },
 };
 
-static const struct parent_map gcc_parent_map_1[] = {
-	{ P_XO, 0 },
-};
-
-static const struct clk_parent_data gcc_parent_data_1[] = {
-	{ .hw = &cxo.hw },
-};
-
 static const struct parent_map gcc_parent_map_2[] = {
 	{ P_XO, 0 },
 	{ P_GPLL0_OUT_MAIN, 1 },
@@ -234,7 +219,7 @@ static const struct parent_map gcc_parent_map_2[] = {
 };
 
 static const struct clk_parent_data gcc_parent_data_2[] = {
-	{ .hw = &cxo.hw },
+	{ .fw_name = "cxo", .name = "xo-board" },
 	{ .hw = &gpll0_out_main.clkr.hw },
 	{ .hw = &gpll6_out_aux.hw },
 	{ .fw_name = "sleep_clk", .name = "sleep_clk" },
@@ -247,7 +232,7 @@ static const struct parent_map gcc_parent_map_3[] = {
 };
 
 static const struct clk_parent_data gcc_parent_data_3[] = {
-	{ .hw = &cxo.hw },
+	{ .fw_name = "cxo", .name = "xo-board" },
 	{ .hw = &gpll0_out_main.clkr.hw },
 	{ .hw = &gpll6_out_aux.hw },
 };
@@ -258,7 +243,7 @@ static const struct parent_map gcc_parent_map_4[] = {
 };
 
 static const struct clk_parent_data gcc_parent_data_4[] = {
-	{ .hw = &cxo.hw },
+	{ .fw_name = "cxo", .name = "xo-board" },
 	{ .hw = &gpll1_out_main.clkr.hw },
 };
 
@@ -269,7 +254,7 @@ static const struct parent_map gcc_parent_map_5[] = {
 };
 
 static const struct clk_parent_data gcc_parent_data_5[] = {
-	{ .hw = &cxo.hw },
+	{ .fw_name = "cxo", .name = "xo-board" },
 	{ .fw_name = "dsi0pllbyte", .name = "dsi0pllbyte" },
 	/* "gpll0_out_aux", */
 };
@@ -281,7 +266,7 @@ static const struct parent_map gcc_parent_map_6[] = {
 };
 
 static const struct clk_parent_data gcc_parent_data_6[] = {
-	{ .hw = &cxo.hw },
+	{ .fw_name = "cxo", .name = "xo-board" },
 	{ .fw_name = "dsi0pllbyte", .name = "dsi0pllbyte" },
 	/* "gpll0_out_aux", */
 };
@@ -295,7 +280,7 @@ static const struct parent_map gcc_parent_map_7[] = {
 };
 
 static const struct clk_parent_data gcc_parent_data_7[] = {
-	{ .hw = &cxo.hw },
+	{ .fw_name = "cxo", .name = "xo-board" },
 	{ .hw = &gpll0_out_main.clkr.hw },
 	{ .hw = &gpll3_out_main.clkr.hw },
 	{ .hw = &gpll6_out_aux.hw },
@@ -308,7 +293,7 @@ static const struct parent_map gcc_parent_map_8[] = {
 };
 
 static const struct clk_parent_data gcc_parent_data_8[] = {
-	{ .hw = &cxo.hw },
+	{ .fw_name = "cxo", .name = "xo-board" },
 	{ .fw_name = "hdmi_pll", .name = "hdmi_pll" },
 };
 
@@ -320,7 +305,7 @@ static const struct parent_map gcc_parent_map_9[] = {
 };
 
 static const struct clk_parent_data gcc_parent_data_9[] = {
-	{ .hw = &cxo.hw },
+	{ .fw_name = "cxo", .name = "xo-board" },
 	{ .hw = &gpll0_out_main.clkr.hw },
 	{ .fw_name = "dsi0pll", .name = "dsi0pll" },
 	{ .hw = &gpll6_out_aux.hw },
@@ -332,7 +317,7 @@ static const struct parent_map gcc_parent_map_10[] = {
 };
 
 static const struct clk_parent_data gcc_parent_data_10[] = {
-	{ .hw = &cxo.hw },
+	{ .fw_name = "cxo", .name = "xo-board" },
 	{ .fw_name = "sleep_clk", .name = "sleep_clk" },
 };
 
@@ -342,7 +327,7 @@ static const struct parent_map gcc_parent_map_11[] = {
 };
 
 static const struct clk_parent_data gcc_parent_data_11[] = {
-	{ .hw = &cxo.hw },
+	{ .fw_name = "cxo", .name = "xo-board" },
 	{ .fw_name = "pcie_0_pipe_clk", .name = "pcie_0_pipe_clk" },
 };
 
@@ -353,7 +338,7 @@ static const struct parent_map gcc_parent_map_12[] = {
 };
 
 static const struct clk_parent_data gcc_parent_data_12[] = {
-	{ .hw = &cxo.hw },
+	{ .fw_name = "cxo", .name = "xo-board" },
 	{ .fw_name = "dsi0pll", .name = "dsi0pll" },
 	/* "gpll0_out_aux", */
 };
@@ -366,7 +351,7 @@ static const struct parent_map gcc_parent_map_13[] = {
 };
 
 static const struct clk_parent_data gcc_parent_data_13[] = {
-	{ .hw = &cxo.hw },
+	{ .fw_name = "cxo", .name = "xo-board" },
 	{ .hw = &gpll0_out_main.clkr.hw },
 	{ .hw = &gpll4_out_main.clkr.hw },
 	{ .hw = &gpll6_out_aux.hw },
@@ -379,7 +364,7 @@ static const struct parent_map gcc_parent_map_14[] = {
 };
 
 static const struct clk_parent_data gcc_parent_data_14[] = {
-	{ .hw = &cxo.hw },
+	{ .fw_name = "cxo", .name = "xo-board" },
 	{ .hw = &gpll0_out_main.clkr.hw },
 	/* "gpll4_out_aux", */
 };
@@ -390,7 +375,7 @@ static const struct parent_map gcc_parent_map_15[] = {
 };
 
 static const struct clk_parent_data gcc_parent_data_15[] = {
-	{ .hw = &cxo.hw },
+	{ .fw_name = "cxo", .name = "xo-board" },
 	/* "gpll0_out_aux", */
 };
 
@@ -401,7 +386,7 @@ static const struct parent_map gcc_parent_map_16[] = {
 };
 
 static const struct clk_parent_data gcc_parent_data_16[] = {
-	{ .hw = &cxo.hw },
+	{ .fw_name = "cxo", .name = "xo-board" },
 	{ .hw = &gpll0_out_main.clkr.hw },
 	/* "gpll0_out_aux", */
 };
-- 
2.35.1

Re: [PATCH 11/15] clk: qcom: gcc-qcs404: sort out the cxo clock

[Konrad Dybcio]

On 17.12.2022 01:17, Dmitry Baryshkov wrote:
> The GCC driver registers the cxo clock as a thin wrapper around board's
> xo_board clock. Nowadays we can use the xo_board directly in all the
> clocks that use it. Use the fw_name "cxo" for this clock.
> 
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
With/without the .index comment in 10/15:

Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>

Konrad
>  drivers/clk/qcom/gcc-qcs404.c | 97 +++++++++++++++--------------------
>  1 file changed, 41 insertions(+), 56 deletions(-)
> 
> diff --git a/drivers/clk/qcom/gcc-qcs404.c b/drivers/clk/qcom/gcc-qcs404.c
> index 3941175d73a5..8fb268671f0c 100644
> --- a/drivers/clk/qcom/gcc-qcs404.c
> +++ b/drivers/clk/qcom/gcc-qcs404.c
> @@ -37,14 +37,21 @@ enum {
>  	P_XO,
>  };
>  
> +static const struct parent_map gcc_parent_map_1[] = {
> +	{ P_XO, 0 },
> +};
> +
> +static const struct clk_parent_data gcc_parent_data_1[] = {
> +	{ .fw_name = "cxo", .name = "xo-board" },
> +};
> +
>  static struct clk_fixed_factor cxo = {
>  	.mult = 1,
>  	.div = 1,
>  	.hw.init = &(struct clk_init_data){
>  		.name = "cxo",
> -		.parent_data = &(const struct clk_parent_data) {
> -			.name = "xo-board",
> -		},
> +		.parent_data = gcc_parent_data_1,
> +		.num_parents = ARRAY_SIZE(gcc_parent_data_1),
>  		.num_parents = 1,
>  		.ops = &clk_fixed_factor_ops,
>  	},
> @@ -59,10 +66,8 @@ static struct clk_alpha_pll gpll0_sleep_clk_src = {
>  		.enable_is_inverted = true,
>  		.hw.init = &(struct clk_init_data){
>  			.name = "gpll0_sleep_clk_src",
> -			.parent_data = &(const struct clk_parent_data) {
> -				.hw = &cxo.hw,
> -			},
> -			.num_parents = 1,
> +			.parent_data = gcc_parent_data_1,
> +			.num_parents = ARRAY_SIZE(gcc_parent_data_1),
>  			.ops = &clk_alpha_pll_ops,
>  		},
>  	},
> @@ -77,10 +82,8 @@ static struct clk_alpha_pll gpll0_out_main = {
>  		.enable_mask = BIT(0),
>  		.hw.init = &(struct clk_init_data){
>  			.name = "gpll0_out_main",
> -			.parent_data = &(const struct clk_parent_data) {
> -				.hw = &cxo.hw,
> -			},
> -			.num_parents = 1,
> +			.parent_data = gcc_parent_data_1,
> +			.num_parents = ARRAY_SIZE(gcc_parent_data_1),
>  			.ops = &clk_alpha_pll_ops,
>  		},
>  	},
> @@ -95,10 +98,8 @@ static struct clk_alpha_pll gpll0_ao_out_main = {
>  		.enable_mask = BIT(0),
>  		.hw.init = &(struct clk_init_data){
>  			.name = "gpll0_ao_out_main",
> -			.parent_data = &(const struct clk_parent_data) {
> -				.hw = &cxo.hw,
> -			},
> -			.num_parents = 1,
> +			.parent_data = gcc_parent_data_1,
> +			.num_parents = ARRAY_SIZE(gcc_parent_data_1),
>  			.flags = CLK_IS_CRITICAL,
>  			.ops = &clk_alpha_pll_fixed_ops,
>  		},
> @@ -113,10 +114,8 @@ static struct clk_alpha_pll gpll1_out_main = {
>  		.enable_mask = BIT(1),
>  		.hw.init = &(struct clk_init_data){
>  			.name = "gpll1_out_main",
> -			.parent_data = &(const struct clk_parent_data) {
> -				.hw = &cxo.hw,
> -			},
> -			.num_parents = 1,
> +			.parent_data = gcc_parent_data_1,
> +			.num_parents = ARRAY_SIZE(gcc_parent_data_1),
>  			.ops = &clk_alpha_pll_ops,
>  		},
>  	},
> @@ -146,10 +145,8 @@ static struct clk_alpha_pll gpll3_out_main = {
>  	.clkr = {
>  		.hw.init = &(struct clk_init_data){
>  			.name = "gpll3_out_main",
> -			.parent_data = &(const struct clk_parent_data) {
> -				.hw = &cxo.hw,
> -			},
> -			.num_parents = 1,
> +			.parent_data = gcc_parent_data_1,
> +			.num_parents = ARRAY_SIZE(gcc_parent_data_1),
>  			.ops = &clk_alpha_pll_ops,
>  		},
>  	},
> @@ -163,10 +160,8 @@ static struct clk_alpha_pll gpll4_out_main = {
>  		.enable_mask = BIT(5),
>  		.hw.init = &(struct clk_init_data){
>  			.name = "gpll4_out_main",
> -			.parent_data = &(const struct clk_parent_data) {
> -				.hw = &cxo.hw,
> -			},
> -			.num_parents = 1,
> +			.parent_data = gcc_parent_data_1,
> +			.num_parents = ARRAY_SIZE(gcc_parent_data_1),
>  			.ops = &clk_alpha_pll_ops,
>  		},
>  	},
> @@ -182,10 +177,8 @@ static struct clk_pll gpll6 = {
>  	.status_bit = 17,
>  	.clkr.hw.init = &(struct clk_init_data){
>  		.name = "gpll6",
> -		.parent_data = &(const struct clk_parent_data) {
> -			.hw = &cxo.hw,
> -		},
> -		.num_parents = 1,
> +		.parent_data = gcc_parent_data_1,
> +		.num_parents = ARRAY_SIZE(gcc_parent_data_1),
>  		.ops = &clk_pll_ops,
>  	},
>  };
> @@ -209,23 +202,15 @@ static const struct parent_map gcc_parent_map_0[] = {
>  };
>  
>  static const struct clk_parent_data gcc_parent_data_0[] = {
> -	{ .hw = &cxo.hw },
> +	{ .fw_name = "cxo", .name = "xo-board" },
>  	{ .hw = &gpll0_out_main.clkr.hw },
>  };
>  
>  static const struct clk_parent_data gcc_parent_data_ao_0[] = {
> -	{ .hw = &cxo.hw },
> +	{ .fw_name = "cxo", .name = "xo-board" },
>  	{ .hw = &gpll0_ao_out_main.clkr.hw },
>  };
>  
> -static const struct parent_map gcc_parent_map_1[] = {
> -	{ P_XO, 0 },
> -};
> -
> -static const struct clk_parent_data gcc_parent_data_1[] = {
> -	{ .hw = &cxo.hw },
> -};
> -
>  static const struct parent_map gcc_parent_map_2[] = {
>  	{ P_XO, 0 },
>  	{ P_GPLL0_OUT_MAIN, 1 },
> @@ -234,7 +219,7 @@ static const struct parent_map gcc_parent_map_2[] = {
>  };
>  
>  static const struct clk_parent_data gcc_parent_data_2[] = {
> -	{ .hw = &cxo.hw },
> +	{ .fw_name = "cxo", .name = "xo-board" },
>  	{ .hw = &gpll0_out_main.clkr.hw },
>  	{ .hw = &gpll6_out_aux.hw },
>  	{ .fw_name = "sleep_clk", .name = "sleep_clk" },
> @@ -247,7 +232,7 @@ static const struct parent_map gcc_parent_map_3[] = {
>  };
>  
>  static const struct clk_parent_data gcc_parent_data_3[] = {
> -	{ .hw = &cxo.hw },
> +	{ .fw_name = "cxo", .name = "xo-board" },
>  	{ .hw = &gpll0_out_main.clkr.hw },
>  	{ .hw = &gpll6_out_aux.hw },
>  };
> @@ -258,7 +243,7 @@ static const struct parent_map gcc_parent_map_4[] = {
>  };
>  
>  static const struct clk_parent_data gcc_parent_data_4[] = {
> -	{ .hw = &cxo.hw },
> +	{ .fw_name = "cxo", .name = "xo-board" },
>  	{ .hw = &gpll1_out_main.clkr.hw },
>  };
>  
> @@ -269,7 +254,7 @@ static const struct parent_map gcc_parent_map_5[] = {
>  };
>  
>  static const struct clk_parent_data gcc_parent_data_5[] = {
> -	{ .hw = &cxo.hw },
> +	{ .fw_name = "cxo", .name = "xo-board" },
>  	{ .fw_name = "dsi0pllbyte", .name = "dsi0pllbyte" },
>  	/* "gpll0_out_aux", */
>  };
> @@ -281,7 +266,7 @@ static const struct parent_map gcc_parent_map_6[] = {
>  };
>  
>  static const struct clk_parent_data gcc_parent_data_6[] = {
> -	{ .hw = &cxo.hw },
> +	{ .fw_name = "cxo", .name = "xo-board" },
>  	{ .fw_name = "dsi0pllbyte", .name = "dsi0pllbyte" },
>  	/* "gpll0_out_aux", */
>  };
> @@ -295,7 +280,7 @@ static const struct parent_map gcc_parent_map_7[] = {
>  };
>  
>  static const struct clk_parent_data gcc_parent_data_7[] = {
> -	{ .hw = &cxo.hw },
> +	{ .fw_name = "cxo", .name = "xo-board" },
>  	{ .hw = &gpll0_out_main.clkr.hw },
>  	{ .hw = &gpll3_out_main.clkr.hw },
>  	{ .hw = &gpll6_out_aux.hw },
> @@ -308,7 +293,7 @@ static const struct parent_map gcc_parent_map_8[] = {
>  };
>  
>  static const struct clk_parent_data gcc_parent_data_8[] = {
> -	{ .hw = &cxo.hw },
> +	{ .fw_name = "cxo", .name = "xo-board" },
>  	{ .fw_name = "hdmi_pll", .name = "hdmi_pll" },
>  };
>  
> @@ -320,7 +305,7 @@ static const struct parent_map gcc_parent_map_9[] = {
>  };
>  
>  static const struct clk_parent_data gcc_parent_data_9[] = {
> -	{ .hw = &cxo.hw },
> +	{ .fw_name = "cxo", .name = "xo-board" },
>  	{ .hw = &gpll0_out_main.clkr.hw },
>  	{ .fw_name = "dsi0pll", .name = "dsi0pll" },
>  	{ .hw = &gpll6_out_aux.hw },
> @@ -332,7 +317,7 @@ static const struct parent_map gcc_parent_map_10[] = {
>  };
>  
>  static const struct clk_parent_data gcc_parent_data_10[] = {
> -	{ .hw = &cxo.hw },
> +	{ .fw_name = "cxo", .name = "xo-board" },
>  	{ .fw_name = "sleep_clk", .name = "sleep_clk" },
>  };
>  
> @@ -342,7 +327,7 @@ static const struct parent_map gcc_parent_map_11[] = {
>  };
>  
>  static const struct clk_parent_data gcc_parent_data_11[] = {
> -	{ .hw = &cxo.hw },
> +	{ .fw_name = "cxo", .name = "xo-board" },
>  	{ .fw_name = "pcie_0_pipe_clk", .name = "pcie_0_pipe_clk" },
>  };
>  
> @@ -353,7 +338,7 @@ static const struct parent_map gcc_parent_map_12[] = {
>  };
>  
>  static const struct clk_parent_data gcc_parent_data_12[] = {
> -	{ .hw = &cxo.hw },
> +	{ .fw_name = "cxo", .name = "xo-board" },
>  	{ .fw_name = "dsi0pll", .name = "dsi0pll" },
>  	/* "gpll0_out_aux", */
>  };
> @@ -366,7 +351,7 @@ static const struct parent_map gcc_parent_map_13[] = {
>  };
>  
>  static const struct clk_parent_data gcc_parent_data_13[] = {
> -	{ .hw = &cxo.hw },
> +	{ .fw_name = "cxo", .name = "xo-board" },
>  	{ .hw = &gpll0_out_main.clkr.hw },
>  	{ .hw = &gpll4_out_main.clkr.hw },
>  	{ .hw = &gpll6_out_aux.hw },
> @@ -379,7 +364,7 @@ static const struct parent_map gcc_parent_map_14[] = {
>  };
>  
>  static const struct clk_parent_data gcc_parent_data_14[] = {
> -	{ .hw = &cxo.hw },
> +	{ .fw_name = "cxo", .name = "xo-board" },
>  	{ .hw = &gpll0_out_main.clkr.hw },
>  	/* "gpll4_out_aux", */
>  };
> @@ -390,7 +375,7 @@ static const struct parent_map gcc_parent_map_15[] = {
>  };
>  
>  static const struct clk_parent_data gcc_parent_data_15[] = {
> -	{ .hw = &cxo.hw },
> +	{ .fw_name = "cxo", .name = "xo-board" },
>  	/* "gpll0_out_aux", */
>  };
>  
> @@ -401,7 +386,7 @@ static const struct parent_map gcc_parent_map_16[] = {
>  };
>  
>  static const struct clk_parent_data gcc_parent_data_16[] = {
> -	{ .hw = &cxo.hw },
> +	{ .fw_name = "cxo", .name = "xo-board" },
>  	{ .hw = &gpll0_out_main.clkr.hw },
>  	/* "gpll0_out_aux", */
>  };

[PATCH 12/15] clk: qcom: gcc-qcs404: add support for GDSCs

[Dmitry Baryshkov]

Add support for two GDSCs provided by this clock controller.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 drivers/clk/qcom/gcc-qcs404.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/drivers/clk/qcom/gcc-qcs404.c b/drivers/clk/qcom/gcc-qcs404.c
index 8fb268671f0c..f8dbfffc2b8e 100644
--- a/drivers/clk/qcom/gcc-qcs404.c
+++ b/drivers/clk/qcom/gcc-qcs404.c
@@ -19,6 +19,7 @@
 #include "clk-rcg.h"
 #include "clk-regmap.h"
 #include "common.h"
+#include "gdsc.h"
 #include "reset.h"
 
 enum {
@@ -2598,6 +2599,22 @@ static struct clk_branch gcc_wdsp_q6ss_axim_clk = {
 	},
 };
 
+static struct gdsc mdss_gdsc = {
+	.gdscr = 0x4d078,
+	.pd = {
+		.name = "mdss",
+	},
+	.pwrsts = PWRSTS_OFF_ON,
+};
+
+static struct gdsc oxili_gdsc = {
+	.gdscr = 0x5901c,
+	.pd = {
+		.name = "oxili",
+	},
+	.pwrsts = PWRSTS_OFF_ON,
+};
+
 static struct clk_hw *gcc_qcs404_hws[] = {
 	&cxo.hw,
 };
@@ -2748,6 +2765,11 @@ static struct clk_regmap *gcc_qcs404_clocks[] = {
 
 };
 
+static struct gdsc *gcc_qcs404_gdscs[] = {
+	[MDSS_GDSC] = &mdss_gdsc,
+	[OXILI_GDSC] = &oxili_gdsc,
+};
+
 static const struct qcom_reset_map gcc_qcs404_resets[] = {
 	[GCC_GENI_IR_BCR] = { 0x0F000 },
 	[GCC_CDSP_RESTART] = { 0x18000 },
@@ -2790,6 +2812,8 @@ static const struct qcom_cc_desc gcc_qcs404_desc = {
 	.num_resets = ARRAY_SIZE(gcc_qcs404_resets),
 	.clk_hws = gcc_qcs404_hws,
 	.num_clk_hws = ARRAY_SIZE(gcc_qcs404_hws),
+	.gdscs = gcc_qcs404_gdscs,
+	.num_gdscs = ARRAY_SIZE(gcc_qcs404_gdscs),
 };
 
 static const struct of_device_id gcc_qcs404_match_table[] = {
-- 
2.35.1

Re: [PATCH 12/15] clk: qcom: gcc-qcs404: add support for GDSCs

[Konrad Dybcio]

On 17.12.2022 01:17, Dmitry Baryshkov wrote:
> Add support for two GDSCs provided by this clock controller.
> 
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>

Konrad
>  drivers/clk/qcom/gcc-qcs404.c | 24 ++++++++++++++++++++++++
>  1 file changed, 24 insertions(+)
> 
> diff --git a/drivers/clk/qcom/gcc-qcs404.c b/drivers/clk/qcom/gcc-qcs404.c
> index 8fb268671f0c..f8dbfffc2b8e 100644
> --- a/drivers/clk/qcom/gcc-qcs404.c
> +++ b/drivers/clk/qcom/gcc-qcs404.c
> @@ -19,6 +19,7 @@
>  #include "clk-rcg.h"
>  #include "clk-regmap.h"
>  #include "common.h"
> +#include "gdsc.h"
>  #include "reset.h"
>  
>  enum {
> @@ -2598,6 +2599,22 @@ static struct clk_branch gcc_wdsp_q6ss_axim_clk = {
>  	},
>  };
>  
> +static struct gdsc mdss_gdsc = {
> +	.gdscr = 0x4d078,
> +	.pd = {
> +		.name = "mdss",
> +	},
> +	.pwrsts = PWRSTS_OFF_ON,
> +};
> +
> +static struct gdsc oxili_gdsc = {
> +	.gdscr = 0x5901c,
> +	.pd = {
> +		.name = "oxili",
> +	},
> +	.pwrsts = PWRSTS_OFF_ON,
> +};
> +
>  static struct clk_hw *gcc_qcs404_hws[] = {
>  	&cxo.hw,
>  };
> @@ -2748,6 +2765,11 @@ static struct clk_regmap *gcc_qcs404_clocks[] = {
>  
>  };
>  
> +static struct gdsc *gcc_qcs404_gdscs[] = {
> +	[MDSS_GDSC] = &mdss_gdsc,
> +	[OXILI_GDSC] = &oxili_gdsc,
> +};
> +
>  static const struct qcom_reset_map gcc_qcs404_resets[] = {
>  	[GCC_GENI_IR_BCR] = { 0x0F000 },
>  	[GCC_CDSP_RESTART] = { 0x18000 },
> @@ -2790,6 +2812,8 @@ static const struct qcom_cc_desc gcc_qcs404_desc = {
>  	.num_resets = ARRAY_SIZE(gcc_qcs404_resets),
>  	.clk_hws = gcc_qcs404_hws,
>  	.num_clk_hws = ARRAY_SIZE(gcc_qcs404_hws),
> +	.gdscs = gcc_qcs404_gdscs,
> +	.num_gdscs = ARRAY_SIZE(gcc_qcs404_gdscs),
>  };
>  
>  static const struct of_device_id gcc_qcs404_match_table[] = {

[PATCH 13/15] arm64: dts: qcom: qcs404: use symbol names for PCIe resets

[Dmitry Baryshkov]

The commit e5bbbff5b7d7 ("clk: gcc-qcs404: Add PCIe resets") added names
for PCIe resets, but it did not change the existing qcs404.dtsi to use
these names. Do it now and use symbol names to make it easier to check
and modify the dtsi in future.

Fixes: e5bbbff5b7d7 ("clk: gcc-qcs404: Add PCIe resets")
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 arch/arm64/boot/dts/qcom/qcs404.dtsi | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/qcs404.dtsi b/arch/arm64/boot/dts/qcom/qcs404.dtsi
index ffffaa7507cf..ffc4b081bb62 100644
--- a/arch/arm64/boot/dts/qcom/qcs404.dtsi
+++ b/arch/arm64/boot/dts/qcom/qcs404.dtsi
@@ -806,7 +806,7 @@ pcie_phy: phy@7786000 {
 
 			clocks = <&gcc GCC_PCIE_0_PIPE_CLK>;
 			resets = <&gcc GCC_PCIEPHY_0_PHY_BCR>,
-				 <&gcc 21>;
+				 <&gcc GCC_PCIE_0_PIPE_ARES>;
 			reset-names = "phy", "pipe";
 
 			clock-output-names = "pcie_0_pipe_clk";
@@ -1337,12 +1337,12 @@ pcie: pci@10000000 {
 				 <&gcc GCC_PCIE_0_SLV_AXI_CLK>;
 			clock-names = "iface", "aux", "master_bus", "slave_bus";
 
-			resets = <&gcc 18>,
-				 <&gcc 17>,
-				 <&gcc 15>,
-				 <&gcc 19>,
+			resets = <&gcc GCC_PCIE_0_AXI_MASTER_ARES>,
+				 <&gcc GCC_PCIE_0_AXI_SLAVE_ARES>,
+				 <&gcc GCC_PCIE_0_AXI_MASTER_STICKY_ARES>,
+				 <&gcc GCC_PCIE_0_CORE_STICKY_ARES>,
 				 <&gcc GCC_PCIE_0_BCR>,
-				 <&gcc 16>;
+				 <&gcc GCC_PCIE_0_AHB_ARES>;
 			reset-names = "axi_m",
 				      "axi_s",
 				      "axi_m_sticky",
-- 
2.35.1

Re: [PATCH 13/15] arm64: dts: qcom: qcs404: use symbol names for PCIe resets

[Konrad Dybcio]

On 17.12.2022 01:17, Dmitry Baryshkov wrote:
> The commit e5bbbff5b7d7 ("clk: gcc-qcs404: Add PCIe resets") added names
> for PCIe resets, but it did not change the existing qcs404.dtsi to use
> these names. Do it now and use symbol names to make it easier to check
> and modify the dtsi in future.
> 
> Fixes: e5bbbff5b7d7 ("clk: gcc-qcs404: Add PCIe resets")
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
I feel like I reviewed this already this week..

Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>

Konrad
>  arch/arm64/boot/dts/qcom/qcs404.dtsi | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/qcom/qcs404.dtsi b/arch/arm64/boot/dts/qcom/qcs404.dtsi
> index ffffaa7507cf..ffc4b081bb62 100644
> --- a/arch/arm64/boot/dts/qcom/qcs404.dtsi
> +++ b/arch/arm64/boot/dts/qcom/qcs404.dtsi
> @@ -806,7 +806,7 @@ pcie_phy: phy@7786000 {
>  
>  			clocks = <&gcc GCC_PCIE_0_PIPE_CLK>;
>  			resets = <&gcc GCC_PCIEPHY_0_PHY_BCR>,
> -				 <&gcc 21>;
> +				 <&gcc GCC_PCIE_0_PIPE_ARES>;
>  			reset-names = "phy", "pipe";
>  
>  			clock-output-names = "pcie_0_pipe_clk";
> @@ -1337,12 +1337,12 @@ pcie: pci@10000000 {
>  				 <&gcc GCC_PCIE_0_SLV_AXI_CLK>;
>  			clock-names = "iface", "aux", "master_bus", "slave_bus";
>  
> -			resets = <&gcc 18>,
> -				 <&gcc 17>,
> -				 <&gcc 15>,
> -				 <&gcc 19>,
> +			resets = <&gcc GCC_PCIE_0_AXI_MASTER_ARES>,
> +				 <&gcc GCC_PCIE_0_AXI_SLAVE_ARES>,
> +				 <&gcc GCC_PCIE_0_AXI_MASTER_STICKY_ARES>,
> +				 <&gcc GCC_PCIE_0_CORE_STICKY_ARES>,
>  				 <&gcc GCC_PCIE_0_BCR>,
> -				 <&gcc 16>;
> +				 <&gcc GCC_PCIE_0_AHB_ARES>;
>  			reset-names = "axi_m",
>  				      "axi_s",
>  				      "axi_m_sticky",

[PATCH 14/15] arm64: dts: qcom: qcs404: add power-domains-cells to gcc node

[Dmitry Baryshkov]

As gcc now provides two GDSCs, add #power-domain-cells property to the
gcc device node.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 arch/arm64/boot/dts/qcom/qcs404.dtsi | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm64/boot/dts/qcom/qcs404.dtsi b/arch/arm64/boot/dts/qcom/qcs404.dtsi
index ffc4b081bb62..b72542631337 100644
--- a/arch/arm64/boot/dts/qcom/qcs404.dtsi
+++ b/arch/arm64/boot/dts/qcom/qcs404.dtsi
@@ -729,6 +729,7 @@ gcc: clock-controller@1800000 {
 			reg = <0x01800000 0x80000>;
 			#clock-cells = <1>;
 			#reset-cells = <1>;
+			#power-domain-cells = <1>;
 
 			assigned-clocks = <&gcc GCC_APSS_AHB_CLK_SRC>;
 			assigned-clock-rates = <19200000>;
-- 
2.35.1

Re: [PATCH 14/15] arm64: dts: qcom: qcs404: add power-domains-cells to gcc node

[Konrad Dybcio]

On 17.12.2022 01:17, Dmitry Baryshkov wrote:
> As gcc now provides two GDSCs, add #power-domain-cells property to the
> gcc device node.
> 
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>

Konrad
>  arch/arm64/boot/dts/qcom/qcs404.dtsi | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/arch/arm64/boot/dts/qcom/qcs404.dtsi b/arch/arm64/boot/dts/qcom/qcs404.dtsi
> index ffc4b081bb62..b72542631337 100644
> --- a/arch/arm64/boot/dts/qcom/qcs404.dtsi
> +++ b/arch/arm64/boot/dts/qcom/qcs404.dtsi
> @@ -729,6 +729,7 @@ gcc: clock-controller@1800000 {
>  			reg = <0x01800000 0x80000>;
>  			#clock-cells = <1>;
>  			#reset-cells = <1>;
> +			#power-domain-cells = <1>;
>  
>  			assigned-clocks = <&gcc GCC_APSS_AHB_CLK_SRC>;
>  			assigned-clock-rates = <19200000>;

[PATCH 15/15] arm64: dts: qcom: qcs404: add clocks to the gcc node

[Dmitry Baryshkov]

Populate the gcc node with the clocks and clock-names properties to
enable DT-based lookups for the parent clocks.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 arch/arm64/boot/dts/qcom/qcs404.dtsi | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/qcs404.dtsi b/arch/arm64/boot/dts/qcom/qcs404.dtsi
index b72542631337..ee337a3980fa 100644
--- a/arch/arm64/boot/dts/qcom/qcs404.dtsi
+++ b/arch/arm64/boot/dts/qcom/qcs404.dtsi
@@ -731,6 +731,19 @@ gcc: clock-controller@1800000 {
 			#reset-cells = <1>;
 			#power-domain-cells = <1>;
 
+			clocks = <&xo_board>,
+				 <&sleep_clk>,
+				 <&pcie_phy>,
+				 <0>,
+				 <0>,
+				 <0>;
+			clock-names = "cxo",
+				      "sleep_clk",
+				      "pcie_0_pipe_clk_src",
+				      "dsi0pll",
+				      "dsi0pllbyte",
+				      "hdmi_pll";
+
 			assigned-clocks = <&gcc GCC_APSS_AHB_CLK_SRC>;
 			assigned-clock-rates = <19200000>;
 		};
-- 
2.35.1

Re: [PATCH 15/15] arm64: dts: qcom: qcs404: add clocks to the gcc node

[Konrad Dybcio]

On 17.12.2022 01:17, Dmitry Baryshkov wrote:
> Populate the gcc node with the clocks and clock-names properties to
> enable DT-based lookups for the parent clocks.
> 
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>

Konrad
>  arch/arm64/boot/dts/qcom/qcs404.dtsi | 13 +++++++++++++
>  1 file changed, 13 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/qcom/qcs404.dtsi b/arch/arm64/boot/dts/qcom/qcs404.dtsi
> index b72542631337..ee337a3980fa 100644
> --- a/arch/arm64/boot/dts/qcom/qcs404.dtsi
> +++ b/arch/arm64/boot/dts/qcom/qcs404.dtsi
> @@ -731,6 +731,19 @@ gcc: clock-controller@1800000 {
>  			#reset-cells = <1>;
>  			#power-domain-cells = <1>;
>  
> +			clocks = <&xo_board>,
> +				 <&sleep_clk>,
> +				 <&pcie_phy>,
> +				 <0>,
> +				 <0>,
> +				 <0>;
> +			clock-names = "cxo",
> +				      "sleep_clk",
> +				      "pcie_0_pipe_clk_src",
> +				      "dsi0pll",
> +				      "dsi0pllbyte",
> +				      "hdmi_pll";
> +
>  			assigned-clocks = <&gcc GCC_APSS_AHB_CLK_SRC>;
>  			assigned-clock-rates = <19200000>;
>  		};