[PATCH 1/2] doc: dt bindings: Document Odroid X2/U3 audio subsystem bindings

[PATCH 1/2] doc: dt bindings: Document Odroid X2/U3 audio subsystem bindings

[Sylwester Nawrocki]

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
---
 .../bindings/sound/samsung,odroidx2-max98090.txt   |   32 ++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/sound/samsung,odroidx2-max98090.txt

diff --git a/Documentation/devicetree/bindings/sound/samsung,odroidx2-max98090.txt b/Documentation/devicetree/bindings/sound/samsung,odroidx2-max98090.txt
new file mode 100644
index 0000000..b37e79a
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/samsung,odroidx2-max98090.txt
@@ -0,0 +1,32 @@
+Odroid X2/U3 audio complex
+
+Required properties:
+- compatible		 : "samsung,odroidx2-audio"
+- samsung,i2s-controller : phandle to the I2S controller
+- samsung,audio-codec	 : phandle to the audio codec
+
+Example:
+
+	i2s0: i2s@03830000 {
+		...
+		clocks = <&clock_audss EXYNOS_I2S_BUS>,
+			 <&clock_audss EXYNOS_DOUT_AUD_BUS>;
+		clock-names = "iis", "i2s_opclk0";
+		status = "okay";
+	};
+
+	i2c@13870000 {
+		...
+		max98090: max98090@10 {
+			compatible = "maxim,max98090";
+			reg = <0x10>;
+			interrupt-parent = <&gpx0>;
+			interrupts = <1 0>;
+		};
+	};
+
+	sound {
+		compatible = "samsung,odroidx2-audio";
+		samsung,i2s-controller = <&i2s0>;
+		samsung,audio-codec = <&max98090>;
+	};
-- 
1.7.9.5

[PATCH 1/2] doc: dt bindings: Document Odroid X2/U3 audio subsystem bindings

[Sylwester Nawrocki]

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
---
 .../bindings/sound/samsung,odroidx2-max98090.txt   |   32 ++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/sound/samsung,odroidx2-max98090.txt

diff --git a/Documentation/devicetree/bindings/sound/samsung,odroidx2-max98090.txt b/Documentation/devicetree/bindings/sound/samsung,odroidx2-max98090.txt
new file mode 100644
index 0000000..b37e79a
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/samsung,odroidx2-max98090.txt
@@ -0,0 +1,32 @@
+Odroid X2/U3 audio complex
+
+Required properties:
+- compatible		 : "samsung,odroidx2-audio"
+- samsung,i2s-controller : phandle to the I2S controller
+- samsung,audio-codec	 : phandle to the audio codec
+
+Example:
+
+	i2s0: i2s at 03830000 {
+		...
+		clocks = <&clock_audss EXYNOS_I2S_BUS>,
+			 <&clock_audss EXYNOS_DOUT_AUD_BUS>;
+		clock-names = "iis", "i2s_opclk0";
+		status = "okay";
+	};
+
+	i2c at 13870000 {
+		...
+		max98090: max98090 at 10 {
+			compatible = "maxim,max98090";
+			reg = <0x10>;
+			interrupt-parent = <&gpx0>;
+			interrupts = <1 0>;
+		};
+	};
+
+	sound {
+		compatible = "samsung,odroidx2-audio";
+		samsung,i2s-controller = <&i2s0>;
+		samsung,audio-codec = <&max98090>;
+	};
-- 
1.7.9.5

[PATCH 2/2] ASoC: samsung: Add machine driver for odroidx2

[Sylwester Nawrocki]

From: Chen Zhen <zhen1.chen@samsung.com>

This machine driver primary defines the audio path, the supported
data formats and sample frequency.
The codec works in I2S master mode, in order to achieve required
exact audio sampling frequencies without a need to adjust the EPLL
frequency to each sample rate at runtime.

Signed-off-by: Chen Zhen <zhen1.chen@samsung.com>
[s.nawrocki@samsung.com: coding style changes, fixed of_match table name]
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
---
The only bits missing for v3.16 for audio on the Odroid X2/U3 to work
now seem to be only my clock defaults setting patches [1] and the related
dts updates.

[1] http://www.spinics.net/lists/devicetree/msg34718.html

 sound/soc/samsung/Kconfig             |    8 ++
 sound/soc/samsung/Makefile            |    2 +
 sound/soc/samsung/odroidx2_max98090.c |  150 +++++++++++++++++++++++++++++++++
 3 files changed, 160 insertions(+)
 create mode 100644 sound/soc/samsung/odroidx2_max98090.c

diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig
index f2e2891..aa5ce7c 100644
--- a/sound/soc/samsung/Kconfig
+++ b/sound/soc/samsung/Kconfig
@@ -231,3 +231,11 @@ config SND_SOC_LITTLEMILL
 	select SND_SAMSUNG_I2S
 	select MFD_WM8994
 	select SND_SOC_WM8994
+
+config SND_SOC_ODROIDX2
+	tristate "Audio support for Odroid-X2 and Odroid-U3"
+	depends on SND_SOC_SAMSUNG
+	select SND_SOC_MAX98090
+	select SND_SAMSUNG_I2S
+	help
+	  Say Y here to enable audio support for the Odroid-X2/U3.
diff --git a/sound/soc/samsung/Makefile b/sound/soc/samsung/Makefile
index 86715d8..db89489 100644
--- a/sound/soc/samsung/Makefile
+++ b/sound/soc/samsung/Makefile
@@ -45,6 +45,7 @@ snd-soc-tobermory-objs := tobermory.o
 snd-soc-lowland-objs := lowland.o
 snd-soc-littlemill-objs := littlemill.o
 snd-soc-bells-objs := bells.o
