[PATCH 0/4] ASoC: wm8904: prepare for use from audio-graph-card

[PATCH 0/4] ASoC: wm8904: prepare for use from audio-graph-card

[Michał Mirosław]

First two patches make wm8904 usable from audio-graph-card.
Third is a simple micro-optimization of driver-data usage.
Last fixes register access with disabled SYSCLK.

Tested on custom SAMA5D2 board.

Michał Mirosław (4):
  ASoC: wm8904: make the driver visible in Kconfig
  ASoC: wm8904: Automatically enable FLL when selected
  ASoC: wm8904: save model id directly in of_device_id.data
  ASoC: wm8904: enable MCLK in STANDBY

 sound/soc/codecs/Kconfig  |  3 ++-
 sound/soc/codecs/wm8904.c | 42 ++++++++++++++++++++++++++++-----------
 sound/soc/codecs/wm8904.h |  2 +-
 3 files changed, 33 insertions(+), 14 deletions(-)

-- 
2.19.2

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

[PATCH 1/4] ASoC: wm8904: make the driver visible in Kconfig

[Michał Mirosław]

For platforms that use the audio-graph-card driver, the codec is
not selected by SoC-platform driver. Make it available.

Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
---
 sound/soc/codecs/Kconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 9cc4f1848c9b..f9e6e07be005 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -1205,7 +1205,8 @@ config SND_SOC_WM8903
 	depends on I2C
 
 config SND_SOC_WM8904
-	tristate
+	tristate "Wolfson Microelectronics WM8904 CODEC"
+	depends on I2C
 
 config SND_SOC_WM8940
         tristate
-- 
2.19.2

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

[PATCH 2/4] ASoC: wm8904: Automatically enable FLL when selected

[Michał Mirosław]

This makes FLL the clock used from audio-graph-card platform driver
(it explicitly uses clock id 0).  Other platform drivers select the
clock manually.

Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
---
 sound/soc/codecs/wm8904.c | 21 ++++++++++++++++++---
 sound/soc/codecs/wm8904.h |  2 +-
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c
index 2a3e5fbd04e4..f8a17fcdfdeb 100644
--- a/sound/soc/codecs/wm8904.c
+++ b/sound/soc/codecs/wm8904.c
@@ -315,6 +315,9 @@ static bool wm8904_readable_register(struct device *dev, unsigned int reg)
 	}
 }
 
