Skip to contentSkip to conversation

ASoC: imx-sgtl5000: Do not enter the error path on success

PATCH Applied Fabio Estevam 3 participants 13 messages Apr 24, 2013 – May 2, 2013

Subsystems (5)
lore
Share & tools
lore

Fabio Estevam

author reviewer
#0 lore raw

PATCH v2 1/4 ASoC: imx-sgtl5000: Do not enter the error path on success

From: Fabio Estevam <[email protected]>

Return on success instead of entering the error path.

---
Changes since v1:
- Keep of_node_put in the success path.

 sound/soc/fsl/imx-sgtl5000.c |    5 +++++
 1 file changed, 5 insertions(+)
sound/soc/fsl/imx-sgtl5000.c +5 -0
index 9584e78..5a6aaa3 100644
@@ -174,6 +174,11 @@ static int imx_sgtl5000_probe(struct platform_device *pdev)
 	}
 
 	platform_set_drvdata(pdev, data);
+	of_node_put(ssi_np);
+	of_node_put(codec_np);
+
+	return 0;
+
 clk_fail:
 	clk_put(data->codec_clk);
 fail:
Signature · 1 line
1.7.9.5
author reviewer
#1 lore raw

PATCH v2 2/4 ASoC: imx-sgtl5000: Let the code clock be a mandatory binding

From: Fabio Estevam <[email protected]>

Currently passing a codec clock is optional.

Make the codec clock to be a required binding in order to simplify codec clock handling in imx-sgtl5000.

---
Changes since v1:
- Rebased against Shawn's tree and remove mx53qsb clock fix, as it was already applied on Shawn's tree
- Confirmed that audio is working on mx51babbage.

 arch/arm/boot/dts/imx51-babbage.dts |   13 ++++++++++++-
 sound/soc/fsl/imx-sgtl5000.c        |   18 ++++++------------
 2 files changed, 18 insertions(+), 13 deletions(-)
arch/arm/boot/dts/imx51-babbage.dts +12 -1
index 6dd9486..5318d26 100644
@@ -61,6 +61,16 @@
 		mux-int-port = <2>;
 		mux-ext-port = <3>;
 	};
+
+	clocks {
+		clk_26M: clock {
+			compatible = "fixed-clock";
+			reg=<0>;
+			#clock-cells = <0>;
+			clock-frequency = <26000000>;
+			gpios = <&gpio4 26 1>;
+		};
+	};
 };
 
 &esdhc1 {
@@ -229,6 +239,7 @@
 				MX51_PAD_EIM_A27__GPIO2_21   0x5
 				MX51_PAD_CSPI1_SS0__GPIO4_24 0x85
 				MX51_PAD_CSPI1_SS1__GPIO4_25 0x85
+				MX51_PAD_CSPI1_RDY__GPIO4_26 0x80000000
 			>;
 		};
 	};
@@ -255,7 +266,7 @@
 	sgtl5000: codec@0a {
 		compatible = "fsl,sgtl5000";
 		reg = <0x0a>;
-		clock-frequency = <26000000>;
+		clocks = <&clk_26M>;
 		VDDA-supply = <&vdig_reg>;
 		VDDIO-supply = <&vvideo_reg>;
 	};
sound/soc/fsl/imx-sgtl5000.c +6 -12
index fa308b1..6198ca5 100644
@@ -130,20 +130,14 @@ static int imx_sgtl5000_probe(struct platform_device *pdev)
 
 	data->codec_clk = clk_get(&codec_dev->dev, NULL);
 	if (IS_ERR(data->codec_clk)) {
-		/* assuming clock enabled by default */
-		data->codec_clk = NULL;
-		ret = of_property_read_u32(codec_np, "clock-frequency",
-					&data->clk_frequency);
-		if (ret) {
-			dev_err(&codec_dev->dev,
-				"clock-frequency missing or invalid\n");
-			goto fail;
-		}
-	} else {
-		data->clk_frequency = clk_get_rate(data->codec_clk);
-		clk_prepare_enable(data->codec_clk);
+		ret = PTR_ERR(data->codec_clk);
+		dev_err(&codec_dev->dev, "could not get codec clk: %d\n", ret);
+		goto fail;
 	}
 
+	data->clk_frequency = clk_get_rate(data->codec_clk);
+	clk_prepare_enable(data->codec_clk);
+
 	data->dai.name = "HiFi";
 	data->dai.stream_name = "HiFi";
 	data->dai.codec_dai_name = "sgtl5000";
Signature · 1 line
1.7.9.5
#2 lore raw

Re: [PATCH v2 2/4] ASoC: imx-sgtl5000: Let the code clock be a mandatory binding

Quoted 4 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

Currently passing a codec clock is optional.

Quoted 8 lines