+snd-soc-odroidx2-max98090-objs := odroidx2_max98090.o

 obj-$(CONFIG_SND_SOC_SAMSUNG_JIVE_WM8750) += snd-soc-jive-wm8750.o
 obj-$(CONFIG_SND_SOC_SAMSUNG_NEO1973_WM8753) += snd-soc-neo1973-wm8753.o
@@ -69,3 +70,4 @@ obj-$(CONFIG_SND_SOC_TOBERMORY) += snd-soc-tobermory.o
 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_ODROIDX2) += snd-soc-odroidx2-max98090.o
diff --git a/sound/soc/samsung/odroidx2_max98090.c b/sound/soc/samsung/odroidx2_max98090.c
new file mode 100644
index 0000000..c3065a9
--- /dev/null
+++ b/sound/soc/samsung/odroidx2_max98090.c
@@ -0,0 +1,150 @@
+/*
+ * Copyright (C) 2014 Samsung Electronics Co., Ltd.
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/of.h>
+#include <linux/module.h>
+#include <sound/soc.h>
+#include <sound/pcm_params.h>
+#include "i2s.h"
+#include "i2s-regs.h"
+
+/* The I2S CDCLK output clock frequency to the MAX98090 codec. */
+#define MAX98090_MCLK_FREQ 19200000
+
+static int odroidx2_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;
+	struct snd_soc_dai *codec_dai = rtd->codec_dai;
+	int ret;
+
+	ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S
+					| SND_SOC_DAIFMT_NB_NF
+					| SND_SOC_DAIFMT_CBM_CFM);
+	if (ret < 0)
+		return ret;
+
+	ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S
+					| SND_SOC_DAIFMT_NB_NF
+					| SND_SOC_DAIFMT_CBM_CFM);
+	if (ret < 0)
+		return ret;
+
+	ret = snd_soc_dai_set_sysclk(codec_dai, 3, MAX98090_MCLK_FREQ,
+				     SND_SOC_CLOCK_IN);
+	if (ret < 0) {
+		dev_err(codec_dai->dev,
+			"Unable to switch to FLL1: %d\n", ret);
+		return ret;
+	}
+
+	ret = snd_soc_dai_set_sysclk(cpu_dai, SAMSUNG_I2S_OPCLK,
+					0, MOD_OPCLK_PCLK);
+	if (ret < 0) {
+		dev_err(cpu_dai->dev,
+			"Unable to set i2s opclk: 0x%x\n", ret);
+		return ret;
+	}
+
+	/* Set the cpu DAI configuration in order to use CDCLK */
+	ret = snd_soc_dai_set_sysclk(cpu_dai, SAMSUNG_I2S_CDCLK,
+					0, SND_SOC_CLOCK_OUT);
+	if (ret < 0)
+		return ret;
+
+	dev_dbg(codec_dai->dev,
+		"HiFi DAI %s params: channel %d, rate %d as I2S slave\n",
+		((substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ?
+		 "playback" : "capture"),  params_channels(params),
+		params_rate(params));
+
+	return 0;
+}
+
+static struct snd_soc_ops odroidx2_ops = {
+	.hw_params	= odroidx2_hw_params,
+};
+
+static struct snd_soc_dai_link odroidx2_dai = {
+	.name		= "MAX98090",
+	.stream_name	= "MAX98090 PCM",
+	.codec_dai_name	= "HiFi",
+	.ops		= &odroidx2_ops,
+};
+
+static struct snd_soc_card odroidx2 = {
+	.name		= "odroidx2",
+	.owner		= THIS_MODULE,
+	.dai_link	= &odroidx2_dai,
+	.num_links	= 1,
+};
+
+static int odroidx2_audio_probe(struct platform_device *pdev)
+{
+	struct device_node *np = pdev->dev.of_node;
+	struct snd_soc_card *card = &odroidx2;
+
+	if (!np)
+		return -ENODEV;
+
+	card->dev = &pdev->dev;
+
+	odroidx2_dai.codec_name = NULL;
+	odroidx2_dai.codec_of_node = of_parse_phandle(np,
+						"samsung,audio-codec", 0);
+	if (!odroidx2_dai.codec_of_node) {
+		dev_err(&pdev->dev,
+			"missing or invalid samsung,audio-codec property\n");
+		return -EINVAL;
+	}
+
+	odroidx2_dai.cpu_name = NULL;
+	odroidx2_dai.cpu_of_node = of_parse_phandle(np,
+						"samsung,i2s-controller", 0);
+	if (!odroidx2_dai.cpu_of_node) {
+		dev_err(&pdev->dev,
+			"missing or invalid samsung,i2s-controller property\n");
+		return -EINVAL;
+	}
+
+	odroidx2_dai.platform_of_node = odroidx2_dai.cpu_of_node;
+
+	return snd_soc_register_card(card);
+}
+
+static int odroidx2_audio_remove(struct platform_device *pdev)
+{
+	struct snd_soc_card *card = platform_get_drvdata(pdev);
+
+	snd_soc_unregister_card(card);
+
+	return 0;
+}
+
+static const struct of_device_id odroidx2_audio_of_match[] = {
+	{ .compatible = "samsung,odroidx2-audio" },
+	{ },
+};
+MODULE_DEVICE_TABLE(of, odroidx2_audio_of_match);
+
+static struct platform_driver odroidx2_audio_driver = {
+	.driver = {
+		.name		= "odroidx2-audio",
+		.owner		= THIS_MODULE,
+		.of_match_table	= odroidx2_audio_of_match,
+	},
+	.probe	= odroidx2_audio_probe,
+	.remove	= odroidx2_audio_remove,
+};
+module_platform_driver(odroidx2_audio_driver);
+
+MODULE_AUTHOR("zhen1.chen@samsung.com");
+MODULE_DESCRIPTION("ALSA SoC Odroidx2 Audio Support");
+MODULE_LICENSE("GPL v2");
--
1.7.9.5

[PATCH 2/2] ASoC: samsung: Add machine driver for odroidx2

[Sylwester Nawrocki]

