[PATCH v2 0/3] clk: qcom: gcc-ipq806x: use parent_data for the last remaining entry

[PATCH v2 0/3] clk: qcom: gcc-ipq806x: use parent_data for the last remaining entry

[Dmitry Baryshkov]

Add the reference to the pll4 clock to the DT.

Changes since v1:
 - Add dt-bindings and DTS changes

Dmitry Baryshkov (3):
  dt-bindings: clock: qcom,gcc-ipq8064: add pll4 to used clocks
  clk: qcom: gcc-ipq806x: use parent_data for the last remaining entry
  ARM: dts: qcom-ipq8064: use pll4 clock for the gcc device

 .../devicetree/bindings/clock/qcom,gcc-ipq8064.yaml      | 9 +++++++--
 arch/arm/boot/dts/qcom-ipq8064.dtsi                      | 4 ++--
 drivers/clk/qcom/gcc-ipq806x.c                           | 4 +++-
 3 files changed, 12 insertions(+), 5 deletions(-)

-- 
2.35.1

[PATCH v2 1/3] dt-bindings: clock: qcom,gcc-ipq8064: add pll4 to used clocks

[Dmitry Baryshkov]

On IPQ8064 (and related platforms) the GCC uses PLL4 clock provided by
the LCC clock controller. Mention this in the bindings.

To remain compatible with older bindings, make it optional, as the
driver will fallback to getting the `pll4' clock from the system clocks
list.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 .../devicetree/bindings/clock/qcom,gcc-ipq8064.yaml      | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Documentation/devicetree/bindings/clock/qcom,gcc-ipq8064.yaml b/Documentation/devicetree/bindings/clock/qcom,gcc-ipq8064.yaml
index 9eb91dd22557..d1f93ee9ff69 100644
--- a/Documentation/devicetree/bindings/clock/qcom,gcc-ipq8064.yaml
+++ b/Documentation/devicetree/bindings/clock/qcom,gcc-ipq8064.yaml
@@ -27,14 +27,18 @@ properties:
       - const: syscon
 
   clocks:
+    minItems: 2
     items:
       - description: PXO source
       - description: CXO source
+      - description: PLL4 from LCC
 
   clock-names:
+    minItems: 2
     items:
       - const: pxo
       - const: cxo
+      - const: pll4
 
   thermal-sensor:
     type: object
@@ -51,13 +55,14 @@ unevaluatedProperties: false
 
 examples:
   - |
+    #include <dt-bindings/clock/qcom,lcc-ipq806x.h>
     #include <dt-bindings/interrupt-controller/arm-gic.h>
 
     gcc: clock-controller@900000 {
       compatible = "qcom,gcc-ipq8064", "syscon";
       reg = <0x00900000 0x4000>;
-      clocks = <&pxo_board>, <&cxo_board>;
-      clock-names = "pxo", "cxo";
+      clocks = <&pxo_board>, <&cxo_board>, <&lcc PLL4>;
+      clock-names = "pxo", "cxo", "pll4";
       #clock-cells = <1>;
       #reset-cells = <1>;
       #power-domain-cells = <1>;
-- 
2.35.1

Re: [PATCH v2 1/3] dt-bindings: clock: qcom,gcc-ipq8064: add pll4 to used clocks

[Rob Herring]

On Tue, 27 Sep 2022 14:38:24 +0300, Dmitry Baryshkov wrote:
> On IPQ8064 (and related platforms) the GCC uses PLL4 clock provided by
> the LCC clock controller. Mention this in the bindings.
> 
> To remain compatible with older bindings, make it optional, as the
> driver will fallback to getting the `pll4' clock from the system clocks
> list.
> 
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
>  .../devicetree/bindings/clock/qcom,gcc-ipq8064.yaml      | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
> 

Acked-by: Rob Herring <robh@kernel.org>

[PATCH v2 2/3] clk: qcom: gcc-ipq806x: use parent_data for the last remaining entry

[Dmitry Baryshkov]

Use parent_data for the last remaining entry (pll4). This clock is
provided by the lcc device.