Make the codec clock to be a required binding in order to simplify codec clock handling in imx-sgtl5000.

---
Changes since v1:
- Rebased against Shawn's tree and remove mx53qsb clock fix, as it was already applied on Shawn's tree

It seems that you expect the patch to go via my tree? In that case, I need Mark's ACK.

Quoted 11 lines

- Confirmed that audio is working on mx51babbage.

 arch/arm/boot/dts/imx51-babbage.dts |   13 ++++++++++++-
 sound/soc/fsl/imx-sgtl5000.c        |   18 ++++++------------
 2 files changed, 18 insertions(+), 13 deletions(-)
arch/arm/boot/dts/imx51-babbage.dts +0 -0
index 6dd9486..5318d26 100644

arch/arm/boot/dts/imx51-babbage.dts line 66

Quoted 6 lines
arch/arm/boot/dts/imx51-babbage.dts +3 -0
@@ -61,6 +61,16 @@
 		mux-int-port = <2>;
 		mux-ext-port = <3>;
 	};
+
+	clocks {
+		clk_26M: clock {

The name "clock" is too generic.

Shawn

Quoted 61 lines
arch/arm/boot/dts/imx51-babbage.dts +9 -1
+			compatible = "fixed-clock";
+			reg=<0>;
+			#clock-cells = <0>;
+			clock-frequency = <26000000>;
+			gpios = <&gpio4 26 1>;
+		};
+	};
 };
 
 &esdhc1 {
@@ -229,6 +239,7 @@
 				MX51_PAD_EIM_A27__GPIO2_21   0x5
 				MX51_PAD_CSPI1_SS0__GPIO4_24 0x85
 				MX51_PAD_CSPI1_SS1__GPIO4_25 0x85
+				MX51_PAD_CSPI1_RDY__GPIO4_26 0x80000000
 			>;
 		};
 	};
@@ -255,7 +266,7 @@
 	sgtl5000: codec@0a {
 		compatible = "fsl,sgtl5000";
 		reg = <0x0a>;
-		clock-frequency = <26000000>;
+		clocks = <&clk_26M>;
 		VDDA-supply = <&vdig_reg>;
 		VDDIO-supply = <&vvideo_reg>;
 	};
sound/soc/fsl/imx-sgtl5000.c +6 -12
index fa308b1..6198ca5 100644
@@ -130,20 +130,14 @@ static int imx_sgtl5000_probe(struct platform_device *pdev)
 
 	data->codec_clk = clk_get(&codec_dev->dev, NULL);
 	if (IS_ERR(data->codec_clk)) {
-		/* assuming clock enabled by default */
-		data->codec_clk = NULL;
-		ret = of_property_read_u32(codec_np, "clock-frequency",
-					&data->clk_frequency);
-		if (ret) {
-			dev_err(&codec_dev->dev,
-				"clock-frequency missing or invalid\n");
-			goto fail;
-		}
-	} else {
-		data->clk_frequency = clk_get_rate(data->codec_clk);
-		clk_prepare_enable(data->codec_clk);
+		ret = PTR_ERR(data->codec_clk);
+		dev_err(&codec_dev->dev, "could not get codec clk: %d\n", ret);
+		goto fail;
 	}
 
+	data->clk_frequency = clk_get_rate(data->codec_clk);
+	clk_prepare_enable(data->codec_clk);
+
 	data->dai.name = "HiFi";
 	data->dai.stream_name = "HiFi";
 	data->dai.codec_dai_name = "sgtl5000";
Signature · 1 line
1.7.9.5
maintainer
#3 lore raw

Re: [PATCH v2 2/4] ASoC: imx-sgtl5000: Let the code clock be a mandatory binding

Quoted 7 lines · Shawn Guo
Quoted 2 lines · Fabio Estevam

- Rebased against Shawn's tree and remove mx53qsb clock fix, as it was already applied on Shawn's tree

It seems that you expect the patch to go via my tree? In that case, I need Mark's ACK.

Well, it's a bit late for ARM changes to go in so I guess it'll be sorted out after the merge window anyway and can be applied to the ASoC tree after that?

#4 lore raw

Re: [PATCH v2 2/4] ASoC: imx-sgtl5000: Let the code clock be a mandatory binding

Quoted 6 lines · Mark Brown
Quoted 4 lines · Shawn Guo
Quoted 2 lines · Fabio Estevam

- Rebased against Shawn's tree and remove mx53qsb clock fix, as it was already applied on Shawn's tree

Quoted 6 lines
Quoted 2 lines

It seems that you expect the patch to go via my tree? In that case, I need Mark's ACK.

Well, it's a bit late for ARM changes to go in so I guess it'll be sorted out after the merge window anyway and can be applied to the ASoC tree after that?

Even worse. The dependant patches in my tree are 3.11 material.