From: Chen Zhen <zhen1.chen@samsung.com>

This machine driver primary defines the audio path, the supported
data formats and sample frequency.
The codec works in I2S master mode, in order to achieve required
exact audio sampling frequencies without a need to adjust the EPLL
frequency to each sample rate at runtime.

Signed-off-by: Chen Zhen <zhen1.chen@samsung.com>
[s.nawrocki at samsung.com: coding style changes, fixed of_match table name]
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
---
The only bits missing for v3.16 for audio on the Odroid X2/U3 to work
now seem to be only my clock defaults setting patches [1] and the related
dts updates.

[1] http://www.spinics.net/lists/devicetree/msg34718.html

 sound/soc/samsung/Kconfig             |    8 ++
 sound/soc/samsung/Makefile            |    2 +
 sound/soc/samsung/odroidx2_max98090.c |  150 +++++++++++++++++++++++++++++++++
 3 files changed, 160 insertions(+)
 create mode 100644 sound/soc/samsung/odroidx2_max98090.c

diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig
index f2e2891..aa5ce7c 100644
--- a/sound/soc/samsung/Kconfig
+++ b/sound/soc/samsung/Kconfig
@@ -231,3 +231,11 @@ config SND_SOC_LITTLEMILL
 	select SND_SAMSUNG_I2S
 	select MFD_WM8994
 	select SND_SOC_WM8994
+
+config SND_SOC_ODROIDX2
+	tristate "Audio support for Odroid-X2 and Odroid-U3"
+	depends on SND_SOC_SAMSUNG
+	select SND_SOC_MAX98090
+	select SND_SAMSUNG_I2S
+	help
+	  Say Y here to enable audio support for the Odroid-X2/U3.
diff --git a/sound/soc/samsung/Makefile b/sound/soc/samsung/Makefile
index 86715d8..db89489 100644
--- a/sound/soc/samsung/Makefile
+++ b/sound/soc/samsung/Makefile
@@ -45,6 +45,7 @@ snd-soc-tobermory-objs := tobermory.o
 snd-soc-lowland-objs := lowland.o
 snd-soc-littlemill-objs := littlemill.o
 snd-soc-bells-objs := bells.o
+snd-soc-odroidx2-max98090-objs := odroidx2_max98090.o

 obj-$(CONFIG_SND_SOC_SAMSUNG_JIVE_WM8750) += snd-soc-jive-wm8750.o
 obj-$(CONFIG_SND_SOC_SAMSUNG_NEO1973_WM8753) += snd-soc-neo1973-wm8753.o
@@ -69,3 +70,4 @@ obj-$(CONFIG_SND_SOC_TOBERMORY) += snd-soc-tobermory.o
 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_ODROIDX2) += snd-soc-odroidx2-max98090.o
diff --git a/sound/soc/samsung/odroidx2_max98090.c b/sound/soc/samsung/odroidx2_max98090.c
new file mode 100644
index 0000000..c3065a9
--- /dev/null
+++ b/sound/soc/samsung/odroidx2_max98090.c
@@ -0,0 +1,150 @@
+/*
+ * Copyright (C) 2014 Samsung Electronics Co., Ltd.
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/of.h>
+#include <linux/module.h>
+#include <sound/soc.h>
+#include <sound/pcm_params.h>
+#include "i2s.h"
+#include "i2s-regs.h"
+
+/* The I2S CDCLK output clock frequency to the MAX98090 codec. */
+#define MAX98090_MCLK_FREQ 19200000
+
+static int odroidx2_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;
+	struct snd_soc_dai *codec_dai = rtd->codec_dai;
+	int ret;
+
+	ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S
+					| SND_SOC_DAIFMT_NB_NF
+					| SND_SOC_DAIFMT_CBM_CFM);
+	if (ret < 0)
+		return ret;
+
+	ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S
+					| SND_SOC_DAIFMT_NB_NF
+					| SND_SOC_DAIFMT_CBM_CFM);
+	if (ret < 0)
+		return ret;
+
+	ret = snd_soc_dai_set_sysclk(codec_dai, 3, MAX98090_MCLK_FREQ,
+				     SND_SOC_CLOCK_IN);
+	if (ret < 0) {
+		dev_err(codec_dai->dev,
+			"Unable to switch to FLL1: %d\n", ret);
+		return ret;
+	}
+
+	ret = snd_soc_dai_set_sysclk(cpu_dai, SAMSUNG_I2S_OPCLK,
+					0, MOD_OPCLK_PCLK);
+	if (ret < 0) {
+		dev_err(cpu_dai->dev,
+			"Unable to set i2s opclk: 0x%x\n", ret);
+		return ret;
+	}
+
+	/* Set the cpu DAI configuration in order to use CDCLK */
+	ret = snd_soc_dai_set_sysclk(cpu_dai, SAMSUNG_I2S_CDCLK,
+					0, SND_SOC_CLOCK_OUT);
+	if (ret < 0)
+		return ret;
+
+	dev_dbg(codec_dai->dev,
+		"HiFi DAI %s params: channel %d, rate %d as I2S slave\n",
+		((substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ?
+		 "playback" : "capture"),  params_channels(params),
+		params_rate(params));
+
+	return 0;
+}
+
+static struct snd_soc_ops odroidx2_ops = {
+	.hw_params	= odroidx2_hw_params,
+};
+
+static struct snd_soc_dai_link odroidx2_dai = {
+	.name		= "MAX98090",
+	.stream_name	= "MAX98090 PCM",
+	.codec_dai_name	= "HiFi",
+	.ops		= &odroidx2_ops,
+};
+
+static struct snd_soc_card odroidx2 = {
+	.name		= "odroidx2",
+	.owner		= THIS_MODULE,
+	.dai_link	= &odroidx2_dai,
+	.num_links	= 1,
+};
+
+static int odroidx2_audio_probe(struct platform_device *pdev)
+{
+	struct device_node *np = pdev->dev.of_node;
+	struct snd_soc_card *card = &odroidx2;
+
+	if (!np)
+		return -ENODEV;
+
+	card->dev = &pdev->dev;
+
+	odroidx2_dai.codec_name = NULL;
+	odroidx2_dai.codec_of_node = of_parse_phandle(np,
+						"samsung,audio-codec", 0);
+	if (!odroidx2_dai.codec_of_node) {
+		dev_err(&pdev->dev,
+			"missing or invalid samsung,audio-codec property\n");
+		return -EINVAL;
+	}
+
+	odroidx2_dai.cpu_name = NULL;
+	odroidx2_dai.cpu_of_node = of_parse_phandle(np,
+						"samsung,i2s-controller", 0);
+	if (!odroidx2_dai.cpu_of_node) {
+		dev_err(&pdev->dev,
+			"missing or invalid samsung,i2s-controller property\n");
+		return -EINVAL;
+	}
+
+	odroidx2_dai.platform_of_node = odroidx2_dai.cpu_of_node;
+
+	return snd_soc_register_card(card);
+}
+
+static int odroidx2_audio_remove(struct platform_device *pdev)
+{
+	struct snd_soc_card *card = platform_get_drvdata(pdev);
+
+	snd_soc_unregister_card(card);
+
+	return 0;
+}
+
+static const struct of_device_id odroidx2_audio_of_match[] = {
+	{ .compatible = "samsung,odroidx2-audio" },
+	{ },
+};
+MODULE_DEVICE_TABLE(of, odroidx2_audio_of_match);
+
+static struct platform_driver odroidx2_audio_driver = {
+	.driver = {
+		.name		= "odroidx2-audio",
+		.owner		= THIS_MODULE,
+		.of_match_table	= odroidx2_audio_of_match,
+	},
+	.probe	= odroidx2_audio_probe,
+	.remove	= odroidx2_audio_remove,
+};
+module_platform_driver(odroidx2_audio_driver);
+
+MODULE_AUTHOR("zhen1.chen at samsung.com");
+MODULE_DESCRIPTION("ALSA SoC Odroidx2 Audio Support");
+MODULE_LICENSE("GPL v2");
--
1.7.9.5

