[PATCH 1/3] clk: lmk04832: Set missing parent_names for output clocks

[PATCH 1/3] clk: lmk04832: Set missing parent_names for output clocks

[Mike Looijmans]

lmk04832_register_clkout forgot to fill in the parent_names, resulting
in the error message "Must specify parents if num_parents > 0".

Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl>
---
 drivers/clk/clk-lmk04832.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/clk/clk-lmk04832.c b/drivers/clk/clk-lmk04832.c
index e22ac93e0c2f..188085e7a30b 100644
--- a/drivers/clk/clk-lmk04832.c
+++ b/drivers/clk/clk-lmk04832.c
@@ -1297,6 +1297,7 @@ static int lmk04832_register_clkout(struct lmk04832 *lmk, const int num)
 		sprintf(dclk_name, "lmk-dclk%02d_%02d", num, num + 1);
 		init.name = dclk_name;
 		parent_names[0] = clk_hw_get_name(&lmk->vco);
+		init.parent_names = parent_names;
 		init.ops = &lmk04832_dclk_ops;
 		init.flags = CLK_SET_RATE_PARENT;
 		init.num_parents = 1;
-- 
2.17.1


Met vriendelijke groet / kind regards,

Mike Looijmans
System Expert


TOPIC Embedded Products B.V.
Materiaalweg 4, 5681 RJ Best
The Netherlands

T: +31 (0) 499 33 69 69
E: mike.looijmans@topicproducts.com
W: www.topic.nl

Please consider the environment before printing this e-mail

[PATCH 2/3] clk: lmk04832: Don't disable vco clock on probe fail

[Mike Looijmans]

The probe() method never calls clk_prepare_enable(), so it should not
call clk_disable_unprepare() for the vco.clk in the error path. Fixes
a "lmk-vco already disabled" BUG when probe fails.

Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl>
---
 drivers/clk/clk-lmk04832.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/drivers/clk/clk-lmk04832.c b/drivers/clk/clk-lmk04832.c
index 188085e7a30b..dd1f0c59ee71 100644
--- a/drivers/clk/clk-lmk04832.c
+++ b/drivers/clk/clk-lmk04832.c
@@ -1505,21 +1505,21 @@ static int lmk04832_probe(struct spi_device *spi)
 		ret = clk_set_rate(lmk->vco.clk, lmk->vco_rate);
 		if (ret) {
 			dev_err(lmk->dev, "failed to set VCO rate\n");
-			goto err_disable_vco;
+			goto err_disable_oscin;
 		}
 	}
 
 	ret = lmk04832_register_sclk(lmk);
 	if (ret) {
 		dev_err(lmk->dev, "failed to init SYNC/SYSREF clock path\n");
-		goto err_disable_vco;
+		goto err_disable_oscin;
 	}
 
 	for (i = 0; i < info->num_channels; i++) {
 		ret = lmk04832_register_clkout(lmk, i);
 		if (ret) {
 			dev_err(lmk->dev, "failed to register clk %d\n", i);
-			goto err_disable_vco;
+			goto err_disable_oscin;
 		}
 	}
 
@@ -1528,16 +1528,13 @@ static int lmk04832_probe(struct spi_device *spi)
 					  lmk->clk_data);
 	if (ret) {
 		dev_err(lmk->dev, "failed to add provider (%d)\n", ret);
-		goto err_disable_vco;
+		goto err_disable_oscin;
 	}
 
 	spi_set_drvdata(spi, lmk);
 
 	return 0;
 
-err_disable_vco:
-	clk_disable_unprepare(lmk->vco.clk);
-
 err_disable_oscin:
 	clk_disable_unprepare(lmk->oscin);
 
-- 
2.17.1


Met vriendelijke groet / kind regards,

Mike Looijmans
System Expert


TOPIC Embedded Products B.V.
Materiaalweg 4, 5681 RJ Best
The Netherlands

T: +31 (0) 499 33 69 69
E: mike.looijmans@topicproducts.com
W: www.topic.nl

Please consider the environment before printing this e-mail

Re: [PATCH 2/3] clk: lmk04832: Don't disable vco clock on probe fail

[Liam Beguin]

On Wed, Aug 02, 2023 at 08:40:59AM +0200, Mike Looijmans wrote:
> The probe() method never calls clk_prepare_enable(), so it should not
> call clk_disable_unprepare() for the vco.clk in the error path. Fixes
> a "lmk-vco already disabled" BUG when probe fails.
> 
> Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl>

Reviewed-by: Liam Beguin <liambeguin@gmail.com>