Fixes: cb02866f9a74 ("clk: qcom: gcc-ipq806x: convert parent_names to parent_data")
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 drivers/clk/qcom/gcc-ipq806x.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/clk/qcom/gcc-ipq806x.c b/drivers/clk/qcom/gcc-ipq806x.c
index 718de17a1e60..6447f3e81b55 100644
--- a/drivers/clk/qcom/gcc-ipq806x.c
+++ b/drivers/clk/qcom/gcc-ipq806x.c
@@ -79,7 +79,9 @@ static struct clk_regmap pll4_vote = {
 	.enable_mask = BIT(4),
 	.hw.init = &(struct clk_init_data){
 		.name = "pll4_vote",
-		.parent_names = (const char *[]){ "pll4" },
+		.parent_data = &(const struct clk_parent_data){
+			.fw_name = "pll4", .name = "pll4",
+		},
 		.num_parents = 1,
 		.ops = &clk_pll_vote_ops,
 	},
-- 
2.35.1

Re: [PATCH v2 2/3] clk: qcom: gcc-ipq806x: use parent_data for the last remaining entry

[Konrad Dybcio]

On 27.09.2022 13:38, Dmitry Baryshkov wrote:
> Use parent_data for the last remaining entry (pll4). This clock is
> provided by the lcc device.
> 
> Fixes: cb02866f9a74 ("clk: qcom: gcc-ipq806x: convert parent_names to parent_data")
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@somainline.org>

Konrad
>  drivers/clk/qcom/gcc-ipq806x.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/clk/qcom/gcc-ipq806x.c b/drivers/clk/qcom/gcc-ipq806x.c
> index 718de17a1e60..6447f3e81b55 100644
> --- a/drivers/clk/qcom/gcc-ipq806x.c
> +++ b/drivers/clk/qcom/gcc-ipq806x.c
> @@ -79,7 +79,9 @@ static struct clk_regmap pll4_vote = {
>  	.enable_mask = BIT(4),
>  	.hw.init = &(struct clk_init_data){
>  		.name = "pll4_vote",
> -		.parent_names = (const char *[]){ "pll4" },
> +		.parent_data = &(const struct clk_parent_data){
> +			.fw_name = "pll4", .name = "pll4",
> +		},
>  		.num_parents = 1,
>  		.ops = &clk_pll_vote_ops,
>  	},

[PATCH v2 3/3] ARM: dts: qcom-ipq8064: use pll4 clock for the gcc device

[Dmitry Baryshkov]

Add a link to LCC's PLL4 clock to the GCC device node following the
bindings (and driver needs).

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 arch/arm/boot/dts/qcom-ipq8064.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/qcom-ipq8064.dtsi b/arch/arm/boot/dts/qcom-ipq8064.dtsi
index 90c08b51680a..a79f8b5fe12d 100644
--- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
+++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi
@@ -513,8 +513,8 @@ mux {
 
 		gcc: clock-controller@900000 {
 			compatible = "qcom,gcc-ipq8064", "syscon";
-			clocks = <&pxo_board>, <&cxo_board>;
-			clock-names = "pxo", "cxo";
+			clocks = <&pxo_board>, <&cxo_board>, <&lcc PLL4>;
+			clock-names = "pxo", "cxo", "pll4";
 			reg = <0x00900000 0x4000>;
 			#clock-cells = <1>;
 			#reset-cells = <1>;
-- 
2.35.1

Re: [PATCH v2 3/3] ARM: dts: qcom-ipq8064: use pll4 clock for the gcc device

[Konrad Dybcio]

On 27.09.2022 13:38, Dmitry Baryshkov wrote:
> Add a link to LCC's PLL4 clock to the GCC device node following the
> bindings (and driver needs).
> 
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@somainline.org>

Konrad
>  arch/arm/boot/dts/qcom-ipq8064.dtsi | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/qcom-ipq8064.dtsi b/arch/arm/boot/dts/qcom-ipq8064.dtsi
> index 90c08b51680a..a79f8b5fe12d 100644
> --- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
> +++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi
> @@ -513,8 +513,8 @@ mux {
>  
>  		gcc: clock-controller@900000 {
>  			compatible = "qcom,gcc-ipq8064", "syscon";
> -			clocks = <&pxo_board>, <&cxo_board>;
> -			clock-names = "pxo", "cxo";
> +			clocks = <&pxo_board>, <&cxo_board>, <&lcc PLL4>;
> +			clock-names = "pxo", "cxo", "pll4";
>  			reg = <0x00900000 0x4000>;
>  			#clock-cells = <1>;
>  			#reset-cells = <1>;

Re: (subset) [PATCH v2 0/3] clk: qcom: gcc-ipq806x: use parent_data for the last remaining entry

[Bjorn Andersson]

On Tue, 27 Sep 2022 14:38:23 +0300, Dmitry Baryshkov wrote:
> Add the reference to the pll4 clock to the DT.
> 
> Changes since v1:
>  - Add dt-bindings and DTS changes
> 
> Dmitry Baryshkov (3):
>   dt-bindings: clock: qcom,gcc-ipq8064: add pll4 to used clocks
>   clk: qcom: gcc-ipq806x: use parent_data for the last remaining entry
>   ARM: dts: qcom-ipq8064: use pll4 clock for the gcc device
> 
> [...]

Applied, thanks!

[3/3] ARM: dts: qcom-ipq8064: use pll4 clock for the gcc device
      commit: da6b4c059283166c1939143574b3ade96817304e

Best regards,
-- 
Bjorn Andersson <andersson@kernel.org>