Re: [PATCH 1/2] doc: dt bindings: Document Odroid X2/U3 audio subsystem bindings

[Mark Brown]

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

On Thu, May 22, 2014 at 01:55:07PM +0200, Sylwester Nawrocki wrote:

> +	sound {
> +		compatible = "samsung,odroidx2-audio";
> +		samsung,i2s-controller = <&i2s0>;
> +		samsung,audio-codec = <&max98090>;
> +	};

Can this not use simple-card?

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

[PATCH 1/2] doc: dt bindings: Document Odroid X2/U3 audio subsystem bindings

[Mark Brown]

On Thu, May 22, 2014 at 01:55:07PM +0200, Sylwester Nawrocki wrote:

> +	sound {
> +		compatible = "samsung,odroidx2-audio";
> +		samsung,i2s-controller = <&i2s0>;
> +		samsung,audio-codec = <&max98090>;
> +	};

Can this not use simple-card?
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140522/06268119/attachment.sig>

Re: [PATCH 2/2] ASoC: samsung: Add machine driver for odroidx2

[Mark Brown]

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

On Thu, May 22, 2014 at 01:55:08PM +0200, Sylwester Nawrocki wrote:
> From: Chen Zhen <zhen1.chen@samsung.com>
> 
> This machine driver primary defines the audio path, the supported
> data formats and sample frequency.

I guess it can't yet, it would have been good to explain that in the
changelog for the bindings (and include the binding in this patch...).

> +	ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S
> +					| SND_SOC_DAIFMT_NB_NF
> +					| SND_SOC_DAIFMT_CBM_CFM);
> +	if (ret < 0)
> +		return ret;
> +
> +	ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S
> +					| SND_SOC_DAIFMT_NB_NF
> +					| SND_SOC_DAIFMT_CBM_CFM);
> +	if (ret < 0)
> +		return ret;

These are constant, set these in the dai_link.

> +
> +	ret = snd_soc_dai_set_sysclk(codec_dai, 3, MAX98090_MCLK_FREQ,
> +				     SND_SOC_CLOCK_IN);
> +	if (ret < 0) {
> +		dev_err(codec_dai->dev,
> +			"Unable to switch to FLL1: %d\n", ret);
> +		return ret;
> +	}

So's this - also what is 3?  Set it on init.

> +	ret = snd_soc_dai_set_sysclk(cpu_dai, SAMSUNG_I2S_OPCLK,
> +					0, MOD_OPCLK_PCLK);

Similarly for the rest of the function.

> +	return snd_soc_register_card(card);

devm_snd_soc_register_card().

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

[PATCH 2/2] ASoC: samsung: Add machine driver for odroidx2

[Mark Brown]

On Thu, May 22, 2014 at 01:55:08PM +0200, Sylwester Nawrocki wrote:
> From: Chen Zhen <zhen1.chen@samsung.com>
> 
> This machine driver primary defines the audio path, the supported
> data formats and sample frequency.

I guess it can't yet, it would have been good to explain that in the
changelog for the bindings (and include the binding in this patch...).

> +	ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S
> +					| SND_SOC_DAIFMT_NB_NF
> +					| SND_SOC_DAIFMT_CBM_CFM);
> +	if (ret < 0)
> +		return ret;
> +
> +	ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S
> +					| SND_SOC_DAIFMT_NB_NF
> +					| SND_SOC_DAIFMT_CBM_CFM);
> +	if (ret < 0)
> +		return ret;

These are constant, set these in the dai_link.