> ---
>  drivers/clk/clk-lmk04832.c | 11 ++++-------
>  1 file changed, 4 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/clk/clk-lmk04832.c b/drivers/clk/clk-lmk04832.c
> index 188085e7a30b..dd1f0c59ee71 100644
> --- a/drivers/clk/clk-lmk04832.c
> +++ b/drivers/clk/clk-lmk04832.c
> @@ -1505,21 +1505,21 @@ static int lmk04832_probe(struct spi_device *spi)
>  		ret = clk_set_rate(lmk->vco.clk, lmk->vco_rate);
>  		if (ret) {
>  			dev_err(lmk->dev, "failed to set VCO rate\n");
> -			goto err_disable_vco;
> +			goto err_disable_oscin;
>  		}
>  	}
>  
>  	ret = lmk04832_register_sclk(lmk);
>  	if (ret) {
>  		dev_err(lmk->dev, "failed to init SYNC/SYSREF clock path\n");
> -		goto err_disable_vco;
> +		goto err_disable_oscin;
>  	}
>  
>  	for (i = 0; i < info->num_channels; i++) {
>  		ret = lmk04832_register_clkout(lmk, i);
>  		if (ret) {
>  			dev_err(lmk->dev, "failed to register clk %d\n", i);
> -			goto err_disable_vco;
> +			goto err_disable_oscin;
>  		}
>  	}
>  
> @@ -1528,16 +1528,13 @@ static int lmk04832_probe(struct spi_device *spi)
>  					  lmk->clk_data);
>  	if (ret) {
>  		dev_err(lmk->dev, "failed to add provider (%d)\n", ret);
> -		goto err_disable_vco;
> +		goto err_disable_oscin;
>  	}
>  
>  	spi_set_drvdata(spi, lmk);
>  
>  	return 0;
>  
> -err_disable_vco:
> -	clk_disable_unprepare(lmk->vco.clk);
> -
>  err_disable_oscin:
>  	clk_disable_unprepare(lmk->oscin);
>  
> -- 
> 2.17.1
> 
> 
> Met vriendelijke groet / kind regards,
> 
> Mike Looijmans
> System Expert
> 
> 
> TOPIC Embedded Products B.V.
> Materiaalweg 4, 5681 RJ Best
> The Netherlands
> 
> T: +31 (0) 499 33 69 69
> E: mike.looijmans@topicproducts.com
> W: www.topic.nl
> 
> Please consider the environment before printing this e-mail

Re: [PATCH 2/3] clk: lmk04832: Don't disable vco clock on probe fail

[Stephen Boyd]

Quoting Mike Looijmans (2023-08-01 23:40:59)
> The probe() method never calls clk_prepare_enable(), so it should not
> call clk_disable_unprepare() for the vco.clk in the error path. Fixes
> a "lmk-vco already disabled" BUG when probe fails.
> 
> Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl>
> ---

Applied to clk-next

[PATCH 3/3] clk: lmk04832: Support using PLL1_LD as SPI readback pin

[Mike Looijmans]

The PLL1_PD pin (a.k.a. STATUS_LD1) can be used as SPI readback pin. Make
this possible.

Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl>
---
 drivers/clk/clk-lmk04832.c | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/drivers/clk/clk-lmk04832.c b/drivers/clk/clk-lmk04832.c
index dd1f0c59ee71..99b271c1278a 100644
--- a/drivers/clk/clk-lmk04832.c
+++ b/drivers/clk/clk-lmk04832.c
@@ -134,6 +134,11 @@
 /* 0x14b - 0x152 Holdover */
 
 /* 0x153 - 0x15f PLL1 Configuration */
+#define LMK04832_REG_PLL1_LD		0x15f
+#define LMK04832_BIT_PLL1_LD_MUX		GENMASK(7, 3)
+#define LMK04832_VAL_PLL1_LD_MUX_SPI_RDBK		0x07
+#define LMK04832_BIT_PLL1_LD_TYPE		GENMASK(2, 0)
+#define LMK04832_VAL_PLL1_LD_TYPE_OUT_PP		0x03
 
 /* 0x160 - 0x16e PLL2 Configuration */
 #define LMK04832_REG_PLL2_R_MSB		0x160
