[PATCH v3 RESEND 1/3] ASoC: samsung: arndale: Simplify DAI link initialization

[PATCH v3 RESEND 1/3] ASoC: samsung: arndale: Simplify DAI link initialization

[Sylwester Nawrocki]

There is only one DAI link so we can drop an unnecessary loop statement.
Use card->dai_link in place of direct static arndale_rt5631_dai[] array
dereference as a prerequisite for adding support for other CODECs.
Unnecessary assignment of dai_link->codecs->name to NULL is removed.

Reviewed-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Acked-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
---
Changes since v1:
 - rebased due to reordering patches in the series
---
 sound/soc/samsung/arndale_rt5631.c | 42 +++++++++++++-----------------
 1 file changed, 18 insertions(+), 24 deletions(-)

diff --git a/sound/soc/samsung/arndale_rt5631.c b/sound/soc/samsung/arndale_rt5631.c
index fd8c6642fb0d..004c84fafad9 100644
--- a/sound/soc/samsung/arndale_rt5631.c
+++ b/sound/soc/samsung/arndale_rt5631.c
@@ -88,36 +88,30 @@ static void arndale_put_of_nodes(struct snd_soc_card *card)
 
 static int arndale_audio_probe(struct platform_device *pdev)
 {
-	int n, ret;
 	struct device_node *np = pdev->dev.of_node;
 	struct snd_soc_card *card = &arndale_rt5631;
+	struct snd_soc_dai_link *dai_link;
+	int ret;
 
 	card->dev = &pdev->dev;
+	dai_link = card->dai_link;
+
+	dai_link->cpus->of_node = of_parse_phandle(np, "samsung,audio-cpu", 0);
+	if (!dai_link->cpus->of_node) {
+		dev_err(&pdev->dev,
+			"Property 'samsung,audio-cpu' missing or invalid\n");
+		return -EINVAL;
+	}
 
-	for (n = 0; np && n < ARRAY_SIZE(arndale_rt5631_dai); n++) {
-		if (!arndale_rt5631_dai[n].cpus->dai_name) {
-			arndale_rt5631_dai[n].cpus->of_node = of_parse_phandle(np,
-					"samsung,audio-cpu", n);
-
-			if (!arndale_rt5631_dai[n].cpus->of_node) {
-				dev_err(&pdev->dev,
-				"Property 'samsung,audio-cpu' missing or invalid\n");
-				return -EINVAL;
-			}
-		}
-		if (!arndale_rt5631_dai[n].platforms->name)
-			arndale_rt5631_dai[n].platforms->of_node =
-					arndale_rt5631_dai[n].cpus->of_node;
-
-		arndale_rt5631_dai[n].codecs->name = NULL;
-		arndale_rt5631_dai[n].codecs->of_node = of_parse_phandle(np,
-					"samsung,audio-codec", n);
-		if (!arndale_rt5631_dai[0].codecs->of_node) {
-			dev_err(&pdev->dev,
+	if (!dai_link->platforms->name)
+		dai_link->platforms->of_node = dai_link->cpus->of_node;
+
+	dai_link->codecs->of_node = of_parse_phandle(np, "samsung,audio-codec", 0);
+	if (!dai_link->codecs->of_node) {
+		dev_err(&pdev->dev,
 			"Property 'samsung,audio-codec' missing or invalid\n");
-			ret = -EINVAL;
-			goto err_put_of_nodes;
-		}
+		ret = -EINVAL;
+		goto err_put_of_nodes;
 	}
 
 	ret = devm_snd_soc_register_card(card->dev, card);
-- 
2.17.1

[PATCH v3 RESEND 1/3] ASoC: samsung: arndale: Simplify DAI link initialization

[Sylwester Nawrocki]

There is only one DAI link so we can drop an unnecessary loop statement.
Use card->dai_link in place of direct static arndale_rt5631_dai[] array
dereference as a prerequisite for adding support for other CODECs.
Unnecessary assignment of dai_link->codecs->name to NULL is removed.

Reviewed-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Acked-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
---
Changes since v1:
 - rebased due to reordering patches in the series
---
 sound/soc/samsung/arndale_rt5631.c | 42 +++++++++++++-----------------
 1 file changed, 18 insertions(+), 24 deletions(-)

diff --git a/sound/soc/samsung/arndale_rt5631.c b/sound/soc/samsung/arndale_rt5631.c
index fd8c6642fb0d..004c84fafad9 100644
--- a/sound/soc/samsung/arndale_rt5631.c
+++ b/sound/soc/samsung/arndale_rt5631.c
@@ -88,36 +88,30 @@ static void arndale_put_of_nodes(struct snd_soc_card *card)
 
 static int arndale_audio_probe(struct platform_device *pdev)
 {
-	int n, ret;
 	struct device_node *np = pdev->dev.of_node;
 	struct snd_soc_card *card = &arndale_rt5631;
+	struct snd_soc_dai_link *dai_link;
+	int ret;
 
 	card->dev = &pdev->dev;
+	dai_link = card->dai_link;
+
+	dai_link->cpus->of_node = of_parse_phandle(np, "samsung,audio-cpu", 0);
+	if (!dai_link->cpus->of_node) {
+		dev_err(&pdev->dev,
+			"Property 'samsung,audio-cpu' missing or invalid\n");
+		return -EINVAL;
+	}
 
-	for (n = 0; np && n < ARRAY_SIZE(arndale_rt5631_dai); n++) {
-		if (!arndale_rt5631_dai[n].cpus->dai_name) {
-			arndale_rt5631_dai[n].cpus->of_node = of_parse_phandle(np,
-					"samsung,audio-cpu", n);
-
-			if (!arndale_rt5631_dai[n].cpus->of_node) {
-				dev_err(&pdev->dev,
-				"Property 'samsung,audio-cpu' missing or invalid\n");
-				return -EINVAL;
-			}
-		}
-		if (!arndale_rt5631_dai[n].platforms->name)
-			arndale_rt5631_dai[n].platforms->of_node =
-					arndale_rt5631_dai[n].cpus->of_node;
-
-		arndale_rt5631_dai[n].codecs->name = NULL;
-		arndale_rt5631_dai[n].codecs->of_node = of_parse_phandle(np,
-					"samsung,audio-codec", n);
-		if (!arndale_rt5631_dai[0].codecs->of_node) {
-			dev_err(&pdev->dev,
+	if (!dai_link->platforms->name)
+		dai_link->platforms->of_node = dai_link->cpus->of_node;
+
+	dai_link->codecs->of_node = of_parse_phandle(np, "samsung,audio-codec", 0);
+	if (!dai_link->codecs->of_node) {
+		dev_err(&pdev->dev,
 			"Property 'samsung,audio-codec' missing or invalid\n");
-			ret = -EINVAL;
-			goto err_put_of_nodes;
-		}
+		ret = -EINVAL;
+		goto err_put_of_nodes;
 	}
 
 	ret = devm_snd_soc_register_card(card->dev, card);
-- 
2.17.1

[PATCH v3 RESEND 2/3] ASoC: samsung: arndale: Add support for WM1811 CODEC

[Sylwester Nawrocki]

The Arndale boards come with different types of the audio daughter
board.  In order to support the WM1811 one we add new definition of
an ASoC card which will be registered when the driver matches on
"samsung,arndale-wm1811" compatible.  There is no runtime detection of
the audio daughter board type at the moment, compatible string of the
audio card needs to be adjusted in DT, e.g. by the bootloader,
depending on actual audio board (CODEC) used.

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
---
Changes since v1:
 - removed unneeded __maybe_used attribute
---
 sound/soc/samsung/Kconfig          |  2 +
 sound/soc/samsung/arndale_rt5631.c | 85 +++++++++++++++++++++++++-----
 2 files changed, 74 insertions(+), 13 deletions(-)

diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig
index 638983123d8f..6803cbfa9e46 100644
--- a/sound/soc/samsung/Kconfig
+++ b/sound/soc/samsung/Kconfig
@@ -199,6 +199,8 @@ config SND_SOC_ARNDALE_RT5631_ALC5631
         depends on I2C
         select SND_SAMSUNG_I2S
         select SND_SOC_RT5631
+	select MFD_WM8994
+	select SND_SOC_WM8994
 
 config SND_SOC_SAMSUNG_TM2_WM5110
 	tristate "SoC I2S Audio support for WM5110 on TM2 board"
diff --git a/sound/soc/samsung/arndale_rt5631.c b/sound/soc/samsung/arndale_rt5631.c
index 004c84fafad9..1e8badb1b8f9 100644
--- a/sound/soc/samsung/arndale_rt5631.c
+++ b/sound/soc/samsung/arndale_rt5631.c
@@ -14,10 +14,11 @@
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 
+#include "../codecs/wm8994.h"
 #include "i2s.h"
 
-static int arndale_hw_params(struct snd_pcm_substream *substream,
-	struct snd_pcm_hw_params *params)
+static int arndale_rt5631_hw_params(struct snd_pcm_substream *substream,
+				    struct snd_pcm_hw_params *params)
 {
 	struct snd_soc_pcm_runtime *rtd = substream->private_data;
 	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
@@ -47,13 +48,45 @@ static int arndale_hw_params(struct snd_pcm_substream *substream,
 	return 0;
 }
 
-static struct snd_soc_ops arndale_ops = {
-	.hw_params = arndale_hw_params,
+static struct snd_soc_ops arndale_rt5631_ops = {
+	.hw_params = arndale_rt5631_hw_params,
+};
+
+static int arndale_wm1811_hw_params(struct snd_pcm_substream *substream,
+				    struct snd_pcm_hw_params *params)
+{
+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
+	struct snd_soc_dai *codec_dai = rtd->codec_dai;
+	unsigned int rfs, rclk;
+
+	/* Ensure AIF1CLK is >= 3 MHz for optimal performance */
+	if (params_width(params) == 24)
+		rfs = 384;
+	else if (params_rate(params) == 8000 || params_rate(params) == 11025)
+		rfs = 512;
+	else
+		rfs = 256;
+
+	rclk = params_rate(params) * rfs;
+
+	/*
+	 * We add 1 to the frequency value to ensure proper EPLL setting
+	 * for each audio sampling rate (see epll_24mhz_tbl in drivers/clk/
+	 * samsung/clk-exynos5250.c for list of available EPLL rates).
+	 * The CODEC uses clk API and the value will be rounded hence the MCLK1
+	 * clock's frequency will still be exact multiple of the sample rate.
+	 */
+	return snd_soc_dai_set_sysclk(codec_dai, WM8994_SYSCLK_MCLK1,
+					rclk + 1, SND_SOC_CLOCK_IN);
+}
+
+static struct snd_soc_ops arndale_wm1811_ops = {
+	.hw_params = arndale_wm1811_hw_params,
 };
 
 SND_SOC_DAILINK_DEFS(rt5631_hifi,
 	DAILINK_COMP_ARRAY(COMP_EMPTY()),
-	DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "rt5631-hifi")),
+	DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "rt5631-aif1")),
 	DAILINK_COMP_ARRAY(COMP_EMPTY()));
 
 static struct snd_soc_dai_link arndale_rt5631_dai[] = {
@@ -63,11 +96,28 @@ static struct snd_soc_dai_link arndale_rt5631_dai[] = {
 		.dai_fmt = SND_SOC_DAIFMT_I2S
 			| SND_SOC_DAIFMT_NB_NF
 			| SND_SOC_DAIFMT_CBS_CFS,
-		.ops = &arndale_ops,
+		.ops = &arndale_rt5631_ops,
 		SND_SOC_DAILINK_REG(rt5631_hifi),
 	},
 };
 
+SND_SOC_DAILINK_DEFS(wm1811_hifi,
+	DAILINK_COMP_ARRAY(COMP_EMPTY()),
+	DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "wm8994-aif1")),
+	DAILINK_COMP_ARRAY(COMP_EMPTY()));
+
+static struct snd_soc_dai_link arndale_wm1811_dai[] = {
+	{
+		.name = "WM1811 HiFi",
+		.stream_name = "Primary",
+		.dai_fmt = SND_SOC_DAIFMT_I2S
+			| SND_SOC_DAIFMT_NB_NF
+			| SND_SOC_DAIFMT_CBM_CFM,
+		.ops = &arndale_wm1811_ops,
+		SND_SOC_DAILINK_REG(wm1811_hifi),
+	},
+};
+
 static struct snd_soc_card arndale_rt5631 = {
 	.name = "Arndale RT5631",
 	.owner = THIS_MODULE,
@@ -75,6 +125,13 @@ static struct snd_soc_card arndale_rt5631 = {
 	.num_links = ARRAY_SIZE(arndale_rt5631_dai),
 };
 
+static struct snd_soc_card arndale_wm1811 = {
+	.name = "Arndale WM1811",
+	.owner = THIS_MODULE,
+	.dai_link = arndale_wm1811_dai,
+	.num_links = ARRAY_SIZE(arndale_wm1811_dai),
+};
+
 static void arndale_put_of_nodes(struct snd_soc_card *card)
 {
 	struct snd_soc_dai_link *dai_link;
@@ -89,10 +146,11 @@ static void arndale_put_of_nodes(struct snd_soc_card *card)
 static int arndale_audio_probe(struct platform_device *pdev)
 {
 	struct device_node *np = pdev->dev.of_node;
-	struct snd_soc_card *card = &arndale_rt5631;
+	struct snd_soc_card *card;
 	struct snd_soc_dai_link *dai_link;
 	int ret;
 
+	card = (struct snd_soc_card *)of_device_get_match_data(&pdev->dev);
 	card->dev = &pdev->dev;
 	dai_link = card->dai_link;
 
@@ -134,18 +192,19 @@ static int arndale_audio_remove(struct platform_device *pdev)
 	return 0;
 }
 
-static const struct of_device_id samsung_arndale_rt5631_of_match[] __maybe_unused = {
-	{ .compatible = "samsung,arndale-rt5631", },
-	{ .compatible = "samsung,arndale-alc5631", },
+static const struct of_device_id arndale_audio_of_match[] = {
+	{ .compatible = "samsung,arndale-rt5631",  .data = &arndale_rt5631 },
+	{ .compatible = "samsung,arndale-alc5631", .data = &arndale_rt5631 },
+	{ .compatible = "samsung,arndale-wm1811",  .data = &arndale_wm1811 },
 	{},
 };
-MODULE_DEVICE_TABLE(of, samsung_arndale_rt5631_of_match);
+MODULE_DEVICE_TABLE(of, arndale_of_match);
 
 static struct platform_driver arndale_audio_driver = {
 	.driver = {
-		.name   = "arndale-audio",
+		.name = "arndale-audio",
 		.pm = &snd_soc_pm_ops,
-		.of_match_table = of_match_ptr(samsung_arndale_rt5631_of_match),
+		.of_match_table = arndale_audio_of_match,
 	},
 	.probe = arndale_audio_probe,
 	.remove = arndale_audio_remove,
-- 
2.17.1

[PATCH v3 RESEND 2/3] ASoC: samsung: arndale: Add support for WM1811 CODEC

[Sylwester Nawrocki]

The Arndale boards come with different types of the audio daughter
board.  In order to support the WM1811 one we add new definition of
an ASoC card which will be registered when the driver matches on
"samsung,arndale-wm1811" compatible.  There is no runtime detection of
the audio daughter board type at the moment, compatible string of the
audio card needs to be adjusted in DT, e.g. by the bootloader,
depending on actual audio board (CODEC) used.

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
---
Changes since v1:
 - removed unneeded __maybe_used attribute
---
 sound/soc/samsung/Kconfig          |  2 +
 sound/soc/samsung/arndale_rt5631.c | 85 +++++++++++++++++++++++++-----
 2 files changed, 74 insertions(+), 13 deletions(-)

diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig
index 638983123d8f..6803cbfa9e46 100644
--- a/sound/soc/samsung/Kconfig
+++ b/sound/soc/samsung/Kconfig
@@ -199,6 +199,8 @@ config SND_SOC_ARNDALE_RT5631_ALC5631
         depends on I2C
         select SND_SAMSUNG_I2S
         select SND_SOC_RT5631
+	select MFD_WM8994
+	select SND_SOC_WM8994
 
 config SND_SOC_SAMSUNG_TM2_WM5110
 	tristate "SoC I2S Audio support for WM5110 on TM2 board"
diff --git a/sound/soc/samsung/arndale_rt5631.c b/sound/soc/samsung/arndale_rt5631.c
index 004c84fafad9..1e8badb1b8f9 100644
--- a/sound/soc/samsung/arndale_rt5631.c
+++ b/sound/soc/samsung/arndale_rt5631.c
@@ -14,10 +14,11 @@
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 
+#include "../codecs/wm8994.h"
 #include "i2s.h"
 
-static int arndale_hw_params(struct snd_pcm_substream *substream,
-	struct snd_pcm_hw_params *params)
+static int arndale_rt5631_hw_params(struct snd_pcm_substream *substream,
+				    struct snd_pcm_hw_params *params)
 {
 	struct snd_soc_pcm_runtime *rtd = substream->private_data;
 	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
@@ -47,13 +48,45 @@ static int arndale_hw_params(struct snd_pcm_substream *substream,
 	return 0;
 }
 
-static struct snd_soc_ops arndale_ops = {
-	.hw_params = arndale_hw_params,
+static struct snd_soc_ops arndale_rt5631_ops = {
+	.hw_params = arndale_rt5631_hw_params,
+};
+
+static int arndale_wm1811_hw_params(struct snd_pcm_substream *substream,
+				    struct snd_pcm_hw_params *params)
+{
+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
+	struct snd_soc_dai *codec_dai = rtd->codec_dai;
+	unsigned int rfs, rclk;
+
+	/* Ensure AIF1CLK is >= 3 MHz for optimal performance */
+	if (params_width(params) == 24)
+		rfs = 384;
+	else if (params_rate(params) == 8000 || params_rate(params) == 11025)
+		rfs = 512;
+	else
+		rfs = 256;
+
+	rclk = params_rate(params) * rfs;
+
+	/*
+	 * We add 1 to the frequency value to ensure proper EPLL setting
+	 * for each audio sampling rate (see epll_24mhz_tbl in drivers/clk/
+	 * samsung/clk-exynos5250.c for list of available EPLL rates).
+	 * The CODEC uses clk API and the value will be rounded hence the MCLK1
+	 * clock's frequency will still be exact multiple of the sample rate.
+	 */
+	return snd_soc_dai_set_sysclk(codec_dai, WM8994_SYSCLK_MCLK1,
+					rclk + 1, SND_SOC_CLOCK_IN);
+}
+
+static struct snd_soc_ops arndale_wm1811_ops = {
+	.hw_params = arndale_wm1811_hw_params,
 };
 
 SND_SOC_DAILINK_DEFS(rt5631_hifi,
 	DAILINK_COMP_ARRAY(COMP_EMPTY()),
-	DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "rt5631-hifi")),
+	DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "rt5631-aif1")),
 	DAILINK_COMP_ARRAY(COMP_EMPTY()));
 
 static struct snd_soc_dai_link arndale_rt5631_dai[] = {
@@ -63,11 +96,28 @@ static struct snd_soc_dai_link arndale_rt5631_dai[] = {
 		.dai_fmt = SND_SOC_DAIFMT_I2S
 			| SND_SOC_DAIFMT_NB_NF
 			| SND_SOC_DAIFMT_CBS_CFS,
-		.ops = &arndale_ops,
+		.ops = &arndale_rt5631_ops,
 		SND_SOC_DAILINK_REG(rt5631_hifi),
 	},
 };
 
+SND_SOC_DAILINK_DEFS(wm1811_hifi,
+	DAILINK_COMP_ARRAY(COMP_EMPTY()),
+	DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "wm8994-aif1")),
+	DAILINK_COMP_ARRAY(COMP_EMPTY()));
+
+static struct snd_soc_dai_link arndale_wm1811_dai[] = {
+	{
+		.name = "WM1811 HiFi",
+		.stream_name = "Primary",
+		.dai_fmt = SND_SOC_DAIFMT_I2S
+			| SND_SOC_DAIFMT_NB_NF
+			| SND_SOC_DAIFMT_CBM_CFM,
+		.ops = &arndale_wm1811_ops,
+		SND_SOC_DAILINK_REG(wm1811_hifi),
+	},
+};
+
 static struct snd_soc_card arndale_rt5631 = {
 	.name = "Arndale RT5631",
 	.owner = THIS_MODULE,
@@ -75,6 +125,13 @@ static struct snd_soc_card arndale_rt5631 = {
 	.num_links = ARRAY_SIZE(arndale_rt5631_dai),
 };
 
+static struct snd_soc_card arndale_wm1811 = {
+	.name = "Arndale WM1811",
+	.owner = THIS_MODULE,
+	.dai_link = arndale_wm1811_dai,
+	.num_links = ARRAY_SIZE(arndale_wm1811_dai),
+};
+
 static void arndale_put_of_nodes(struct snd_soc_card *card)
 {
 	struct snd_soc_dai_link *dai_link;
@@ -89,10 +146,11 @@ static void arndale_put_of_nodes(struct snd_soc_card *card)
 static int arndale_audio_probe(struct platform_device *pdev)
 {
 	struct device_node *np = pdev->dev.of_node;
-	struct snd_soc_card *card = &arndale_rt5631;
+	struct snd_soc_card *card;
 	struct snd_soc_dai_link *dai_link;
 	int ret;
 
+	card = (struct snd_soc_card *)of_device_get_match_data(&pdev->dev);
 	card->dev = &pdev->dev;
 	dai_link = card->dai_link;
 
@@ -134,18 +192,19 @@ static int arndale_audio_remove(struct platform_device *pdev)
 	return 0;
 }
 
-static const struct of_device_id samsung_arndale_rt5631_of_match[] __maybe_unused = {
-	{ .compatible = "samsung,arndale-rt5631", },
-	{ .compatible = "samsung,arndale-alc5631", },
+static const struct of_device_id arndale_audio_of_match[] = {
+	{ .compatible = "samsung,arndale-rt5631",  .data = &arndale_rt5631 },
+	{ .compatible = "samsung,arndale-alc5631", .data = &arndale_rt5631 },
+	{ .compatible = "samsung,arndale-wm1811",  .data = &arndale_wm1811 },
 	{},
 };
-MODULE_DEVICE_TABLE(of, samsung_arndale_rt5631_of_match);
+MODULE_DEVICE_TABLE(of, arndale_of_match);
 
 static struct platform_driver arndale_audio_driver = {
 	.driver = {
-		.name   = "arndale-audio",
+		.name = "arndale-audio",
 		.pm = &snd_soc_pm_ops,
-		.of_match_table = of_match_ptr(samsung_arndale_rt5631_of_match),
+		.of_match_table = arndale_audio_of_match,
 	},
 	.probe = arndale_audio_probe,
 	.remove = arndale_audio_remove,
-- 
2.17.1

Re: [PATCH v3 RESEND 2/3] ASoC: samsung: arndale: Add support for WM1811 CODEC

[Charles Keepax]

On Tue, Oct 01, 2019 at 02:36:24PM +0200, Sylwester Nawrocki wrote:
> The Arndale boards come with different types of the audio daughter
> board.  In order to support the WM1811 one we add new definition of
> an ASoC card which will be registered when the driver matches on
> "samsung,arndale-wm1811" compatible.  There is no runtime detection of
> the audio daughter board type at the moment, compatible string of the
> audio card needs to be adjusted in DT, e.g. by the bootloader,
> depending on actual audio board (CODEC) used.
> 
> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
> ---

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

Thanks,
Charles

Re: [PATCH v3 RESEND 2/3] ASoC: samsung: arndale: Add support for WM1811 CODEC

[Charles Keepax]

On Tue, Oct 01, 2019 at 02:36:24PM +0200, Sylwester Nawrocki wrote:
> The Arndale boards come with different types of the audio daughter
> board.  In order to support the WM1811 one we add new definition of
> an ASoC card which will be registered when the driver matches on
> "samsung,arndale-wm1811" compatible.  There is no runtime detection of
> the audio daughter board type at the moment, compatible string of the
> audio card needs to be adjusted in DT, e.g. by the bootloader,
> depending on actual audio board (CODEC) used.
> 
> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
> ---

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

Thanks,
Charles

Re: [PATCH v3 RESEND 2/3] ASoC: samsung: arndale: Add support for WM1811 CODEC

[Sylwester Nawrocki]

On 10/1/19 14:36, Sylwester Nawrocki wrote:
> The Arndale boards come with different types of the audio daughter
> board.  In order to support the WM1811 one we add new definition of
> an ASoC card which will be registered when the driver matches on
> "samsung,arndale-wm1811" compatible.  There is no runtime detection of
> the audio daughter board type at the moment, compatible string of the
> audio card needs to be adjusted in DT, e.g. by the bootloader,
> depending on actual audio board (CODEC) used.
> 
> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>

I forgot to add carry the tag:
 Acked-by: Krzysztof Kozlowski <krzk@kernel.org>

Re: [PATCH v3 RESEND 2/3] ASoC: samsung: arndale: Add support for WM1811 CODEC

[Sylwester Nawrocki]

On 10/1/19 14:36, Sylwester Nawrocki wrote:
> The Arndale boards come with different types of the audio daughter
> board.  In order to support the WM1811 one we add new definition of
> an ASoC card which will be registered when the driver matches on
> "samsung,arndale-wm1811" compatible.  There is no runtime detection of
> the audio daughter board type at the moment, compatible string of the
> audio card needs to be adjusted in DT, e.g. by the bootloader,
> depending on actual audio board (CODEC) used.
> 
> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>

I forgot to add carry the tag:
 Acked-by: Krzysztof Kozlowski <krzk@kernel.org>

[PATCH v3 RESEND 3/3] ASoC: samsung: Rename Arndale card driver

[Sylwester Nawrocki]

Rename arndale_rt5631.c to just arnddale.c as we support other CODECs
than RT5631.  While at it replace spaces in Kconfig with tabs.

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
---
Changes since v1:
 - new patch.
---
 sound/soc/samsung/Kconfig                         | 10 +++++-----
 sound/soc/samsung/Makefile                        |  4 ++--
 sound/soc/samsung/{arndale_rt5631.c => arndale.c} |  0
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename sound/soc/samsung/{arndale_rt5631.c => arndale.c} (100%)

diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig
index 6803cbfa9e46..1a0b163ca47b 100644
--- a/sound/soc/samsung/Kconfig
+++ b/sound/soc/samsung/Kconfig
@@ -194,11 +194,11 @@ config SND_SOC_ODROID
 	help
 	  Say Y here to enable audio support for the Odroid XU3/XU4.
 
-config SND_SOC_ARNDALE_RT5631_ALC5631
-        tristate "Audio support for RT5631(ALC5631) on Arndale Board"
-        depends on I2C
-        select SND_SAMSUNG_I2S
-        select SND_SOC_RT5631
+config SND_SOC_ARNDALE
+	tristate "Audio support for Arndale Board"
+	depends on I2C
+	select SND_SAMSUNG_I2S
+	select SND_SOC_RT5631
 	select MFD_WM8994
 	select SND_SOC_WM8994
 
diff --git a/sound/soc/samsung/Makefile b/sound/soc/samsung/Makefile
index c3b76035f69c..8f5dfe20b9f1 100644
--- a/sound/soc/samsung/Makefile
+++ b/sound/soc/samsung/Makefile
@@ -39,7 +39,7 @@ snd-soc-lowland-objs := lowland.o
 snd-soc-littlemill-objs := littlemill.o
 snd-soc-bells-objs := bells.o
 snd-soc-odroid-objs := odroid.o
-snd-soc-arndale-rt5631-objs := arndale_rt5631.o
+snd-soc-arndale-objs := arndale.o
 snd-soc-tm2-wm5110-objs := tm2_wm5110.o
 
 obj-$(CONFIG_SND_SOC_SAMSUNG_JIVE_WM8750) += snd-soc-jive-wm8750.o
@@ -62,5 +62,5 @@ obj-$(CONFIG_SND_SOC_LOWLAND) += snd-soc-lowland.o
 obj-$(CONFIG_SND_SOC_LITTLEMILL) += snd-soc-littlemill.o
 obj-$(CONFIG_SND_SOC_BELLS) += snd-soc-bells.o
 obj-$(CONFIG_SND_SOC_ODROID) += snd-soc-odroid.o
-obj-$(CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631) += snd-soc-arndale-rt5631.o
+obj-$(CONFIG_SND_SOC_ARNDALE) += snd-soc-arndale.o
 obj-$(CONFIG_SND_SOC_SAMSUNG_TM2_WM5110) += snd-soc-tm2-wm5110.o
diff --git a/sound/soc/samsung/arndale_rt5631.c b/sound/soc/samsung/arndale.c
similarity index 100%
rename from sound/soc/samsung/arndale_rt5631.c
rename to sound/soc/samsung/arndale.c
-- 
2.17.1

[PATCH v3 RESEND 3/3] ASoC: samsung: Rename Arndale card driver

[Sylwester Nawrocki]

Rename arndale_rt5631.c to just arnddale.c as we support other CODECs
than RT5631.  While at it replace spaces in Kconfig with tabs.

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
---
Changes since v1:
 - new patch.
---
 sound/soc/samsung/Kconfig                         | 10 +++++-----
 sound/soc/samsung/Makefile                        |  4 ++--
 sound/soc/samsung/{arndale_rt5631.c => arndale.c} |  0
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename sound/soc/samsung/{arndale_rt5631.c => arndale.c} (100%)

diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig
index 6803cbfa9e46..1a0b163ca47b 100644
--- a/sound/soc/samsung/Kconfig
+++ b/sound/soc/samsung/Kconfig
@@ -194,11 +194,11 @@ config SND_SOC_ODROID
 	help
 	  Say Y here to enable audio support for the Odroid XU3/XU4.
 
-config SND_SOC_ARNDALE_RT5631_ALC5631
-        tristate "Audio support for RT5631(ALC5631) on Arndale Board"
-        depends on I2C
-        select SND_SAMSUNG_I2S
-        select SND_SOC_RT5631
+config SND_SOC_ARNDALE
+	tristate "Audio support for Arndale Board"
+	depends on I2C
+	select SND_SAMSUNG_I2S
+	select SND_SOC_RT5631
 	select MFD_WM8994
 	select SND_SOC_WM8994
 
diff --git a/sound/soc/samsung/Makefile b/sound/soc/samsung/Makefile
index c3b76035f69c..8f5dfe20b9f1 100644
--- a/sound/soc/samsung/Makefile
+++ b/sound/soc/samsung/Makefile
@@ -39,7 +39,7 @@ snd-soc-lowland-objs := lowland.o
 snd-soc-littlemill-objs := littlemill.o
 snd-soc-bells-objs := bells.o
 snd-soc-odroid-objs := odroid.o
-snd-soc-arndale-rt5631-objs := arndale_rt5631.o
+snd-soc-arndale-objs := arndale.o
 snd-soc-tm2-wm5110-objs := tm2_wm5110.o
 
 obj-$(CONFIG_SND_SOC_SAMSUNG_JIVE_WM8750) += snd-soc-jive-wm8750.o
@@ -62,5 +62,5 @@ obj-$(CONFIG_SND_SOC_LOWLAND) += snd-soc-lowland.o
 obj-$(CONFIG_SND_SOC_LITTLEMILL) += snd-soc-littlemill.o
 obj-$(CONFIG_SND_SOC_BELLS) += snd-soc-bells.o
 obj-$(CONFIG_SND_SOC_ODROID) += snd-soc-odroid.o
-obj-$(CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631) += snd-soc-arndale-rt5631.o
+obj-$(CONFIG_SND_SOC_ARNDALE) += snd-soc-arndale.o
 obj-$(CONFIG_SND_SOC_SAMSUNG_TM2_WM5110) += snd-soc-tm2-wm5110.o
diff --git a/sound/soc/samsung/arndale_rt5631.c b/sound/soc/samsung/arndale.c
similarity index 100%
rename from sound/soc/samsung/arndale_rt5631.c
rename to sound/soc/samsung/arndale.c
-- 
2.17.1

Re: [PATCH v3 RESEND 3/3] ASoC: samsung: Rename Arndale card driver

[Sylwester Nawrocki]

On 10/1/19 14:36, Sylwester Nawrocki wrote:
> Rename arndale_rt5631.c to just arnddale.c as we support other CODECs
> than RT5631.  While at it replace spaces in Kconfig with tabs.
> 
> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>

I forgot to add carry the tag:
 Acked-by: Krzysztof Kozlowski <krzk@kernel.org>

Re: [PATCH v3 RESEND 3/3] ASoC: samsung: Rename Arndale card driver

[Sylwester Nawrocki]

On 10/1/19 14:36, Sylwester Nawrocki wrote:
> Rename arndale_rt5631.c to just arnddale.c as we support other CODECs
> than RT5631.  While at it replace spaces in Kconfig with tabs.
> 
> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>

I forgot to add carry the tag:
 Acked-by: Krzysztof Kozlowski <krzk@kernel.org>

Re: [PATCH v3 RESEND 3/3] ASoC: samsung: Rename Arndale card driver

[kbuild test robot]

[-- Attachment #1: Type: text/plain, Size: 25289 bytes --]

Hi Sylwester,

I love your patch! Yet something to improve:

[auto build test ERROR on asoc/for-next]
[cannot apply to v5.4-rc1 next-20191001]
[if your patch is applied to the wrong git tree, please drop us a note to help
improve the system. BTW, we also suggest to use '--base' option to specify the
base tree in git format-patch, please see https://stackoverflow.com/a/37406982]

url:    https://github.com/0day-ci/linux/commits/Sylwester-Nawrocki/ASoC-samsung-arndale-Simplify-DAI-link-initialization/20191002-000244
base:   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
config: mips-allmodconfig (attached as .config)
compiler: mips-linux-gcc (GCC) 7.4.0
reproduce:
        wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # save the attached .config to linux build tree
        GCC_VERSION=7.4.0 make.cross ARCH=mips 

If you fix the issue, kindly add following tag
Reported-by: kbuild test robot <lkp@intel.com>

All error/warnings (new ones prefixed by >>):

   In file included from sound/soc/samsung/arndale.c:7:0:
>> sound/soc/samsung/arndale.c:201:25: error: 'arndale_of_match' undeclared here (not in a function); did you mean 'arndale_audio_of_match'?
    MODULE_DEVICE_TABLE(of, arndale_of_match);
                            ^
   include/linux/module.h:227:15: note: in definition of macro 'MODULE_DEVICE_TABLE'
    extern typeof(name) __mod_##type##__##name##_device_table  \
                  ^~~~
>> include/linux/module.h:227:21: error: '__mod_of__arndale_of_match_device_table' aliased to undefined symbol 'arndale_of_match'
    extern typeof(name) __mod_##type##__##name##_device_table  \
                        ^
>> sound/soc/samsung/arndale.c:201:1: note: in expansion of macro 'MODULE_DEVICE_TABLE'
    MODULE_DEVICE_TABLE(of, arndale_of_match);
    ^~~~~~~~~~~~~~~~~~~
--
   In file included from sound/soc//samsung/arndale.c:7:0:
   sound/soc//samsung/arndale.c:201:25: error: 'arndale_of_match' undeclared here (not in a function); did you mean 'arndale_audio_of_match'?
    MODULE_DEVICE_TABLE(of, arndale_of_match);
                            ^
   include/linux/module.h:227:15: note: in definition of macro 'MODULE_DEVICE_TABLE'
    extern typeof(name) __mod_##type##__##name##_device_table  \
                  ^~~~
>> include/linux/module.h:227:21: error: '__mod_of__arndale_of_match_device_table' aliased to undefined symbol 'arndale_of_match'
    extern typeof(name) __mod_##type##__##name##_device_table  \
                        ^
   sound/soc//samsung/arndale.c:201:1: note: in expansion of macro 'MODULE_DEVICE_TABLE'
    MODULE_DEVICE_TABLE(of, arndale_of_match);
    ^~~~~~~~~~~~~~~~~~~

vim +201 sound/soc/samsung/arndale.c

d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26    6  
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26   @7  #include <linux/module.h>
fb629fa2587d0c sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-09-20    8  #include <linux/of_device.h>
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26    9  #include <linux/platform_device.h>
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26   10  #include <linux/clk.h>
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26   11  
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26   12  #include <sound/soc.h>
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26   13  #include <sound/soc-dapm.h>
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26   14  #include <sound/pcm.h>
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26   15  #include <sound/pcm_params.h>
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26   16  
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01   17  #include "../codecs/wm8994.h"
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26   18  #include "i2s.h"
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26   19  
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01   20  static int arndale_rt5631_hw_params(struct snd_pcm_substream *substream,
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26   21  				    struct snd_pcm_hw_params *params)
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26   22  {
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26   23  	struct snd_soc_pcm_runtime *rtd = substream->private_data;
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26   24  	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26   25  	struct snd_soc_dai *codec_dai = rtd->codec_dai;
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26   26  	int rfs, ret;
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26   27  	unsigned long rclk;
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26   28  
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26   29  	rfs = 256;
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26   30  
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26   31  	rclk = params_rate(params) * rfs;
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26   32  
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26   33  	ret = snd_soc_dai_set_sysclk(cpu_dai, SAMSUNG_I2S_CDCLK,
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26   34  					0, SND_SOC_CLOCK_OUT);
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26   35  	if (ret < 0)
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26   36  		return ret;
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26   37  
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26   38  	ret = snd_soc_dai_set_sysclk(cpu_dai, SAMSUNG_I2S_RCLKSRC_0,
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26   39  					0, SND_SOC_CLOCK_OUT);
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26   40  
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26   41  	if (ret < 0)
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26   42  		return ret;
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26   43  
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26   44  	ret = snd_soc_dai_set_sysclk(codec_dai, 0, rclk, SND_SOC_CLOCK_OUT);
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26   45  	if (ret < 0)
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26   46  		return ret;
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26   47  
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26   48  	return 0;
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26   49  }
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26   50  
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01   51  static struct snd_soc_ops arndale_rt5631_ops = {
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01   52  	.hw_params = arndale_rt5631_hw_params,
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01   53  };
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01   54  
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01   55  static int arndale_wm1811_hw_params(struct snd_pcm_substream *substream,
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01   56  				    struct snd_pcm_hw_params *params)
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01   57  {
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01   58  	struct snd_soc_pcm_runtime *rtd = substream->private_data;
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01   59  	struct snd_soc_dai *codec_dai = rtd->codec_dai;
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01   60  	unsigned int rfs, rclk;
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01   61  
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01   62  	/* Ensure AIF1CLK is >= 3 MHz for optimal performance */
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01   63  	if (params_width(params) == 24)
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01   64  		rfs = 384;
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01   65  	else if (params_rate(params) == 8000 || params_rate(params) == 11025)
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01   66  		rfs = 512;
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01   67  	else
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01   68  		rfs = 256;
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01   69  
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01   70  	rclk = params_rate(params) * rfs;
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01   71  
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01   72  	/*
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01   73  	 * We add 1 to the frequency value to ensure proper EPLL setting
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01   74  	 * for each audio sampling rate (see epll_24mhz_tbl in drivers/clk/
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01   75  	 * samsung/clk-exynos5250.c for list of available EPLL rates).
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01   76  	 * The CODEC uses clk API and the value will be rounded hence the MCLK1
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01   77  	 * clock's frequency will still be exact multiple of the sample rate.
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01   78  	 */
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01   79  	return snd_soc_dai_set_sysclk(codec_dai, WM8994_SYSCLK_MCLK1,
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01   80  					rclk + 1, SND_SOC_CLOCK_IN);
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01   81  }
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01   82  
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01   83  static struct snd_soc_ops arndale_wm1811_ops = {
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01   84  	.hw_params = arndale_wm1811_hw_params,
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26   85  };
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26   86  
930f74a171f5f3 sound/soc/samsung/arndale_rt5631.c Kuninori Morimoto  2019-06-06   87  SND_SOC_DAILINK_DEFS(rt5631_hifi,
930f74a171f5f3 sound/soc/samsung/arndale_rt5631.c Kuninori Morimoto  2019-06-06   88  	DAILINK_COMP_ARRAY(COMP_EMPTY()),
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01   89  	DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "rt5631-aif1")),
a0e95c4d376d30 sound/soc/samsung/arndale_rt5631.c Kuninori Morimoto  2019-06-28   90  	DAILINK_COMP_ARRAY(COMP_EMPTY()));
930f74a171f5f3 sound/soc/samsung/arndale_rt5631.c Kuninori Morimoto  2019-06-06   91  
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26   92  static struct snd_soc_dai_link arndale_rt5631_dai[] = {
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26   93  	{
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26   94  		.name = "RT5631 HiFi",
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26   95  		.stream_name = "Primary",
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26   96  		.dai_fmt = SND_SOC_DAIFMT_I2S
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26   97  			| SND_SOC_DAIFMT_NB_NF
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26   98  			| SND_SOC_DAIFMT_CBS_CFS,
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01   99  		.ops = &arndale_rt5631_ops,
930f74a171f5f3 sound/soc/samsung/arndale_rt5631.c Kuninori Morimoto  2019-06-06  100  		SND_SOC_DAILINK_REG(rt5631_hifi),
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26  101  	},
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26  102  };
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26  103  
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01  104  SND_SOC_DAILINK_DEFS(wm1811_hifi,
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01  105  	DAILINK_COMP_ARRAY(COMP_EMPTY()),
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01  106  	DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "wm8994-aif1")),
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01  107  	DAILINK_COMP_ARRAY(COMP_EMPTY()));
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01  108  
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01  109  static struct snd_soc_dai_link arndale_wm1811_dai[] = {
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01  110  	{
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01  111  		.name = "WM1811 HiFi",
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01  112  		.stream_name = "Primary",
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01  113  		.dai_fmt = SND_SOC_DAIFMT_I2S
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01  114  			| SND_SOC_DAIFMT_NB_NF
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01  115  			| SND_SOC_DAIFMT_CBM_CFM,
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01  116  		.ops = &arndale_wm1811_ops,
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01  117  		SND_SOC_DAILINK_REG(wm1811_hifi),
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01  118  	},
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01  119  };
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01  120  
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26  121  static struct snd_soc_card arndale_rt5631 = {
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26  122  	.name = "Arndale RT5631",
54d8697fa5036d sound/soc/samsung/arndale_rt5631.c Axel Lin           2015-08-21  123  	.owner = THIS_MODULE,
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26  124  	.dai_link = arndale_rt5631_dai,
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26  125  	.num_links = ARRAY_SIZE(arndale_rt5631_dai),
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26  126  };
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26  127  
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01  128  static struct snd_soc_card arndale_wm1811 = {
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01  129  	.name = "Arndale WM1811",
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01  130  	.owner = THIS_MODULE,
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01  131  	.dai_link = arndale_wm1811_dai,
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01  132  	.num_links = ARRAY_SIZE(arndale_wm1811_dai),
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01  133  };
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01  134  
fb629fa2587d0c sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-09-20  135  static void arndale_put_of_nodes(struct snd_soc_card *card)
fb629fa2587d0c sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-09-20  136  {
fb629fa2587d0c sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-09-20  137  	struct snd_soc_dai_link *dai_link;
fb629fa2587d0c sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-09-20  138  	int i;
fb629fa2587d0c sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-09-20  139  
fb629fa2587d0c sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-09-20  140  	for_each_card_prelinks(card, i, dai_link) {
fb629fa2587d0c sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-09-20  141  		of_node_put(dai_link->cpus->of_node);
fb629fa2587d0c sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-09-20  142  		of_node_put(dai_link->codecs->of_node);
fb629fa2587d0c sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-09-20  143  	}
fb629fa2587d0c sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-09-20  144  }
fb629fa2587d0c sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-09-20  145  
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26  146  static int arndale_audio_probe(struct platform_device *pdev)
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26  147  {
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26  148  	struct device_node *np = pdev->dev.of_node;
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01  149  	struct snd_soc_card *card;
bd728e26684606 sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01  150  	struct snd_soc_dai_link *dai_link;
bd728e26684606 sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01  151  	int ret;
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26  152  
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01  153  	card = (struct snd_soc_card *)of_device_get_match_data(&pdev->dev);
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26  154  	card->dev = &pdev->dev;
bd728e26684606 sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01  155  	dai_link = card->dai_link;
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26  156  
bd728e26684606 sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01  157  	dai_link->cpus->of_node = of_parse_phandle(np, "samsung,audio-cpu", 0);
bd728e26684606 sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01  158  	if (!dai_link->cpus->of_node) {
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26  159  		dev_err(&pdev->dev,
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26  160  			"Property 'samsung,audio-cpu' missing or invalid\n");
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26  161  		return -EINVAL;
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26  162  	}
bd728e26684606 sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01  163  
bd728e26684606 sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01  164  	if (!dai_link->platforms->name)
bd728e26684606 sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01  165  		dai_link->platforms->of_node = dai_link->cpus->of_node;
bd728e26684606 sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01  166  
bd728e26684606 sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01  167  	dai_link->codecs->of_node = of_parse_phandle(np, "samsung,audio-codec", 0);
bd728e26684606 sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01  168  	if (!dai_link->codecs->of_node) {
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26  169  		dev_err(&pdev->dev,
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26  170  			"Property 'samsung,audio-codec' missing or invalid\n");
fb629fa2587d0c sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-09-20  171  		ret = -EINVAL;
fb629fa2587d0c sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-09-20  172  		goto err_put_of_nodes;
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26  173  	}
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26  174  
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26  175  	ret = devm_snd_soc_register_card(card->dev, card);
fb629fa2587d0c sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-09-20  176  	if (ret) {
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26  177  		dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", ret);
fb629fa2587d0c sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-09-20  178  		goto err_put_of_nodes;
fb629fa2587d0c sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-09-20  179  	}
fb629fa2587d0c sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-09-20  180  	return 0;
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26  181  
fb629fa2587d0c sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-09-20  182  err_put_of_nodes:
fb629fa2587d0c sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-09-20  183  	arndale_put_of_nodes(card);
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26  184  	return ret;
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26  185  }
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26  186  
fb629fa2587d0c sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-09-20  187  static int arndale_audio_remove(struct platform_device *pdev)
fb629fa2587d0c sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-09-20  188  {
fb629fa2587d0c sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-09-20  189  	struct snd_soc_card *card = platform_get_drvdata(pdev);
fb629fa2587d0c sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-09-20  190  
fb629fa2587d0c sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-09-20  191  	arndale_put_of_nodes(card);
fb629fa2587d0c sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-09-20  192  	return 0;
fb629fa2587d0c sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-09-20  193  }
fb629fa2587d0c sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-09-20  194  
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01  195  static const struct of_device_id arndale_audio_of_match[] = {
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01  196  	{ .compatible = "samsung,arndale-rt5631",  .data = &arndale_rt5631 },
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01  197  	{ .compatible = "samsung,arndale-alc5631", .data = &arndale_rt5631 },
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01  198  	{ .compatible = "samsung,arndale-wm1811",  .data = &arndale_wm1811 },
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26  199  	{},
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26  200  };
613da35b4aeddb sound/soc/samsung/arndale_rt5631.c Sylwester Nawrocki 2019-10-01 @201  MODULE_DEVICE_TABLE(of, arndale_of_match);
d683d0b690c134 sound/soc/samsung/arndale_rt5631.c Krishna Mohan Dani 2014-11-26  202  

:::::: The code at line 201 was first introduced by commit
:::::: 613da35b4aeddbee0c0a329e6911a7be4c7df854 ASoC: samsung: arndale: Add support for WM1811 CODEC

:::::: TO: Sylwester Nawrocki <s.nawrocki@samsung.com>
:::::: CC: 0day robot <lkp@intel.com>

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation

[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 62110 bytes --]

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

Re: [PATCH v3 RESEND 1/3] ASoC: samsung: arndale: Simplify DAI link initialization

[Mark Brown]

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

On Tue, Oct 01, 2019 at 02:36:23PM +0200, Sylwester Nawrocki wrote:

> Changes since v1:
>  - rebased due to reordering patches in the series

These still don't apply, please check and resend specifying what you're
basing them on - I don't think this is an ordering issue.

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

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

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH v3 RESEND 1/3] ASoC: samsung: arndale: Simplify DAI link initialization

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 273 bytes --]

On Tue, Oct 01, 2019 at 02:36:23PM +0200, Sylwester Nawrocki wrote:

> Changes since v1:
>  - rebased due to reordering patches in the series

These still don't apply, please check and resend specifying what you're
basing them on - I don't think this is an ordering issue.

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

Re: [PATCH v3 RESEND 1/3] ASoC: samsung: arndale: Simplify DAI link initialization

[Sylwester Nawrocki]

On 10/1/19 19:56, Mark Brown wrote:
> On Tue, Oct 01, 2019 at 02:36:23PM +0200, Sylwester Nawrocki wrote:
> 
>> Changes since v1:
>>  - rebased due to reordering patches in the series
>
> These still don't apply, please check and resend specifying what you're
> basing them on - I don't think this is an ordering issue.

Sory, the above is an old comment, it just refers to what I did
between v1 and v2. I'm not sure what happened, the patches were based 
on for-next branch, git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound

I will resend shortly with a fix for issue reported by the kbuild test.

ea7bfc805cee ASoC: samsung: Rename Arndale card driver
2db0e4f97a07 ASoC: samsung: arndale: Add support for WM1811 CODEC
fb5ca16f40f0 ASoC: samsung: arndale: Simplify DAI link initialization
82965165b0a9 Merge branch 'asoc-5.5' into asoc-next
952139a546d0 Merge branch 'asoc-5.4' into asoc-linus
4bb41984bf2f ASoC: max98373: check for device node before parsing

Re: [PATCH v3 RESEND 1/3] ASoC: samsung: arndale: Simplify DAI link initialization

[Sylwester Nawrocki]

On 10/1/19 19:56, Mark Brown wrote:
> On Tue, Oct 01, 2019 at 02:36:23PM +0200, Sylwester Nawrocki wrote:
> 
>> Changes since v1:
>>  - rebased due to reordering patches in the series
>
> These still don't apply, please check and resend specifying what you're
> basing them on - I don't think this is an ordering issue.

Sory, the above is an old comment, it just refers to what I did
between v1 and v2. I'm not sure what happened, the patches were based 
on for-next branch, git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound

I will resend shortly with a fix for issue reported by the kbuild test.

ea7bfc805cee ASoC: samsung: Rename Arndale card driver
2db0e4f97a07 ASoC: samsung: arndale: Add support for WM1811 CODEC
fb5ca16f40f0 ASoC: samsung: arndale: Simplify DAI link initialization
82965165b0a9 Merge branch 'asoc-5.5' into asoc-next
952139a546d0 Merge branch 'asoc-5.4' into asoc-linus
4bb41984bf2f ASoC: max98373: check for device node before parsing