+static int wm8904_set_fll(struct snd_soc_component *component, int fll_id, int source,
+			  unsigned int Fref, unsigned int Fout);
+
 static int wm8904_configure_clocking(struct snd_soc_component *component)
 {
 	struct wm8904_priv *wm8904 = snd_soc_component_get_drvdata(component);
@@ -339,6 +342,13 @@ static int wm8904_configure_clocking(struct snd_soc_component *component)
 		break;
 
 	case WM8904_CLK_FLL:
+		if (!wm8904->fll_fout) {
+			int ret = wm8904_set_fll(component, WM8904_FLL_MCLK, WM8904_FLL_MCLK,
+						 clk_get_rate(wm8904->mclk), 12288000);
+			if (ret)
+				return ret;
+		}
+
 		dev_dbg(component->dev, "Using %dHz FLL clock\n",
 			wm8904->fll_fout);
 
@@ -1675,10 +1685,9 @@ static int fll_factors(struct _fll_div *fll_div, unsigned int Fref,
 	return 0;
 }
 
-static int wm8904_set_fll(struct snd_soc_dai *dai, int fll_id, int source,
+static int wm8904_set_fll(struct snd_soc_component *component, int fll_id, int source,
 			  unsigned int Fref, unsigned int Fout)
 {
-	struct snd_soc_component *component = dai->component;
 	struct wm8904_priv *wm8904 = snd_soc_component_get_drvdata(component);
 	struct _fll_div fll_div;
 	int ret, val;
@@ -1814,6 +1823,12 @@ static int wm8904_set_fll(struct snd_soc_dai *dai, int fll_id, int source,
 	return 0;
 }
 
+static int wm8904_set_dai_fll(struct snd_soc_dai *dai, int fll_id, int source,
+			      unsigned int Fref, unsigned int Fout)
+{
+	return wm8904_set_fll(dai->component, fll_id, source, Fref, Fout);
+}
+
 static int wm8904_digital_mute(struct snd_soc_dai *codec_dai, int mute)
 {
 	struct snd_soc_component *component = codec_dai->component;
@@ -1921,7 +1936,7 @@ static const struct snd_soc_dai_ops wm8904_dai_ops = {
 	.set_sysclk = wm8904_set_sysclk,
 	.set_fmt = wm8904_set_fmt,
 	.set_tdm_slot = wm8904_set_tdm_slot,
-	.set_pll = wm8904_set_fll,
+	.set_pll = wm8904_set_dai_fll,
 	.hw_params = wm8904_hw_params,
 	.digital_mute = wm8904_digital_mute,
 };
diff --git a/sound/soc/codecs/wm8904.h b/sound/soc/codecs/wm8904.h
index c29a0e8131ca..ed3260bcae62 100644
--- a/sound/soc/codecs/wm8904.h
+++ b/sound/soc/codecs/wm8904.h
@@ -13,8 +13,8 @@
 #ifndef _WM8904_H
 #define _WM8904_H
 
+#define WM8904_CLK_FLL  0
 #define WM8904_CLK_MCLK 1
-#define WM8904_CLK_FLL  2
 
 #define WM8904_FLL_MCLK          1
 #define WM8904_FLL_BCLK          2
-- 
2.19.2

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

[PATCH 3/4] ASoC: wm8904: save model id directly in of_device_id.data

[Michał Mirosław]

Save 2x unsigned int of .rodata.

Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
---
 sound/soc/codecs/wm8904.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c
index f8a17fcdfdeb..2813b7f6a58e 100644
--- a/sound/soc/codecs/wm8904.c
+++ b/sound/soc/codecs/wm8904.c
@@ -2123,16 +2123,13 @@ static const struct regmap_config wm8904_regmap = {
 };
 
 #ifdef CONFIG_OF
-static enum wm8904_type wm8904_data = WM8904;
-static enum wm8904_type wm8912_data = WM8912;
-
 static const struct of_device_id wm8904_of_match[] = {
 	{
 		.compatible = "wlf,wm8904",
-		.data = &wm8904_data,
+		.data = (void *)WM8904,
 	}, {
 		.compatible = "wlf,wm8912",
-		.data = &wm8912_data,
+		.data = (void *)WM8912,
 	}, {
 		/* sentinel */
 	}
@@ -2173,7 +2170,7 @@ static int wm8904_i2c_probe(struct i2c_client *i2c,
 		match = of_match_node(wm8904_of_match, i2c->dev.of_node);
 		if (match == NULL)
 			return -EINVAL;
-		wm8904->devtype = *((enum wm8904_type *)match->data);
+		wm8904->devtype = (enum wm8904_type)match->data;
 	} else {
 		wm8904->devtype = id->driver_data;
 	}
-- 
2.19.2

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

[PATCH 4/4] ASoC: wm8904: enable MCLK in STANDBY

[Michał Mirosław]

MCLK input is needed when accessing any register after enabling SYSCLK.

This also fixes imbalance of clk_enable / clk_disable when transitioning
between ON -> STANDBY -> ON bias levels.

Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
---
 sound/soc/codecs/wm8904.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c
index 2813b7f6a58e..9f0167a39e51 100644
--- a/sound/soc/codecs/wm8904.c
+++ b/sound/soc/codecs/wm8904.c
@@ -1852,9 +1852,6 @@ static int wm8904_set_bias_level(struct snd_soc_component *component,
 
 	switch (level) {
 	case SND_SOC_BIAS_ON:
-		ret = clk_prepare_enable(wm8904->mclk);
-		if (ret)
-			return ret;
 		break;
 
 	case SND_SOC_BIAS_PREPARE:
@@ -1879,6 +1876,15 @@ static int wm8904_set_bias_level(struct snd_soc_component *component,
 				return ret;
 			}
 
+			ret = clk_prepare_enable(wm8904->mclk);
+			if (ret) {
+				dev_err(component->dev,
+					"Failed to enable MCLK: %d\n", ret);
+				regulator_bulk_disable(ARRAY_SIZE(wm8904->supplies),
+						       wm8904->supplies);
+				return ret;
+			}
+
 			regcache_cache_only(wm8904->regmap, false);
 			regcache_sync(wm8904->regmap);
 
-- 
2.19.2

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Re: [PATCH 1/4] ASoC: wm8904: make the driver visible in Kconfig

[Charles Keepax]

On Wed, Dec 19, 2018 at 09:11:15PM +0100, Michał Mirosław wrote:
> For platforms that use the audio-graph-card driver, the codec is
> not selected by SoC-platform driver. Make it available.
> 
> Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
> ---

Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>

Thanks,
Charles
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Re: [PATCH 3/4] ASoC: wm8904: save model id directly in of_device_id.data

[Charles Keepax]

On Wed, Dec 19, 2018 at 09:11:16PM +0100, Michał Mirosław wrote:
> Save 2x unsigned int of .rodata.
> 
> Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
> ---

Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>

Thanks,
Charles
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Re: [PATCH 4/4] ASoC: wm8904: enable MCLK in STANDBY

[Charles Keepax]

On Wed, Dec 19, 2018 at 09:11:16PM +0100, Michał Mirosław wrote:
> MCLK input is needed when accessing any register after enabling SYSCLK.
> 
> This also fixes imbalance of clk_enable / clk_disable when transitioning
> between ON -> STANDBY -> ON bias levels.
> 
> Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
> ---

Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>

Thanks,
Charles
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Re: [PATCH 2/4] ASoC: wm8904: Automatically enable FLL when selected

[Charles Keepax]

On Wed, Dec 19, 2018 at 09:11:15PM +0100, Michał Mirosław wrote:
> This makes FLL the clock used from audio-graph-card platform driver
> (it explicitly uses clock id 0).  Other platform drivers select the
> clock manually.
> 
> Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
> ---

I wonder a little if this part is really suitable for use with
simple card.

>  sound/soc/codecs/wm8904.c | 21 ++++++++++++++++++---
>  sound/soc/codecs/wm8904.h |  2 +-
>  2 files changed, 19 insertions(+), 4 deletions(-)
> 
> diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c
> index 2a3e5fbd04e4..f8a17fcdfdeb 100644
> --- a/sound/soc/codecs/wm8904.c
> +++ b/sound/soc/codecs/wm8904.c
> @@ -315,6 +315,9 @@ static bool wm8904_readable_register(struct device *dev, unsigned int reg)
>  	}
>  }
>  
> +static int wm8904_set_fll(struct snd_soc_component *component, int fll_id, int source,
> +			  unsigned int Fref, unsigned int Fout);
> +
>  static int wm8904_configure_clocking(struct snd_soc_component *component)
>  {
>  	struct wm8904_priv *wm8904 = snd_soc_component_get_drvdata(component);
> @@ -339,6 +342,13 @@ static int wm8904_configure_clocking(struct snd_soc_component *component)
>  		break;
>  
>  	case WM8904_CLK_FLL:
> +		if (!wm8904->fll_fout) {
> +			int ret = wm8904_set_fll(component, WM8904_FLL_MCLK, WM8904_FLL_MCLK,
> +						 clk_get_rate(wm8904->mclk), 12288000);
> +			if (ret)
> +				return ret;
> +		}

What is your thinking on selecting a 12.28MHz clock? Will this
not cause issues with say 44.1k playback?

> +
>  		dev_dbg(component->dev, "Using %dHz FLL clock\n",
>  			wm8904->fll_fout);
>  
> @@ -1675,10 +1685,9 @@ static int fll_factors(struct _fll_div *fll_div, unsigned int Fref,
>  	return 0;
>  }
>  
> -static int wm8904_set_fll(struct snd_soc_dai *dai, int fll_id, int source,
> +static int wm8904_set_fll(struct snd_soc_component *component, int fll_id, int source,
>  			  unsigned int Fref, unsigned int Fout)
>  {
> -	struct snd_soc_component *component = dai->component;
>  	struct wm8904_priv *wm8904 = snd_soc_component_get_drvdata(component);
>  	struct _fll_div fll_div;
>  	int ret, val;
> @@ -1814,6 +1823,12 @@ static int wm8904_set_fll(struct snd_soc_dai *dai, int fll_id, int source,
>  	return 0;
>  }
>  
> +static int wm8904_set_dai_fll(struct snd_soc_dai *dai, int fll_id, int source,
> +			      unsigned int Fref, unsigned int Fout)
> +{
> +	return wm8904_set_fll(dai->component, fll_id, source, Fref, Fout);
> +}
> +
>  static int wm8904_digital_mute(struct snd_soc_dai *codec_dai, int mute)
>  {
>  	struct snd_soc_component *component = codec_dai->component;
> @@ -1921,7 +1936,7 @@ static const struct snd_soc_dai_ops wm8904_dai_ops = {
>  	.set_sysclk = wm8904_set_sysclk,
>  	.set_fmt = wm8904_set_fmt,
>  	.set_tdm_slot = wm8904_set_tdm_slot,
> -	.set_pll = wm8904_set_fll,
> +	.set_pll = wm8904_set_dai_fll,
>  	.hw_params = wm8904_hw_params,
>  	.digital_mute = wm8904_digital_mute,
>  };
> diff --git a/sound/soc/codecs/wm8904.h b/sound/soc/codecs/wm8904.h
> index c29a0e8131ca..ed3260bcae62 100644
> --- a/sound/soc/codecs/wm8904.h
> +++ b/sound/soc/codecs/wm8904.h
> @@ -13,8 +13,8 @@
>  #ifndef _WM8904_H
>  #define _WM8904_H
>  
> +#define WM8904_CLK_FLL  0
>  #define WM8904_CLK_MCLK 1
> -#define WM8904_CLK_FLL  2

A little nervous about making CLK_FLL 0 that means that there is
no longer any concept of an undefined sysclk_src, perhaps we
should also initialise things in the driver to maintain that
concept.

>  
>  #define WM8904_FLL_MCLK          1
>  #define WM8904_FLL_BCLK          2
> -- 
> 2.19.2

Thanks,
Charles
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Re: [PATCH 2/4] ASoC: wm8904: Automatically enable FLL when selected

[Mark Brown]

[-- Attachment #1.1: Type: text/plain, Size: 586 bytes --]

On Fri, Dec 21, 2018 at 11:52:27AM +0000, Charles Keepax wrote:
> On Wed, Dec 19, 2018 at 09:11:15PM +0100, Michał Mirosław wrote:

> > +		if (!wm8904->fll_fout) {
> > +			int ret = wm8904_set_fll(component, WM8904_FLL_MCLK, WM8904_FLL_MCLK,
> > +						 clk_get_rate(wm8904->mclk), 12288000);
> > +			if (ret)
> > +				return ret;
> > +		}

> What is your thinking on selecting a 12.28MHz clock? Will this
> not cause issues with say 44.1k playback?

The driver just shouldn't be making decisions like this at all, either
generic code or a machine driver should do so.

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]

Re: [PATCH 2/4] ASoC: wm8904: Automatically enable FLL when selected

[Michał Mirosław]

On Fri, Dec 21, 2018 at 11:58:31AM +0000, Mark Brown wrote:
> On Fri, Dec 21, 2018 at 11:52:27AM +0000, Charles Keepax wrote:
> > On Wed, Dec 19, 2018 at 09:11:15PM +0100, Michał Mirosław wrote:
> 
> > > +		if (!wm8904->fll_fout) {
> > > +			int ret = wm8904_set_fll(component, WM8904_FLL_MCLK, WM8904_FLL_MCLK,
> > > +						 clk_get_rate(wm8904->mclk), 12288000);
> > > +			if (ret)
> > > +				return ret;
> > > +		}
> 
> > What is your thinking on selecting a 12.28MHz clock? Will this
> > not cause issues with say 44.1k playback?
> The driver just shouldn't be making decisions like this at all, either
> generic code or a machine driver should do so.

Sorry, I forgot about the hardcoded frequency. I'll have to rethink this
patch.

Will you take the other three patches as is, or should I resend the series?

Best Regards,
Michał Mirosław