@@ -206,6 +211,7 @@ enum lmk04832_rdbk_type {
 	RDBK_CLKIN_SEL0,
 	RDBK_CLKIN_SEL1,
 	RDBK_RESET,
+	RDBK_PLL1_LD,
 };
 
 struct lmk_dclk {
@@ -1346,6 +1352,10 @@ static int lmk04832_set_spi_rdbk(const struct lmk04832 *lmk, const int rdbk_pin)
 {
 	int reg;
 	int ret;
+	int val = FIELD_PREP(LMK04832_BIT_CLKIN_SEL_MUX,
+			     LMK04832_VAL_CLKIN_SEL_MUX_SPI_RDBK) |
+		  FIELD_PREP(LMK04832_BIT_CLKIN_SEL_TYPE,
+			     LMK04832_VAL_CLKIN_SEL_TYPE_OUT);
 
 	dev_info(lmk->dev, "setting up 4-wire mode\n");
 	ret = regmap_write(lmk->regmap, LMK04832_REG_RST3W,
@@ -1363,15 +1373,18 @@ static int lmk04832_set_spi_rdbk(const struct lmk04832 *lmk, const int rdbk_pin)
 	case RDBK_RESET:
 		reg = LMK04832_REG_CLKIN_RST;
 		break;
+	case RDBK_PLL1_LD:
+		reg = LMK04832_REG_PLL1_LD;
+		val = FIELD_PREP(LMK04832_BIT_PLL1_LD_MUX,
+				 LMK04832_VAL_PLL1_LD_MUX_SPI_RDBK) |
+		      FIELD_PREP(LMK04832_BIT_PLL1_LD_TYPE,
+				 LMK04832_VAL_PLL1_LD_TYPE_OUT_PP);
+		break;
 	default:
 		return -EINVAL;
 	}
 
-	return regmap_write(lmk->regmap, reg,
-			    FIELD_PREP(LMK04832_BIT_CLKIN_SEL_MUX,
-				       LMK04832_VAL_CLKIN_SEL_MUX_SPI_RDBK) |
-			    FIELD_PREP(LMK04832_BIT_CLKIN_SEL_TYPE,
-				       LMK04832_VAL_CLKIN_SEL_TYPE_OUT));
+	return regmap_write(lmk->regmap, reg, val);
 }
 
 static int lmk04832_probe(struct spi_device *spi)
-- 
2.17.1


Met vriendelijke groet / kind regards,

Mike Looijmans
System Expert


TOPIC Embedded Products B.V.
Materiaalweg 4, 5681 RJ Best
The Netherlands

T: +31 (0) 499 33 69 69
E: mike.looijmans@topicproducts.com
W: www.topic.nl

Please consider the environment before printing this e-mail

Re: [PATCH 3/3] clk: lmk04832: Support using PLL1_LD as SPI readback pin

[Liam Beguin]

On Wed, Aug 02, 2023 at 08:41:00AM +0200, Mike Looijmans wrote:
> The PLL1_PD pin (a.k.a. STATUS_LD1) can be used as SPI readback pin. Make
> this possible.
> 
> Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl>

Reviewed-by: Liam Beguin <liambeguin@gmail.com>

> ---
>  drivers/clk/clk-lmk04832.c | 23 ++++++++++++++++++-----
>  1 file changed, 18 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/clk/clk-lmk04832.c b/drivers/clk/clk-lmk04832.c
> index dd1f0c59ee71..99b271c1278a 100644
> --- a/drivers/clk/clk-lmk04832.c
> +++ b/drivers/clk/clk-lmk04832.c
> @@ -134,6 +134,11 @@
>  /* 0x14b - 0x152 Holdover */
>  
>  /* 0x153 - 0x15f PLL1 Configuration */
> +#define LMK04832_REG_PLL1_LD		0x15f
> +#define LMK04832_BIT_PLL1_LD_MUX		GENMASK(7, 3)
> +#define LMK04832_VAL_PLL1_LD_MUX_SPI_RDBK		0x07
> +#define LMK04832_BIT_PLL1_LD_TYPE		GENMASK(2, 0)
> +#define LMK04832_VAL_PLL1_LD_TYPE_OUT_PP		0x03
>  
>  /* 0x160 - 0x16e PLL2 Configuration */
>  #define LMK04832_REG_PLL2_R_MSB		0x160
> @@ -206,6 +211,7 @@ enum lmk04832_rdbk_type {
>  	RDBK_CLKIN_SEL0,
>  	RDBK_CLKIN_SEL1,
>  	RDBK_RESET,
> +	RDBK_PLL1_LD,
>  };
>  
>  struct lmk_dclk {
> @@ -1346,6 +1352,10 @@ static int lmk04832_set_spi_rdbk(const struct lmk04832 *lmk, const int rdbk_pin)
>  {
>  	int reg;
>  	int ret;
> +	int val = FIELD_PREP(LMK04832_BIT_CLKIN_SEL_MUX,
> +			     LMK04832_VAL_CLKIN_SEL_MUX_SPI_RDBK) |
> +		  FIELD_PREP(LMK04832_BIT_CLKIN_SEL_TYPE,
> +			     LMK04832_VAL_CLKIN_SEL_TYPE_OUT);
>  
>  	dev_info(lmk->dev, "setting up 4-wire mode\n");
>  	ret = regmap_write(lmk->regmap, LMK04832_REG_RST3W,
> @@ -1363,15 +1373,18 @@ static int lmk04832_set_spi_rdbk(const struct lmk04832 *lmk, const int rdbk_pin)
>  	case RDBK_RESET:
>  		reg = LMK04832_REG_CLKIN_RST;
>  		break;
> +	case RDBK_PLL1_LD:
> +		reg = LMK04832_REG_PLL1_LD;
> +		val = FIELD_PREP(LMK04832_BIT_PLL1_LD_MUX,
> +				 LMK04832_VAL_PLL1_LD_MUX_SPI_RDBK) |
> +		      FIELD_PREP(LMK04832_BIT_PLL1_LD_TYPE,
> +				 LMK04832_VAL_PLL1_LD_TYPE_OUT_PP);
> +		break;
>  	default:
>  		return -EINVAL;
>  	}
>  
> -	return regmap_write(lmk->regmap, reg,
> -			    FIELD_PREP(LMK04832_BIT_CLKIN_SEL_MUX,
> -				       LMK04832_VAL_CLKIN_SEL_MUX_SPI_RDBK) |
> -			    FIELD_PREP(LMK04832_BIT_CLKIN_SEL_TYPE,
> -				       LMK04832_VAL_CLKIN_SEL_TYPE_OUT));
> +	return regmap_write(lmk->regmap, reg, val);
>  }
>  
>  static int lmk04832_probe(struct spi_device *spi)
> -- 
> 2.17.1
> 
> 
> Met vriendelijke groet / kind regards,
> 
> Mike Looijmans
> System Expert
> 
> 
> TOPIC Embedded Products B.V.
> Materiaalweg 4, 5681 RJ Best
> The Netherlands
> 
> T: +31 (0) 499 33 69 69
> E: mike.looijmans@topicproducts.com
> W: www.topic.nl
> 
> Please consider the environment before printing this e-mail

Re: [PATCH 3/3] clk: lmk04832: Support using PLL1_LD as SPI readback pin

[Stephen Boyd]

Quoting Mike Looijmans (2023-08-01 23:41:00)
> The PLL1_PD pin (a.k.a. STATUS_LD1) can be used as SPI readback pin. Make
> this possible.
> 
> Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl>
> ---

Applied to clk-next

Re: [PATCH 1/3] clk: lmk04832: Set missing parent_names for output clocks

[Liam Beguin]

On Wed, Aug 02, 2023 at 08:40:58AM +0200, Mike Looijmans wrote:
> lmk04832_register_clkout forgot to fill in the parent_names, resulting
> in the error message "Must specify parents if num_parents > 0".
> 
> Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl>

Reviewed-by: Liam Beguin <liambeguin@gmail.com>

> ---
>  drivers/clk/clk-lmk04832.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/clk/clk-lmk04832.c b/drivers/clk/clk-lmk04832.c
> index e22ac93e0c2f..188085e7a30b 100644
> --- a/drivers/clk/clk-lmk04832.c
> +++ b/drivers/clk/clk-lmk04832.c
> @@ -1297,6 +1297,7 @@ static int lmk04832_register_clkout(struct lmk04832 *lmk, const int num)
>  		sprintf(dclk_name, "lmk-dclk%02d_%02d", num, num + 1);
>  		init.name = dclk_name;
>  		parent_names[0] = clk_hw_get_name(&lmk->vco);
> +		init.parent_names = parent_names;
>  		init.ops = &lmk04832_dclk_ops;
>  		init.flags = CLK_SET_RATE_PARENT;
>  		init.num_parents = 1;
> -- 
> 2.17.1
> 
> 
> Met vriendelijke groet / kind regards,
> 
> Mike Looijmans
> System Expert
> 
> 
> TOPIC Embedded Products B.V.
> Materiaalweg 4, 5681 RJ Best
> The Netherlands
> 
> T: +31 (0) 499 33 69 69
> E: mike.looijmans@topicproducts.com
> W: www.topic.nl
> 
> Please consider the environment before printing this e-mail

Re: [PATCH 1/3] clk: lmk04832: Set missing parent_names for output clocks

[Stephen Boyd]

Quoting Mike Looijmans (2023-08-01 23:40:58)
> lmk04832_register_clkout forgot to fill in the parent_names, resulting
> in the error message "Must specify parents if num_parents > 0".
> 
> Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl>
> ---

Applied to clk-next