> +
> +	ret = snd_soc_dai_set_sysclk(codec_dai, 3, MAX98090_MCLK_FREQ,
> +				     SND_SOC_CLOCK_IN);
> +	if (ret < 0) {
> +		dev_err(codec_dai->dev,
> +			"Unable to switch to FLL1: %d\n", ret);
> +		return ret;
> +	}

So's this - also what is 3?  Set it on init.

> +	ret = snd_soc_dai_set_sysclk(cpu_dai, SAMSUNG_I2S_OPCLK,
> +					0, MOD_OPCLK_PCLK);

Similarly for the rest of the function.

> +	return snd_soc_register_card(card);

devm_snd_soc_register_card().
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140522/6fab8e38/attachment.sig>

Re: [PATCH 2/2] ASoC: samsung: Add machine driver for odroidx2

[Sylwester Nawrocki]

On 22/05/14 20:53, Mark Brown wrote:
> On Thu, May 22, 2014 at 01:55:08PM +0200, Sylwester Nawrocki wrote:
>> From: Chen Zhen <zhen1.chen@samsung.com>
>>
>> This machine driver primary defines the audio path, the supported
>> data formats and sample frequency.
> 
> I guess it can't yet, it would have been good to explain that in the
> changelog for the bindings (and include the binding in this patch...).

Thanks for the review, I'm still rather inexperienced in the ASoC stuff,
I've obviously overlooked there is actually no routing handling. I'd rather
add those bits.
As for the DT binding documentation patch, I thought we're supposed to keep
documentation in separate patches, so processes of separating it from the
kernel is easier ?

>> +	ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S
>> +					| SND_SOC_DAIFMT_NB_NF
>> +					| SND_SOC_DAIFMT_CBM_CFM);
>> +	if (ret < 0)
>> +		return ret;
>> +
>> +	ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S
>> +					| SND_SOC_DAIFMT_NB_NF
>> +					| SND_SOC_DAIFMT_CBM_CFM);
>> +	if (ret < 0)
>> +		return ret;
> 
> These are constant, set these in the dai_link.
> 
>> +
>> +	ret = snd_soc_dai_set_sysclk(codec_dai, 3, MAX98090_MCLK_FREQ,
>> +				     SND_SOC_CLOCK_IN);
>> +	if (ret < 0) {
>> +		dev_err(codec_dai->dev,
>> +			"Unable to switch to FLL1: %d\n", ret);
>> +		return ret;
>> +	}
> 
> So's this - also what is 3?  Set it on init.

OK, will move it. I'm not sure why 3, it seems to be ignored by the codec
anyway. Chen, can you confirm the second argument is actually a don't care
value ?

>> +	ret = snd_soc_dai_set_sysclk(cpu_dai, SAMSUNG_I2S_OPCLK,
>> +					0, MOD_OPCLK_PCLK);
> 
> Similarly for the rest of the function.
> 
>> +	return snd_soc_register_card(card);
> 
> devm_snd_soc_register_card().

Thanks for the suggestions, I'll amend that.


--
Regards,
Sylwester

[PATCH 2/2] ASoC: samsung: Add machine driver for odroidx2

[Sylwester Nawrocki]

On 22/05/14 20:53, Mark Brown wrote:
> On Thu, May 22, 2014 at 01:55:08PM +0200, Sylwester Nawrocki wrote:
>> From: Chen Zhen <zhen1.chen@samsung.com>
>>
>> This machine driver primary defines the audio path, the supported
>> data formats and sample frequency.
> 
> I guess it can't yet, it would have been good to explain that in the
> changelog for the bindings (and include the binding in this patch...).

Thanks for the review, I'm still rather inexperienced in the ASoC stuff,
I've obviously overlooked there is actually no routing handling. I'd rather
add those bits.
As for the DT binding documentation patch, I thought we're supposed to keep
documentation in separate patches, so processes of separating it from the
kernel is easier ?

>> +	ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S
>> +					| SND_SOC_DAIFMT_NB_NF
>> +					| SND_SOC_DAIFMT_CBM_CFM);
>> +	if (ret < 0)
>> +		return ret;
>> +
>> +	ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S
>> +					| SND_SOC_DAIFMT_NB_NF
>> +					| SND_SOC_DAIFMT_CBM_CFM);
>> +	if (ret < 0)
>> +		return ret;
> 
> These are constant, set these in the dai_link.
> 
>> +
>> +	ret = snd_soc_dai_set_sysclk(codec_dai, 3, MAX98090_MCLK_FREQ,
>> +				     SND_SOC_CLOCK_IN);
>> +	if (ret < 0) {
>> +		dev_err(codec_dai->dev,
>> +			"Unable to switch to FLL1: %d\n", ret);
>> +		return ret;
>> +	}
> 
> So's this - also what is 3?  Set it on init.

OK, will move it. I'm not sure why 3, it seems to be ignored by the codec
anyway. Chen, can you confirm the second argument is actually a don't care
value ?

>> +	ret = snd_soc_dai_set_sysclk(cpu_dai, SAMSUNG_I2S_OPCLK,
>> +					0, MOD_OPCLK_PCLK);
> 
> Similarly for the rest of the function.
> 
>> +	return snd_soc_register_card(card);
> 
> devm_snd_soc_register_card().

Thanks for the suggestions, I'll amend that.


--
Regards,
Sylwester

Re: [PATCH 1/2] doc: dt bindings: Document Odroid X2/U3 audio subsystem bindings

[Sylwester Nawrocki]

On 22/05/14 20:46, Mark Brown wrote:
> On Thu, May 22, 2014 at 01:55:07PM +0200, Sylwester Nawrocki wrote:
> 
>> +	sound {
>> +		compatible = "samsung,odroidx2-audio";
>> +		samsung,i2s-controller = <&i2s0>;
>> +		samsung,audio-codec = <&max98090>;
>> +	};
> 
> Can this not use simple-card?

I dug into that and it seems it almost could, but there is one
thing I'm not sure how to cover with the simple-card DT bindings
and the related driver.

There are these two calls:

+	ret = snd_soc_dai_set_sysclk(cpu_dai, SAMSUNG_I2S_OPCLK,
+					0, MOD_OPCLK_PCLK);


+	/* Set the cpu DAI configuration in order to use CDCLK */
+	ret = snd_soc_dai_set_sysclk(cpu_dai, SAMSUNG_I2S_CDCLK,
+					0, SND_SOC_CLOCK_OUT);

This changes clocks routing so that the CPU DAI in slave mode generates
master clock for the codec, on the SoC's CDCLK pin. Then this is
a reference clock for the codec's PLL, which is a source of the I2S
interface clocks.

It's done this way to avoid changing at runtime frequency of the EPLL
clock, which may be parent of other clocks than the sound subsystem,
e.g. MMC.

simple-card just calls set_sysclk once for the CPU DAI and CODEC with
the second and last argument set to 0.
I'll try and see again if there is some way to use simple-card.

-- 
Thanks,
Sylwester

[PATCH 1/2] doc: dt bindings: Document Odroid X2/U3 audio subsystem bindings

[Sylwester Nawrocki]

On 22/05/14 20:46, Mark Brown wrote:
> On Thu, May 22, 2014 at 01:55:07PM +0200, Sylwester Nawrocki wrote:
> 
>> +	sound {
>> +		compatible = "samsung,odroidx2-audio";
>> +		samsung,i2s-controller = <&i2s0>;
>> +		samsung,audio-codec = <&max98090>;
>> +	};
> 
> Can this not use simple-card?

I dug into that and it seems it almost could, but there is one
thing I'm not sure how to cover with the simple-card DT bindings
and the related driver.

There are these two calls:

+	ret = snd_soc_dai_set_sysclk(cpu_dai, SAMSUNG_I2S_OPCLK,
+					0, MOD_OPCLK_PCLK);


+	/* Set the cpu DAI configuration in order to use CDCLK */
+	ret = snd_soc_dai_set_sysclk(cpu_dai, SAMSUNG_I2S_CDCLK,
+					0, SND_SOC_CLOCK_OUT);

This changes clocks routing so that the CPU DAI in slave mode generates
master clock for the codec, on the SoC's CDCLK pin. Then this is
a reference clock for the codec's PLL, which is a source of the I2S
interface clocks.

It's done this way to avoid changing at runtime frequency of the EPLL
clock, which may be parent of other clocks than the sound subsystem,
e.g. MMC.

simple-card just calls set_sysclk once for the CPU DAI and CODEC with
the second and last argument set to 0.
I'll try and see again if there is some way to use simple-card.

-- 
Thanks,
Sylwester

Re: [PATCH 2/2] ASoC: samsung: Add machine driver for odroidx2

[Mark Brown]

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

On Fri, May 23, 2014 at 10:44:56AM +0200, Sylwester Nawrocki wrote:
> On 22/05/14 20:53, Mark Brown wrote:

> As for the DT binding documentation patch, I thought we're supposed to keep
> documentation in separate patches, so processes of separating it from the
> kernel is easier ?

I'm not sure what the current theory is - they should definitely be
separate if they're part of a multi-patch series but for a single patch
I don't remember what the current taste is.  If you're sending to the
same recipients anyway splitting isn't going to accomplish much, the
idea was to only send the DT binding to the DT maintainers and list and
not the code.

> >> +	ret = snd_soc_dai_set_sysclk(codec_dai, 3, MAX98090_MCLK_FREQ,
> >> +				     SND_SOC_CLOCK_IN);
> >> +	if (ret < 0) {
> >> +		dev_err(codec_dai->dev,
> >> +			"Unable to switch to FLL1: %d\n", ret);
> >> +		return ret;
> >> +	}

> > So's this - also what is 3?  Set it on init.

> OK, will move it. I'm not sure why 3, it seems to be ignored by the codec
> anyway. Chen, can you confirm the second argument is actually a don't care
> value ?

If it's don't care supply 0 instead.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

[PATCH 2/2] ASoC: samsung: Add machine driver for odroidx2

[Mark Brown]

On Fri, May 23, 2014 at 10:44:56AM +0200, Sylwester Nawrocki wrote:
> On 22/05/14 20:53, Mark Brown wrote:

> As for the DT binding documentation patch, I thought we're supposed to keep
> documentation in separate patches, so processes of separating it from the
> kernel is easier ?

I'm not sure what the current theory is - they should definitely be
separate if they're part of a multi-patch series but for a single patch
I don't remember what the current taste is.  If you're sending to the
same recipients anyway splitting isn't going to accomplish much, the
idea was to only send the DT binding to the DT maintainers and list and
not the code.

> >> +	ret = snd_soc_dai_set_sysclk(codec_dai, 3, MAX98090_MCLK_FREQ,
> >> +				     SND_SOC_CLOCK_IN);
> >> +	if (ret < 0) {
> >> +		dev_err(codec_dai->dev,
> >> +			"Unable to switch to FLL1: %d\n", ret);
> >> +		return ret;
> >> +	}

> > So's this - also what is 3?  Set it on init.

> OK, will move it. I'm not sure why 3, it seems to be ignored by the codec
> anyway. Chen, can you confirm the second argument is actually a don't care
> value ?

If it's don't care supply 0 instead.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140523/35883507/attachment.sig>

Re: [PATCH 2/2] ASoC: samsung: Add machine driver for odroidx2

[Sylwester Nawrocki]

On 22/05/14 20:53, Mark Brown wrote:
>> +	ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S
>> > +					| SND_SOC_DAIFMT_NB_NF
>> > +					| SND_SOC_DAIFMT_CBM_CFM);
>> > +	if (ret < 0)
>> > +		return ret;
>> > +
>> > +	ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S
>> > +					| SND_SOC_DAIFMT_NB_NF
>> > +					| SND_SOC_DAIFMT_CBM_CFM);
>> > +	if (ret < 0)
>> > +		return ret;
>
> These are constant, set these in the dai_link.