Shawn

maintainer
#5 lore raw

Re: [PATCH v2 2/4] ASoC: imx-sgtl5000: Let the code clock be a mandatory binding

Quoted 7 lines · Shawn Guo
Quoted 5 lines · Mark Brown
Quoted 4 lines · Shawn Guo
Quoted 2 lines · Fabio Estevam

- Rebased against Shawn's tree and remove mx53qsb clock fix, as it was already applied on Shawn's tree

Quoted 8 lines
Quoted 6 lines
Quoted 2 lines

It seems that you expect the patch to go via my tree? In that case, I need Mark's ACK.

Well, it's a bit late for ARM changes to go in so I guess it'll be sorted out after the merge window anyway and can be applied to the ASoC tree after that?

Even worse. The dependant patches in my tree are 3.11 material.

Oh, that's distressing - I guess there's more than just the fix mentioned above? Would it be possible for you to provide a branch I can pull into my tree for v3.11? My workflow is easier if I don't have to worry about having potential collisions with other trees. If it'd be too inconvenient for you then I can cope but it'd be nice.

#6 lore raw

Re: [PATCH v2 2/4] ASoC: imx-sgtl5000: Let the code clock be a mandatory binding

Quoted 11 lines · Mark Brown
Quoted 9 lines · Shawn Guo
Quoted 8 lines · Mark Brown
Quoted 7 lines · Shawn Guo
Quoted 2 lines · Fabio Estevam

- Rebased against Shawn's tree and remove mx53qsb clock fix, as it was already applied on Shawn's tree

It seems that you expect the patch to go via my tree? In that case, I need Mark's ACK.

Quoted 8 lines
Quoted 5 lines
Quoted 3 lines

Well, it's a bit late for ARM changes to go in so I guess it'll be sorted out after the merge window anyway and can be applied to the ASoC tree after that?

Even worse. The dependant patches in my tree are 3.11 material.

Oh, that's distressing - I guess there's more than just the fix mentioned above?

Yes, a couple of patches.

Quoted 2 lines

Would it be possible for you to provide a branch I can pull into my tree for v3.11?

Ok, I will try to once we have a -rc to be the base.

Shawn

Quoted 3 lines

My workflow is easier if I don't have to
worry about having potential collisions with other trees. If it'd be too inconvenient for you then I can cope but it'd be nice.

author reviewer
#7 lore raw

PATCH v2 3/4 ASoC: imx-sgtl5000: Do a sanity check on the codec clock

In reply to Fabio Estevam

From: Fabio Estevam <[email protected]>

Only turn on the codec clock if it is within the valid range.

Also, disable the codec clock on the clk_fail path.

---
Changes since v1:
- None

 sound/soc/fsl/imx-sgtl5000.c |   18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)
sound/soc/fsl/imx-sgtl5000.c +16 -2
index 9c286e6..18af815 100644
@@ -56,6 +56,15 @@ static const struct snd_soc_dapm_widget imx_sgtl5000_dapm_widgets[] = {
 	SND_SOC_DAPM_SPK("Ext Spk", NULL),
 };
 
+static int sgtl5000_is_valid_sysclk(int freq)
+{
+
+	if (freq < 8000000 || freq > 27000000)
+		return -EINVAL;
+	else
+		return 0;
+}
+
 static int imx_sgtl5000_probe(struct platform_device *pdev)
 {
 	struct device_node *np = pdev->dev.of_node;
@@ -135,9 +144,13 @@ static int imx_sgtl5000_probe(struct platform_device *pdev)
 		goto fail;
 	}
 
-	data->clk_frequency = clk_get_rate(data->codec_clk);
-	clk_prepare_enable(data->codec_clk);
+	data->clk_frequency = clk_get_rate(data->codec_clk);
+	ret = sgtl5000_is_valid_sysclk(data->clk_frequency);
+	if (ret)
+		goto fail;
 
+	clk_prepare_enable(data->codec_clk);
+
 	data->dai.name = "HiFi";
 	data->dai.stream_name = "HiFi";
 	data->dai.codec_dai_name = "sgtl5000";
@@ -172,6 +185,7 @@ static int imx_sgtl5000_probe(struct platform_device *pdev)
 	return 0;
 
 clk_fail:
+	clk_disable_unprepare(data->codec_clk);
 	clk_put(data->codec_clk);
 fail:
 	if (ssi_np)
Signature · 1 line
1.7.9.5
#8 lore raw

Re: [PATCH v2 3/4] ASoC: imx-sgtl5000: Do a sanity check on the codec clock

Quoted 35 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

Only turn on the codec clock if it is within the valid range.

Also, disable the codec clock on the clk_fail path.

---
Changes since v1:
- None

 sound/soc/fsl/imx-sgtl5000.c |   18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)