set_fmt also sets master/slave mode of the I2S DAI, after I moved
this into the cpu_dai link data structure after suspend/resume cycle
the I2S IP block is not being properly re-configured. Should the
format setting be added in resume_post callback, or is there any
other preferred way ? Similarly the syclk settings are being lost
over suspend/resume cycle and nothing restores them.

--
Thanks,
Sylwester

[PATCH 2/2] ASoC: samsung: Add machine driver for odroidx2

[Sylwester Nawrocki]

On 22/05/14 20:53, Mark Brown wrote:
>> +	ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S
>> > +					| SND_SOC_DAIFMT_NB_NF
>> > +					| SND_SOC_DAIFMT_CBM_CFM);
>> > +	if (ret < 0)
>> > +		return ret;
>> > +
>> > +	ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S
>> > +					| SND_SOC_DAIFMT_NB_NF
>> > +					| SND_SOC_DAIFMT_CBM_CFM);
>> > +	if (ret < 0)
>> > +		return ret;
>
> These are constant, set these in the dai_link.

set_fmt also sets master/slave mode of the I2S DAI, after I moved
this into the cpu_dai link data structure after suspend/resume cycle
the I2S IP block is not being properly re-configured. Should the
format setting be added in resume_post callback, or is there any
other preferred way ? Similarly the syclk settings are being lost
over suspend/resume cycle and nothing restores them.

--
Thanks,
Sylwester

Re: [alsa-devel] [PATCH 2/2] ASoC: samsung: Add machine driver for odroidx2

[Lars-Peter Clausen]

On 07/04/2014 01:04 PM, Sylwester Nawrocki wrote:
> On 22/05/14 20:53, Mark Brown wrote:
>>> +	ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S
>>>> +					| SND_SOC_DAIFMT_NB_NF
>>>> +					| SND_SOC_DAIFMT_CBM_CFM);
>>>> +	if (ret < 0)
>>>> +		return ret;
>>>> +
>>>> +	ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S
>>>> +					| SND_SOC_DAIFMT_NB_NF
>>>> +					| SND_SOC_DAIFMT_CBM_CFM);
>>>> +	if (ret < 0)
>>>> +		return ret;
>>
>> These are constant, set these in the dai_link.
>
> set_fmt also sets master/slave mode of the I2S DAI, after I moved
> this into the cpu_dai link data structure after suspend/resume cycle
> the I2S IP block is not being properly re-configured. Should the
> format setting be added in resume_post callback, or is there any
> other preferred way ? Similarly the syclk settings are being lost
> over suspend/resume cycle and nothing restores them.

The I2S driver should save and restore it's register during suspend/resume.

- Lars

[alsa-devel] [PATCH 2/2] ASoC: samsung: Add machine driver for odroidx2

[Lars-Peter Clausen]

On 07/04/2014 01:04 PM, Sylwester Nawrocki wrote:
> On 22/05/14 20:53, Mark Brown wrote:
>>> +	ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S
>>>> +					| SND_SOC_DAIFMT_NB_NF
>>>> +					| SND_SOC_DAIFMT_CBM_CFM);
>>>> +	if (ret < 0)
>>>> +		return ret;
>>>> +
>>>> +	ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S
>>>> +					| SND_SOC_DAIFMT_NB_NF
>>>> +					| SND_SOC_DAIFMT_CBM_CFM);
>>>> +	if (ret < 0)
>>>> +		return ret;
>>
>> These are constant, set these in the dai_link.
>
> set_fmt also sets master/slave mode of the I2S DAI, after I moved
> this into the cpu_dai link data structure after suspend/resume cycle
> the I2S IP block is not being properly re-configured. Should the
> format setting be added in resume_post callback, or is there any
> other preferred way ? Similarly the syclk settings are being lost
> over suspend/resume cycle and nothing restores them.

The I2S driver should save and restore it's register during suspend/resume.

- Lars

Re: [alsa-devel] [PATCH 2/2] ASoC: samsung: Add machine driver for odroidx2

[Sylwester Nawrocki]

On 04/07/14 13:10, Lars-Peter Clausen wrote:
> On 07/04/2014 01:04 PM, Sylwester Nawrocki wrote:
>> On 22/05/14 20:53, Mark Brown wrote:
>>>> +	ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S
>>>>> +					| SND_SOC_DAIFMT_NB_NF
>>>>> +					| SND_SOC_DAIFMT_CBM_CFM);
>>>>> +	if (ret < 0)
>>>>> +		return ret;
>>>>> +
>>>>> +	ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S
>>>>> +					| SND_SOC_DAIFMT_NB_NF
>>>>> +					| SND_SOC_DAIFMT_CBM_CFM);
>>>>> +	if (ret < 0)
>>>>> +		return ret;
>>>
>>> These are constant, set these in the dai_link.
>>
>> set_fmt also sets master/slave mode of the I2S DAI, after I moved
>> this into the cpu_dai link data structure after suspend/resume cycle
>> the I2S IP block is not being properly re-configured. Should the
>> format setting be added in resume_post callback, or is there any
>> other preferred way ? Similarly the syclk settings are being lost
>> over suspend/resume cycle and nothing restores them.
> 
> The I2S driver should save and restore it's register during suspend/resume.

OK, thanks. I checked the I2S driver does it, but only when dai->active
flags is set [1]. However, during system resume this flag is not set
(in situation where playback or capture wasn't active right before
system suspend). Is the dai->active test wrong in that driver then ?
I'm not sure if it could just be removed.

[1] http://lxr.free-electrons.com/source/sound/soc/samsung/i2s.c#L913

--
Regards,
Sylwester

[alsa-devel] [PATCH 2/2] ASoC: samsung: Add machine driver for odroidx2

[Sylwester Nawrocki]

On 04/07/14 13:10, Lars-Peter Clausen wrote:
> On 07/04/2014 01:04 PM, Sylwester Nawrocki wrote:
>> On 22/05/14 20:53, Mark Brown wrote:
>>>> +	ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S
>>>>> +					| SND_SOC_DAIFMT_NB_NF
>>>>> +					| SND_SOC_DAIFMT_CBM_CFM);
>>>>> +	if (ret < 0)
>>>>> +		return ret;
>>>>> +
>>>>> +	ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S
>>>>> +					| SND_SOC_DAIFMT_NB_NF
>>>>> +					| SND_SOC_DAIFMT_CBM_CFM);
>>>>> +	if (ret < 0)
>>>>> +		return ret;
>>>
>>> These are constant, set these in the dai_link.
>>
>> set_fmt also sets master/slave mode of the I2S DAI, after I moved
>> this into the cpu_dai link data structure after suspend/resume cycle
>> the I2S IP block is not being properly re-configured. Should the
>> format setting be added in resume_post callback, or is there any
>> other preferred way ? Similarly the syclk settings are being lost
>> over suspend/resume cycle and nothing restores them.
> 
> The I2S driver should save and restore it's register during suspend/resume.

OK, thanks. I checked the I2S driver does it, but only when dai->active
flags is set [1]. However, during system resume this flag is not set
(in situation where playback or capture wasn't active right before
system suspend). Is the dai->active test wrong in that driver then ?
I'm not sure if it could just be removed.

[1] http://lxr.free-electrons.com/source/sound/soc/samsung/i2s.c#L913

--
Regards,
Sylwester

Re: [alsa-devel] [PATCH 2/2] ASoC: samsung: Add machine driver for odroidx2

[Lars-Peter Clausen]

On 07/04/2014 01:24 PM, Sylwester Nawrocki wrote:
> On 04/07/14 13:10, Lars-Peter Clausen wrote:
>> On 07/04/2014 01:04 PM, Sylwester Nawrocki wrote:
>>> On 22/05/14 20:53, Mark Brown wrote:
>>>>> +	ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S
>>>>>> +					| SND_SOC_DAIFMT_NB_NF
>>>>>> +					| SND_SOC_DAIFMT_CBM_CFM);
>>>>>> +	if (ret < 0)
>>>>>> +		return ret;
>>>>>> +
>>>>>> +	ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S
>>>>>> +					| SND_SOC_DAIFMT_NB_NF
>>>>>> +					| SND_SOC_DAIFMT_CBM_CFM);
>>>>>> +	if (ret < 0)
>>>>>> +		return ret;
>>>>
>>>> These are constant, set these in the dai_link.
>>>
>>> set_fmt also sets master/slave mode of the I2S DAI, after I moved
>>> this into the cpu_dai link data structure after suspend/resume cycle
>>> the I2S IP block is not being properly re-configured. Should the
>>> format setting be added in resume_post callback, or is there any
>>> other preferred way ? Similarly the syclk settings are being lost
>>> over suspend/resume cycle and nothing restores them.
>>
>> The I2S driver should save and restore it's register during suspend/resume.
>
> OK, thanks. I checked the I2S driver does it, but only when dai->active
> flags is set [1]. However, during system resume this flag is not set
> (in situation where playback or capture wasn't active right before
> system suspend). Is the dai->active test wrong in that driver then ?
> I'm not sure if it could just be removed.

Yes, just remove the check.

- Lars

[alsa-devel] [PATCH 2/2] ASoC: samsung: Add machine driver for odroidx2

[Lars-Peter Clausen]

On 07/04/2014 01:24 PM, Sylwester Nawrocki wrote:
> On 04/07/14 13:10, Lars-Peter Clausen wrote:
>> On 07/04/2014 01:04 PM, Sylwester Nawrocki wrote:
>>> On 22/05/14 20:53, Mark Brown wrote:
>>>>> +	ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S
>>>>>> +					| SND_SOC_DAIFMT_NB_NF
>>>>>> +					| SND_SOC_DAIFMT_CBM_CFM);
>>>>>> +	if (ret < 0)
>>>>>> +		return ret;
>>>>>> +
>>>>>> +	ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S
>>>>>> +					| SND_SOC_DAIFMT_NB_NF
>>>>>> +					| SND_SOC_DAIFMT_CBM_CFM);
>>>>>> +	if (ret < 0)
>>>>>> +		return ret;
>>>>
>>>> These are constant, set these in the dai_link.
>>>
>>> set_fmt also sets master/slave mode of the I2S DAI, after I moved
>>> this into the cpu_dai link data structure after suspend/resume cycle
>>> the I2S IP block is not being properly re-configured. Should the
>>> format setting be added in resume_post callback, or is there any
>>> other preferred way ? Similarly the syclk settings are being lost
>>> over suspend/resume cycle and nothing restores them.
>>
>> The I2S driver should save and restore it's register during suspend/resume.
>
> OK, thanks. I checked the I2S driver does it, but only when dai->active
> flags is set [1]. However, during system resume this flag is not set
> (in situation where playback or capture wasn't active right before
> system suspend). Is the dai->active test wrong in that driver then ?
> I'm not sure if it could just be removed.

Yes, just remove the check.

- Lars

[PATCH 2/2] ASoC: samsung: Add machine driver for odroidx2

[Mark Brown]

On Fri, May 23, 2014 at 02:18:39AM +0000, Zhen Chen wrote:
> <HTML xmlns:o = "urn:schemas-microsoft-com:office:office"><HEAD><TITLE>Samsung Enterprise Portal mySingle</TITLE>
> <META content=IE=5 http-equiv=X-UA-Compatible>
> <META content="text/html; charset=windows-1252" http-equiv=Content-Type>

Please fix your mail configuration to send in plain text, I can't read
this - it's not even got a multipart/alternative plain text bit.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140523/90898491/attachment-0001.sig>