sound/soc/fsl/imx-sgtl5000.c +9 -0
index 9c286e6..18af815 100644
@@ -56,6 +56,15 @@ static const struct snd_soc_dapm_widget imx_sgtl5000_dapm_widgets[] = {
 	SND_SOC_DAPM_SPK("Ext Spk", NULL),
 };
 
+static int sgtl5000_is_valid_sysclk(int freq)
+{
+
+	if (freq < 8000000 || freq > 27000000)
+		return -EINVAL;
+	else
+		return 0;
+}
+
 static int imx_sgtl5000_probe(struct platform_device *pdev)
 {
 	struct device_node *np = pdev->dev.of_node;

sound/soc/fsl/imx-sgtl5000.c static int imx_sgtl5000_probe(struct platform_device *pdev) · line 150

Quoted 9 lines
sound/soc/fsl/imx-sgtl5000.c +4 -2
@@ -135,9 +144,13 @@ static int imx_sgtl5000_probe(struct platform_device *pdev)
 		goto fail;
 	}
 
-	data->clk_frequency = clk_get_rate(data->codec_clk);
-	clk_prepare_enable(data->codec_clk);
+	data->clk_frequency = clk_get_rate(data->codec_clk);
+	ret = sgtl5000_is_valid_sysclk(data->clk_frequency);
+	if (ret)
+		goto fail;

In this patch, you haven't converted clk_get to devm_clk_get yet. If you goto "fail" here, clk_put() below will be skipped.

Shawn

Quoted 17 lines
sound/soc/fsl/imx-sgtl5000.c +3 -0
+	clk_prepare_enable(data->codec_clk);
+
 	data->dai.name = "HiFi";
 	data->dai.stream_name = "HiFi";
 	data->dai.codec_dai_name = "sgtl5000";
@@ -172,6 +185,7 @@ static int imx_sgtl5000_probe(struct platform_device *pdev)
 	return 0;
 
 clk_fail:
+	clk_disable_unprepare(data->codec_clk);
 	clk_put(data->codec_clk);
 fail:
 	if (ssi_np)
Signature · 1 line
1.7.9.5
author reviewer
#9 lore raw

PATCH v2 4/4 ASoC: imx-sgtl5000: Convert to devm_clk_get()

In reply to Fabio Estevam

From: Fabio Estevam <[email protected]>

Converting to devm_clk_get() can simplify the code a bit.

---
Changes since v1:
- None

 sound/soc/fsl/imx-sgtl5000.c |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
sound/soc/fsl/imx-sgtl5000.c +2 -6
index 18af815..c869996 100644
@@ -137,7 +137,7 @@ static int imx_sgtl5000_probe(struct platform_device *pdev)
 		goto fail;
 	}
 
-	data->codec_clk = clk_get(&codec_dev->dev, NULL);
+	data->codec_clk = devm_clk_get(&codec_dev->dev, NULL);
 	if (IS_ERR(data->codec_clk)) {
 		ret = PTR_ERR(data->codec_clk);
 		dev_err(&codec_dev->dev, "could not get codec clk: %d\n", ret);
@@ -186,7 +186,6 @@ static int imx_sgtl5000_probe(struct platform_device *pdev)
 
 clk_fail:
 	clk_disable_unprepare(data->codec_clk);
-	clk_put(data->codec_clk);
 fail:
 	if (ssi_np)
 		of_node_put(ssi_np);
@@ -200,10 +199,7 @@ static int imx_sgtl5000_remove(struct platform_device *pdev)
 {
 	struct imx_sgtl5000_data *data = platform_get_drvdata(pdev);
 
-	if (data->codec_clk) {
-		clk_disable_unprepare(data->codec_clk);
-		clk_put(data->codec_clk);
-	}
+	clk_disable_unprepare(data->codec_clk);
 	snd_soc_unregister_card(&data->card);
 
 	return 0;
Signature · 1 line
1.7.9.5
Acked-by on v2 1/4
#11 lore raw
In reply to Fabio Estevam
Quoted 5 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

Return on success instead of entering the error path.

Quoted 26 lines

---
Changes since v1:
- Keep of_node_put in the success path.

 sound/soc/fsl/imx-sgtl5000.c |    5 +++++
 1 file changed, 5 insertions(+)
sound/soc/fsl/imx-sgtl5000.c +5 -0
index 9584e78..5a6aaa3 100644
@@ -174,6 +174,11 @@ static int imx_sgtl5000_probe(struct platform_device *pdev)
 	}
 
 	platform_set_drvdata(pdev, data);
+	of_node_put(ssi_np);
+	of_node_put(codec_np);
+
+	return 0;
+
 clk_fail:
 	clk_put(data->codec_clk);
 fail:
Signature · 1 line
1.7.9.5