[PATCH V3 0/3] Add audio support on smdk5420

[PATCH V3 0/3] Add audio support on smdk5420

[Padmavathi Venna]

Samsung has different versions of I2S introduced in different
platforms. Each version has some new support added for multichannel,
secondary fifo, s/w reset control, internal mux for rclk src clk and
tdm support. Each newly added change has a quirk. So this patch adds
all the required quirks as driver data and based on compatible string
from dtsi fetches the quirks. This also adds i2s support on exynos5420.

Changes since V2:
        - Seperated out driver side changes and dts changes in two
          patch sets.
        - Replaced samsung,s3c6410-i2s-v4 with samsung,s3c6410-i2s-multi
          for more clarity as suggested by Tomasz Figa.

Changes since V1:
        - Pass quirks as driver data and fetch the quirks based on
          compatible string from dtsi file as suggested by
          Tomasz Figa and Mark Brown
        - Make the I2S driver more flexible with respect to register
          access as suggested by Tomasz Figa and Mark Brown
        - Add 5420 support in the driver.
        - Modify the dtsi files with the corresponding compatible
          strings and removed the i2s quirks from 5250 dtsi file.
        - Updated the i2s Documentation with relevent changes and
          i2s versioning info.
        - Add i2s nodes on exynos5420.dtsi
        - Enable sound support on smdk5420

This patch set is made based on Mark Brown for-next branch on sound.git.

Padmavathi Venna (3):
  platform: Increase platform name size
  ASoC: Samsung: I2S: Add quirks as driver data in I2S
  ASoC: Samsung: I2S: Modify the I2S driver to support I2S on
    Exynos5420

 .../devicetree/bindings/sound/samsung-i2s.txt      |   25 ++--
 include/linux/mod_devicetable.h                    |    2 +-
 include/linux/platform_data/asoc-s3c.h             |    1 +
 sound/soc/samsung/i2s-regs.h                       |   15 ++
 sound/soc/samsung/i2s.c                            |  163 +++++++++++++++-----
 5 files changed, 158 insertions(+), 48 deletions(-)

-- 
1.7.4.4

[PATCH V3 1/3] platform: Increase platform name size

[Padmavathi Venna]

This patch increases the platform name size from 20 to 30 as one of
i2s platform_device name in this patchset crosses the limit.

Signed-off-by: Padmavathi Venna <padma.v@samsung.com>
---
 include/linux/mod_devicetable.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
index 45e9214..3a2c079 100644
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -479,7 +479,7 @@ struct dmi_system_id {
 #define DMI_MATCH(a, b)	{ .slot = a, .substr = b }
 #define DMI_EXACT_MATCH(a, b)	{ .slot = a, .substr = b, .exact_match = 1 }
 
-#define PLATFORM_NAME_SIZE	20
+#define PLATFORM_NAME_SIZE	30
 #define PLATFORM_MODULE_PREFIX	"platform:"
 
 struct platform_device_id {
-- 
1.7.4.4

[PATCH V3 1/3] platform: Increase platform name size

[Mark Brown]

On Wed, Aug 07, 2013 at 02:15:20PM +0530, Padmavathi Venna wrote:
> This patch increases the platform name size from 20 to 30 as one of
> i2s platform_device name in this patchset crosses the limit.

What is the name concerned?
-------------- 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/20130807/69ea3eb1/attachment.sig>

[PATCH V3 2/3] ASoC: Samsung: I2S: Add quirks as driver data in I2S

[Padmavathi Venna]

Samsung has different versions of I2S introduced in different
platforms. Each version has some new support added for multichannel,
secondary fifo, s/w reset control and internal mux for rclk src clk.
Each newly added change has a quirk. So this patch adds all the
required quirks as driver data and based on compatible string from
dtsi fetches the quirks.

Signed-off-by: Padmavathi Venna <padma.v@samsung.com>
---
 .../devicetree/bindings/sound/samsung-i2s.txt      |   21 +++---
 sound/soc/samsung/i2s.c                            |   82 +++++++++++++-------
 2 files changed, 64 insertions(+), 39 deletions(-)

diff --git a/Documentation/devicetree/bindings/sound/samsung-i2s.txt b/Documentation/devicetree/bindings/sound/samsung-i2s.txt
index 025e66b..b3f6443 100644
--- a/Documentation/devicetree/bindings/sound/samsung-i2s.txt
+++ b/Documentation/devicetree/bindings/sound/samsung-i2s.txt
@@ -2,7 +2,16 @@
 
 Required SoC Specific Properties:
 
-- compatible : "samsung,i2s-v5"
+- compatible : should be one of the following.
+   - samsung,s3c6410-i2s: for 8/16/24bit stereo I2S. Previous versions
+     has only 8/16bit support.
+   - samsung,s3c6410-i2sv4: for 8/16/24bit multichannel(5.1 channel) I2S.
+     Introduced in s3c6410. This also applicable for s5p64x0 platforms.
+   - samsung,s5pc100-i2s: for 8/16/24bit multichannel(5.1 channel) I2S
+     with secondary fifo and s/w reset control.
+   - samsung,s5pv210-i2s: for 8/16/24bit multichannel(5.1) I2S with
+     secondary fifo, s/w reset control and internal mux for root clk src.
+
 - reg: physical base address of the controller and length of memory mapped
   region.
 - dmas: list of DMA controller phandle and DMA request line ordered pairs.
@@ -21,13 +30,6 @@ Required SoC Specific Properties:
 
 Optional SoC Specific Properties:
 
-- samsung,supports-6ch: If the I2S Primary sound source has 5.1 Channel
-  support, this flag is enabled.
-- samsung,supports-rstclr: This flag should be set if I2S software reset bit
-  control is required. When this flag is set I2S software reset bit will be
-  enabled or disabled based on need.
-- samsung,supports-secdai:If I2S block has a secondary FIFO and internal DMA,
-  then this flag is enabled.
 - samsung,idma-addr: Internal DMA register base address of the audio
   sub system(used in secondary sound source).
 - pinctrl-0: Should specify pin control groups used for this controller.
@@ -46,9 +48,6 @@ i2s0: i2s at 03830000 {
 		<&clock_audss EXYNOS_I2S_BUS>,
 		<&clock_audss EXYNOS_SCLK_I2S>;
 	clock-names = "iis", "i2s_opclk0", "i2s_opclk1";
-	samsung,supports-6ch;
-	samsung,supports-rstclr;
-	samsung,supports-secdai;
 	samsung,idma-addr = <0x03000000>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&i2s0_bus>;
diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c
index 47e08dd..8a5504c 100644
--- a/sound/soc/samsung/i2s.c
+++ b/sound/soc/samsung/i2s.c
@@ -40,6 +40,7 @@ enum samsung_dai_type {
 
 struct samsung_i2s_dai_data {
 	int dai_type;
+	u32 quirks;
 };
 
 struct i2s_dai {
@@ -1032,18 +1033,18 @@ static struct i2s_dai *i2s_alloc_dai(struct platform_device *pdev, bool sec)
 
 static const struct of_device_id exynos_i2s_match[];
 
-static inline int samsung_i2s_get_driver_data(struct platform_device *pdev)
+static inline struct samsung_i2s_dai_data *samsung_i2s_get_driver_data(
+						struct platform_device *pdev)
 {
 #ifdef CONFIG_OF
-	struct samsung_i2s_dai_data *data;
 	if (pdev->dev.of_node) {
 		const struct of_device_id *match;
 		match = of_match_node(exynos_i2s_match, pdev->dev.of_node);
-		data = (struct samsung_i2s_dai_data *) match->data;
-		return data->dai_type;
+		return (struct samsung_i2s_dai_data *) match->data;
 	} else
 #endif
-		return platform_get_device_id(pdev)->driver_data;
+		return (struct samsung_i2s_dai_data *)
+				platform_get_device_id(pdev)->driver_data;
 }
 
 #ifdef CONFIG_PM_RUNTIME
@@ -1074,13 +1075,13 @@ static int samsung_i2s_probe(struct platform_device *pdev)
 	struct resource *res;
 	u32 regs_base, quirks = 0, idma_addr = 0;
 	struct device_node *np = pdev->dev.of_node;
-	enum samsung_dai_type samsung_dai_type;
+	struct samsung_i2s_dai_data *i2s_dai_data;
 	int ret = 0;
 
 	/* Call during Seconday interface registration */
-	samsung_dai_type = samsung_i2s_get_driver_data(pdev);
+	i2s_dai_data = samsung_i2s_get_driver_data(pdev);
 
-	if (samsung_dai_type == TYPE_SEC) {
+	if (i2s_dai_data->dai_type == TYPE_SEC) {
 		sec_dai = dev_get_drvdata(&pdev->dev);
 		if (!sec_dai) {
 			dev_err(&pdev->dev, "Unable to get drvdata\n");
@@ -1129,15 +1130,7 @@ static int samsung_i2s_probe(struct platform_device *pdev)
 			idma_addr = i2s_cfg->idma_addr;
 		}
 	} else {
-		if (of_find_property(np, "samsung,supports-6ch", NULL))
-			quirks |= QUIRK_PRI_6CHAN;
-
-		if (of_find_property(np, "samsung,supports-secdai", NULL))
-			quirks |= QUIRK_SEC_DAI;
-
-		if (of_find_property(np, "samsung,supports-rstclr", NULL))
-			quirks |= QUIRK_NEED_RSTCLR;
-
+		quirks = i2s_dai_data->quirks;
 		if (of_property_read_u32(np, "samsung,idma-addr",
 					 &idma_addr)) {
 			if (quirks & QUIRK_SEC_DAI) {
@@ -1250,27 +1243,60 @@ static int samsung_i2s_remove(struct platform_device *pdev)
 	return 0;
 }
 
+static struct samsung_i2s_dai_data i2sv3_dai_type = {
+	.dai_type = TYPE_PRI,
+	.quirks = QUIRK_NO_MUXPSR,
+};
+
+static struct samsung_i2s_dai_data i2sv4_dai_type = {
+	.dai_type = TYPE_PRI,
+	.quirks = QUIRK_PRI_6CHAN | QUIRK_NO_MUXPSR,
+};
+
+static struct samsung_i2s_dai_data i2sv5_c100_dai_type = {
+	.dai_type = TYPE_PRI,
+	.quirks = QUIRK_PRI_6CHAN | QUIRK_NO_MUXPSR | QUIRK_SEC_DAI |
+			QUIRK_NEED_RSTCLR,
+};
+
+static struct samsung_i2s_dai_data i2sv5_dai_type = {
+	.dai_type = TYPE_PRI,
+	.quirks = QUIRK_PRI_6CHAN | QUIRK_SEC_DAI | QUIRK_NEED_RSTCLR,
+};
+
+static struct samsung_i2s_dai_data samsung_dai_type_sec = {
+	.dai_type = TYPE_SEC,
+};
+
 static struct platform_device_id samsung_i2s_driver_ids[] = {
 	{
-		.name           = "samsung-i2s",
-		.driver_data	= TYPE_PRI,
+		.name		= "samsung,s3c6410-i2s",
+		.driver_data	= (kernel_ulong_t)&i2sv3_dai_type,
+	}, {
+		.name		= "samsung,s3c6410-i2s-multi",
+		.driver_data	= (kernel_ulong_t)&i2sv4_dai_type,
+	}, {
+		.name		= "samsung,s5pc100-i2s",
+		.driver_data	= (kernel_ulong_t)&i2sv5_c100_dai_type,
 	}, {
-		.name           = "samsung-i2s-sec",
-		.driver_data	= TYPE_SEC,
+		.name		= "samsung,s5pv210-i2s",
+		.driver_data	= (kernel_ulong_t)&i2sv5_dai_type,
+	}, {
+		.name		= "samsung-i2s-sec",
+		.driver_data	= (kernel_ulong_t)&samsung_dai_type_sec,
 	},
 	{},
 };
 MODULE_DEVICE_TABLE(platform, samsung_i2s_driver_ids);
 
 #ifdef CONFIG_OF
-static struct samsung_i2s_dai_data samsung_i2s_dai_data_array[] = {
-	[TYPE_PRI] = { TYPE_PRI },
-	[TYPE_SEC] = { TYPE_SEC },
-};
-
 static const struct of_device_id exynos_i2s_match[] = {
-	{ .compatible = "samsung,i2s-v5",
-	  .data = &samsung_i2s_dai_data_array[TYPE_PRI],
+	{
+		.compatible = "samsung,s3c6410-i2s",
+		.data = &i2sv3_dai_type,
+	}, {
+		.compatible = "samsung,s5pv210-i2s",
+		.data = &i2sv5_dai_type,
 	},
 	{},
 };
-- 
1.7.4.4

[PATCH V3 2/3] ASoC: Samsung: I2S: Add quirks as driver data in I2S

[Tomasz Figa]

Hi Padmavathi,

[Ccing DT maintainers with a little comment about contents of this patch 
for them:

This is a rework of Samsung i2s bindings to make them more reasonable than 
they are at the moment. I know this was supposed to be stable, fixed, ABI, 
etc., but as we discussed a lot the whole topic of DT bindings, we need to 
sanitize existing bindings and this patch is a part of this work.]

On Wednesday 07 of August 2013 14:15:21 Padmavathi Venna wrote:
> Samsung has different versions of I2S introduced in different
> platforms. Each version has some new support added for multichannel,
> secondary fifo, s/w reset control and internal mux for rclk src clk.
> Each newly added change has a quirk. So this patch adds all the
> required quirks as driver data and based on compatible string from
> dtsi fetches the quirks.
> 
> Signed-off-by: Padmavathi Venna <padma.v@samsung.com>
> ---
>  .../devicetree/bindings/sound/samsung-i2s.txt      |   21 +++---
>  sound/soc/samsung/i2s.c                            |   82
> +++++++++++++------- 2 files changed, 64 insertions(+), 39 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/sound/samsung-i2s.txt
> b/Documentation/devicetree/bindings/sound/samsung-i2s.txt index
> 025e66b..b3f6443 100644
> --- a/Documentation/devicetree/bindings/sound/samsung-i2s.txt
> +++ b/Documentation/devicetree/bindings/sound/samsung-i2s.txt
> @@ -2,7 +2,16 @@
> 
>  Required SoC Specific Properties:
> 
> -- compatible : "samsung,i2s-v5"
> +- compatible : should be one of the following.
> +   - samsung,s3c6410-i2s: for 8/16/24bit stereo I2S. Previous versions
> +     has only 8/16bit support.

The comment about previous versions seems a bit enigmatic.

If there is another variant supported by this driver that supports only 
8/16bit audio data, then it should have a separate compatible value.

> +   - samsung,s3c6410-i2sv4: for 8/16/24bit multichannel(5.1 channel)
> I2S. +     Introduced in s3c6410. This also applicable for s5p64x0
> platforms. +   - samsung,s5pc100-i2s: for 8/16/24bit multichannel(5.1
> channel) I2S +     with secondary fifo and s/w reset control.
> +   - samsung,s5pv210-i2s: for 8/16/24bit multichannel(5.1) I2S with
> +     secondary fifo, s/w reset control and internal mux for root clk
> src. +
>  - reg: physical base address of the controller and length of memory
> mapped region.
>  - dmas: list of DMA controller phandle and DMA request line ordered
> pairs. @@ -21,13 +30,6 @@ Required SoC Specific Properties:
> 
>  Optional SoC Specific Properties:
> 
> -- samsung,supports-6ch: If the I2S Primary sound source has 5.1 Channel
> -  support, this flag is enabled.
> -- samsung,supports-rstclr: This flag should be set if I2S software reset
> bit -  control is required. When this flag is set I2S software reset bit
> will be -  enabled or disabled based on need.
> -- samsung,supports-secdai:If I2S block has a secondary FIFO and internal
> DMA, -  then this flag is enabled.
>  - samsung,idma-addr: Internal DMA register base address of the audio
>    sub system(used in secondary sound source).
>  - pinctrl-0: Should specify pin control groups used for this controller.
> @@ -46,9 +48,6 @@ i2s0: i2s at 03830000 {

The example has also a compatible value set to "samsung,i2s-v5". I don't 
think this is compliant to the new bindings.

>  		<&clock_audss EXYNOS_I2S_BUS>,
>  		<&clock_audss EXYNOS_SCLK_I2S>;
>  	clock-names = "iis", "i2s_opclk0", "i2s_opclk1";
> -	samsung,supports-6ch;
> -	samsung,supports-rstclr;
> -	samsung,supports-secdai;
>  	samsung,idma-addr = <0x03000000>;
>  	pinctrl-names = "default";
>  	pinctrl-0 = <&i2s0_bus>;
> diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c
> index 47e08dd..8a5504c 100644
> --- a/sound/soc/samsung/i2s.c
> +++ b/sound/soc/samsung/i2s.c
> @@ -40,6 +40,7 @@ enum samsung_dai_type {
> 
>  struct samsung_i2s_dai_data {

const struct samsung_i2s_dai_data

>  	int dai_type;
> +	u32 quirks;
>  };
> 
>  struct i2s_dai {
> @@ -1032,18 +1033,18 @@ static struct i2s_dai *i2s_alloc_dai(struct
> platform_device *pdev, bool sec)
> 
>  static const struct of_device_id exynos_i2s_match[];
> 
> -static inline int samsung_i2s_get_driver_data(struct platform_device
> *pdev) +static inline struct samsung_i2s_dai_data
> *samsung_i2s_get_driver_data( +						struct platform_device 
*pdev)
>  {
>  #ifdef CONFIG_OF
> -	struct samsung_i2s_dai_data *data;
>  	if (pdev->dev.of_node) {
>  		const struct of_device_id *match;
>  		match = of_match_node(exynos_i2s_match, pdev->dev.of_node);
> -		data = (struct samsung_i2s_dai_data *) match->data;
> -		return data->dai_type;
> +		return (struct samsung_i2s_dai_data *) match->data;

If you make the dai_data const this cast will be no longer necessary.

>  	} else
>  #endif
> -		return platform_get_device_id(pdev)->driver_data;
> +		return (struct samsung_i2s_dai_data *)
> +				platform_get_device_id(pdev)->driver_data;
>  }
> 
>  #ifdef CONFIG_PM_RUNTIME
> @@ -1074,13 +1075,13 @@ static int samsung_i2s_probe(struct
> platform_device *pdev) struct resource *res;
>  	u32 regs_base, quirks = 0, idma_addr = 0;
>  	struct device_node *np = pdev->dev.of_node;
> -	enum samsung_dai_type samsung_dai_type;
> +	struct samsung_i2s_dai_data *i2s_dai_data;

const

>  	int ret = 0;
> 
>  	/* Call during Seconday interface registration */
> -	samsung_dai_type = samsung_i2s_get_driver_data(pdev);
> +	i2s_dai_data = samsung_i2s_get_driver_data(pdev);
> 
> -	if (samsung_dai_type == TYPE_SEC) {
> +	if (i2s_dai_data->dai_type == TYPE_SEC) {
>  		sec_dai = dev_get_drvdata(&pdev->dev);
>  		if (!sec_dai) {
>  			dev_err(&pdev->dev, "Unable to get drvdata\n");
> @@ -1129,15 +1130,7 @@ static int samsung_i2s_probe(struct
> platform_device *pdev) idma_addr = i2s_cfg->idma_addr;
>  		}
>  	} else {
> -		if (of_find_property(np, "samsung,supports-6ch", NULL))
> -			quirks |= QUIRK_PRI_6CHAN;
> -
> -		if (of_find_property(np, "samsung,supports-secdai", NULL))
> -			quirks |= QUIRK_SEC_DAI;
> -
> -		if (of_find_property(np, "samsung,supports-rstclr", NULL))
> -			quirks |= QUIRK_NEED_RSTCLR;
> -
> +		quirks = i2s_dai_data->quirks;
>  		if (of_property_read_u32(np, "samsung,idma-addr",
>  					 &idma_addr)) {
>  			if (quirks & QUIRK_SEC_DAI) {
> @@ -1250,27 +1243,60 @@ static int samsung_i2s_remove(struct
> platform_device *pdev) return 0;
>  }
> 
> +static struct samsung_i2s_dai_data i2sv3_dai_type = {

const

> +	.dai_type = TYPE_PRI,
> +	.quirks = QUIRK_NO_MUXPSR,
> +};
> +
> +static struct samsung_i2s_dai_data i2sv4_dai_type = {

ditto

> +	.dai_type = TYPE_PRI,
> +	.quirks = QUIRK_PRI_6CHAN | QUIRK_NO_MUXPSR,
> +};
> +
> +static struct samsung_i2s_dai_data i2sv5_c100_dai_type = {

ditto

> +	.dai_type = TYPE_PRI,
> +	.quirks = QUIRK_PRI_6CHAN | QUIRK_NO_MUXPSR | QUIRK_SEC_DAI |
> +			QUIRK_NEED_RSTCLR,
> +};
> +
> +static struct samsung_i2s_dai_data i2sv5_dai_type = {

ditto

> +	.dai_type = TYPE_PRI,
> +	.quirks = QUIRK_PRI_6CHAN | QUIRK_SEC_DAI | QUIRK_NEED_RSTCLR,
> +};
> +
> +static struct samsung_i2s_dai_data samsung_dai_type_sec = {

ditto

> +	.dai_type = TYPE_SEC,
> +};
> +
>  static struct platform_device_id samsung_i2s_driver_ids[] = {
>  	{
> -		.name           = "samsung-i2s",
> -		.driver_data	= TYPE_PRI,
> +		.name		= "samsung,s3c6410-i2s",
> +		.driver_data	= (kernel_ulong_t)&i2sv3_dai_type,
> +	}, {
> +		.name		= "samsung,s3c6410-i2s-multi",
> +		.driver_data	= (kernel_ulong_t)&i2sv4_dai_type,
> +	}, {
> +		.name		= "samsung,s5pc100-i2s",
> +		.driver_data	= (kernel_ulong_t)&i2sv5_c100_dai_type,
>  	}, {
> -		.name           = "samsung-i2s-sec",
> -		.driver_data	= TYPE_SEC,
> +		.name		= "samsung,s5pv210-i2s",
> +		.driver_data	= (kernel_ulong_t)&i2sv5_dai_type,
> +	}, {
> +		.name		= "samsung-i2s-sec",
> +		.driver_data	= (kernel_ulong_t)&samsung_dai_type_sec,
>  	},
>  	{},
>  };
>  MODULE_DEVICE_TABLE(platform, samsung_i2s_driver_ids);
> 
>  #ifdef CONFIG_OF
> -static struct samsung_i2s_dai_data samsung_i2s_dai_data_array[] = {
> -	[TYPE_PRI] = { TYPE_PRI },
> -	[TYPE_SEC] = { TYPE_SEC },
> -};
> -
>  static const struct of_device_id exynos_i2s_match[] = {
> -	{ .compatible = "samsung,i2s-v5",
> -	  .data = &samsung_i2s_dai_data_array[TYPE_PRI],
> +	{
> +		.compatible = "samsung,s3c6410-i2s",
> +		.data = &i2sv3_dai_type,
> +	}, {
> +		.compatible = "samsung,s5pv210-i2s",
> +		.data = &i2sv5_dai_type,

Hmm, documentation mentions 4 compatible values (and possibly one is 
missing there), but this patch adds only 2 of them. I don't think this is 
correct, especially that the driver already supports handling all of them.

Best regards,
Tomasz

[PATCH V3 2/3] ASoC: Samsung: I2S: Add quirks as driver data in I2S

[Padma Venkat]

Hi Tomasz,

On Wed, Aug 7, 2013 at 4:32 PM, Tomasz Figa <t.figa@samsung.com> wrote:
> Hi Padmavathi,
>
> [Ccing DT maintainers with a little comment about contents of this patch
> for them:
>
> This is a rework of Samsung i2s bindings to make them more reasonable than
> they are at the moment. I know this was supposed to be stable, fixed, ABI,
> etc., but as we discussed a lot the whole topic of DT bindings, we need to
> sanitize existing bindings and this patch is a part of this work.]
>

[snip]

>>
>>  Required SoC Specific Properties:
>>
>> -- compatible : "samsung,i2s-v5"
>> +- compatible : should be one of the following.
>> +   - samsung,s3c6410-i2s: for 8/16/24bit stereo I2S. Previous versions
>> +     has only 8/16bit support.
>
> The comment about previous versions seems a bit enigmatic.
>
> If there is another variant supported by this driver that supports only
> 8/16bit audio data, then it should have a separate compatible value.

For previous i2s controllers there are two other i2s drivers
available. I think I can delete this comment here.

>
>> +   - samsung,s3c6410-i2sv4: for 8/16/24bit multichannel(5.1 channel)
>> I2S. +     Introduced in s3c6410. This also applicable for s5p64x0
>> platforms. +   - samsung,s5pc100-i2s: for 8/16/24bit multichannel(5.1
>> channel) I2S +     with secondary fifo and s/w reset control.
>> +   - samsung,s5pv210-i2s: for 8/16/24bit multichannel(5.1) I2S with
>> +     secondary fifo, s/w reset control and internal mux for root clk
>> src. +
>>  - reg: physical base address of the controller and length of memory
>> mapped region.
>>  - dmas: list of DMA controller phandle and DMA request line ordered
>> pairs. @@ -21,13 +30,6 @@ Required SoC Specific Properties:
>>
>>  Optional SoC Specific Properties:
>>
>> -- samsung,supports-6ch: If the I2S Primary sound source has 5.1 Channel
>> -  support, this flag is enabled.
>> -- samsung,supports-rstclr: This flag should be set if I2S software reset
>> bit -  control is required. When this flag is set I2S software reset bit
>> will be -  enabled or disabled based on need.
>> -- samsung,supports-secdai:If I2S block has a secondary FIFO and internal
>> DMA, -  then this flag is enabled.
>>  - samsung,idma-addr: Internal DMA register base address of the audio
>>    sub system(used in secondary sound source).
>>  - pinctrl-0: Should specify pin control groups used for this controller.
>> @@ -46,9 +48,6 @@ i2s0: i2s at 03830000 {
>
> The example has also a compatible value set to "samsung,i2s-v5". I don't
> think this is compliant to the new bindings.

Yes. It's my mistake. Will change this to new one.

>
>>               <&clock_audss EXYNOS_I2S_BUS>,
>>               <&clock_audss EXYNOS_SCLK_I2S>;
>>       clock-names = "iis", "i2s_opclk0", "i2s_opclk1";
>> -     samsung,supports-6ch;
>> -     samsung,supports-rstclr;
>> -     samsung,supports-secdai;
>>       samsung,idma-addr = <0x03000000>;
>>       pinctrl-names = "default";
>>       pinctrl-0 = <&i2s0_bus>;
>> diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c
>> index 47e08dd..8a5504c 100644
>> --- a/sound/soc/samsung/i2s.c
>> +++ b/sound/soc/samsung/i2s.c
>> @@ -40,6 +40,7 @@ enum samsung_dai_type {
>>
>>  struct samsung_i2s_dai_data {
>
> const struct samsung_i2s_dai_data

OK.

>
>>       int dai_type;
>> +     u32 quirks;
>>  };
>>
>>  struct i2s_dai {
>> @@ -1032,18 +1033,18 @@ static struct i2s_dai *i2s_alloc_dai(struct
>> platform_device *pdev, bool sec)
>>
>>  static const struct of_device_id exynos_i2s_match[];
>>
>> -static inline int samsung_i2s_get_driver_data(struct platform_device
>> *pdev) +static inline struct samsung_i2s_dai_data
>> *samsung_i2s_get_driver_data( +                                               struct platform_device
> *pdev)
>>  {
>>  #ifdef CONFIG_OF
>> -     struct samsung_i2s_dai_data *data;
>>       if (pdev->dev.of_node) {
>>               const struct of_device_id *match;
>>               match = of_match_node(exynos_i2s_match, pdev->dev.of_node);
>> -             data = (struct samsung_i2s_dai_data *) match->data;
>> -             return data->dai_type;
>> +             return (struct samsung_i2s_dai_data *) match->data;
>
> If you make the dai_data const this cast will be no longer necessary.
>
>>       } else
>>  #endif
>> -             return platform_get_device_id(pdev)->driver_data;
>> +             return (struct samsung_i2s_dai_data *)
>> +                             platform_get_device_id(pdev)->driver_data;
>>  }
>>
>>  #ifdef CONFIG_PM_RUNTIME
>> @@ -1074,13 +1075,13 @@ static int samsung_i2s_probe(struct
>> platform_device *pdev) struct resource *res;
>>       u32 regs_base, quirks = 0, idma_addr = 0;
>>       struct device_node *np = pdev->dev.of_node;
>> -     enum samsung_dai_type samsung_dai_type;
>> +     struct samsung_i2s_dai_data *i2s_dai_data;
>
> const

OK.

>
>>       int ret = 0;
>>
>>       /* Call during Seconday interface registration */
>> -     samsung_dai_type = samsung_i2s_get_driver_data(pdev);
>> +     i2s_dai_data = samsung_i2s_get_driver_data(pdev);
>>
>> -     if (samsung_dai_type == TYPE_SEC) {
>> +     if (i2s_dai_data->dai_type == TYPE_SEC) {
>>               sec_dai = dev_get_drvdata(&pdev->dev);
>>               if (!sec_dai) {
>>                       dev_err(&pdev->dev, "Unable to get drvdata\n");
>> @@ -1129,15 +1130,7 @@ static int samsung_i2s_probe(struct
>> platform_device *pdev) idma_addr = i2s_cfg->idma_addr;
>>               }
>>       } else {
>> -             if (of_find_property(np, "samsung,supports-6ch", NULL))
>> -                     quirks |= QUIRK_PRI_6CHAN;
>> -
>> -             if (of_find_property(np, "samsung,supports-secdai", NULL))
>> -                     quirks |= QUIRK_SEC_DAI;
>> -
>> -             if (of_find_property(np, "samsung,supports-rstclr", NULL))
>> -                     quirks |= QUIRK_NEED_RSTCLR;
>> -
>> +             quirks = i2s_dai_data->quirks;
>>               if (of_property_read_u32(np, "samsung,idma-addr",
>>                                        &idma_addr)) {
>>                       if (quirks & QUIRK_SEC_DAI) {
>> @@ -1250,27 +1243,60 @@ static int samsung_i2s_remove(struct
>> platform_device *pdev) return 0;
>>  }
>>
>> +static struct samsung_i2s_dai_data i2sv3_dai_type = {
>
> const

OK.

>
>> +     .dai_type = TYPE_PRI,
>> +     .quirks = QUIRK_NO_MUXPSR,
>> +};
>> +
>> +static struct samsung_i2s_dai_data i2sv4_dai_type = {
>
> ditto
>
>> +     .dai_type = TYPE_PRI,
>> +     .quirks = QUIRK_PRI_6CHAN | QUIRK_NO_MUXPSR,
>> +};
>> +
>> +static struct samsung_i2s_dai_data i2sv5_c100_dai_type = {
>
> ditto
>
>> +     .dai_type = TYPE_PRI,
>> +     .quirks = QUIRK_PRI_6CHAN | QUIRK_NO_MUXPSR | QUIRK_SEC_DAI |
>> +                     QUIRK_NEED_RSTCLR,
>> +};
>> +
>> +static struct samsung_i2s_dai_data i2sv5_dai_type = {
>
> ditto
>
>> +     .dai_type = TYPE_PRI,
>> +     .quirks = QUIRK_PRI_6CHAN | QUIRK_SEC_DAI | QUIRK_NEED_RSTCLR,
>> +};
>> +
>> +static struct samsung_i2s_dai_data samsung_dai_type_sec = {
>
> ditto
>
>> +     .dai_type = TYPE_SEC,
>> +};
>> +
>>  static struct platform_device_id samsung_i2s_driver_ids[] = {
>>       {
>> -             .name           = "samsung-i2s",
>> -             .driver_data    = TYPE_PRI,
>> +             .name           = "samsung,s3c6410-i2s",
>> +             .driver_data    = (kernel_ulong_t)&i2sv3_dai_type,
>> +     }, {
>> +             .name           = "samsung,s3c6410-i2s-multi",
>> +             .driver_data    = (kernel_ulong_t)&i2sv4_dai_type,
>> +     }, {
>> +             .name           = "samsung,s5pc100-i2s",
>> +             .driver_data    = (kernel_ulong_t)&i2sv5_c100_dai_type,
>>       }, {
>> -             .name           = "samsung-i2s-sec",
>> -             .driver_data    = TYPE_SEC,
>> +             .name           = "samsung,s5pv210-i2s",
>> +             .driver_data    = (kernel_ulong_t)&i2sv5_dai_type,
>> +     }, {
>> +             .name           = "samsung-i2s-sec",
>> +             .driver_data    = (kernel_ulong_t)&samsung_dai_type_sec,
>>       },
>>       {},
>>  };
>>  MODULE_DEVICE_TABLE(platform, samsung_i2s_driver_ids);
>>
>>  #ifdef CONFIG_OF
>> -static struct samsung_i2s_dai_data samsung_i2s_dai_data_array[] = {
>> -     [TYPE_PRI] = { TYPE_PRI },
>> -     [TYPE_SEC] = { TYPE_SEC },
>> -};
>> -
>>  static const struct of_device_id exynos_i2s_match[] = {
>> -     { .compatible = "samsung,i2s-v5",
>> -       .data = &samsung_i2s_dai_data_array[TYPE_PRI],
>> +     {
>> +             .compatible = "samsung,s3c6410-i2s",
>> +             .data = &i2sv3_dai_type,
>> +     }, {
>> +             .compatible = "samsung,s5pv210-i2s",
>> +             .data = &i2sv5_dai_type,
>
> Hmm, documentation mentions 4 compatible values (and possibly one is
> missing there), but this patch adds only 2 of them. I don't think this is
> correct, especially that the driver already supports handling all of them.

Documentation mentions about all the compatible strings which are all
supported by this driver for reference. But some of the platforms
haven't converted to DT yet so here I added the compatible strings for
DT compliant platforms and compatible strings for non-DT compliant
platforms I added in the platform_device_id structure. Any way we have
to make all legacy platforms  DT compliant so we need this
"samsung,s3c6410-i2s-multi" in future.

>
> Best regards,
> Tomasz
>

Thanks
Padma

[PATCH V3 2/3] ASoC: Samsung: I2S: Add quirks as driver data in I2S

[Tomasz Figa]

Ahh, one more thing inline.

On Wednesday 07 of August 2013 14:15:21 Padmavathi Venna wrote:
> Samsung has different versions of I2S introduced in different
> platforms. Each version has some new support added for multichannel,
> secondary fifo, s/w reset control and internal mux for rclk src clk.
> Each newly added change has a quirk. So this patch adds all the
> required quirks as driver data and based on compatible string from
> dtsi fetches the quirks.
> 
> Signed-off-by: Padmavathi Venna <padma.v@samsung.com>
> ---
>  .../devicetree/bindings/sound/samsung-i2s.txt      |   21 +++---
>  sound/soc/samsung/i2s.c                            |   82
> +++++++++++++------- 2 files changed, 64 insertions(+), 39 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/sound/samsung-i2s.txt
> b/Documentation/devicetree/bindings/sound/samsung-i2s.txt index
> 025e66b..b3f6443 100644
> --- a/Documentation/devicetree/bindings/sound/samsung-i2s.txt
> +++ b/Documentation/devicetree/bindings/sound/samsung-i2s.txt
> @@ -2,7 +2,16 @@
> 
>  Required SoC Specific Properties:
> 
> -- compatible : "samsung,i2s-v5"
> +- compatible : should be one of the following.
> +   - samsung,s3c6410-i2s: for 8/16/24bit stereo I2S. Previous versions
> +     has only 8/16bit support.
> +   - samsung,s3c6410-i2sv4: for 8/16/24bit multichannel(5.1 channel)
> I2S. +     Introduced in s3c6410. This also applicable for s5p64x0
> platforms. +   - samsung,s5pc100-i2s: for 8/16/24bit multichannel(5.1
> channel) I2S +     with secondary fifo and s/w reset control.
> +   - samsung,s5pv210-i2s: for 8/16/24bit multichannel(5.1) I2S with
> +     secondary fifo, s/w reset control and internal mux for root clk
> src. +
>  - reg: physical base address of the controller and length of memory
> mapped region.
>  - dmas: list of DMA controller phandle and DMA request line ordered
> pairs. @@ -21,13 +30,6 @@ Required SoC Specific Properties:
> 
>  Optional SoC Specific Properties:
> 
> -- samsung,supports-6ch: If the I2S Primary sound source has 5.1 Channel
> -  support, this flag is enabled.
> -- samsung,supports-rstclr: This flag should be set if I2S software reset
> bit -  control is required. When this flag is set I2S software reset bit
> will be -  enabled or disabled based on need.
> -- samsung,supports-secdai:If I2S block has a secondary FIFO and internal
> DMA, -  then this flag is enabled.
>  - samsung,idma-addr: Internal DMA register base address of the audio
>    sub system(used in secondary sound source).
>  - pinctrl-0: Should specify pin control groups used for this controller.
> @@ -46,9 +48,6 @@ i2s0: i2s at 03830000 {
>  		<&clock_audss EXYNOS_I2S_BUS>,
>  		<&clock_audss EXYNOS_SCLK_I2S>;
>  	clock-names = "iis", "i2s_opclk0", "i2s_opclk1";
> -	samsung,supports-6ch;
> -	samsung,supports-rstclr;
> -	samsung,supports-secdai;
>  	samsung,idma-addr = <0x03000000>;
>  	pinctrl-names = "default";
>  	pinctrl-0 = <&i2s0_bus>;
> diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c
> index 47e08dd..8a5504c 100644
> --- a/sound/soc/samsung/i2s.c
> +++ b/sound/soc/samsung/i2s.c
> @@ -40,6 +40,7 @@ enum samsung_dai_type {
> 
>  struct samsung_i2s_dai_data {
>  	int dai_type;
> +	u32 quirks;
>  };
> 
>  struct i2s_dai {
> @@ -1032,18 +1033,18 @@ static struct i2s_dai *i2s_alloc_dai(struct
> platform_device *pdev, bool sec)
> 
>  static const struct of_device_id exynos_i2s_match[];
> 
> -static inline int samsung_i2s_get_driver_data(struct platform_device
> *pdev) +static inline struct samsung_i2s_dai_data
> *samsung_i2s_get_driver_data( +						struct platform_device 
*pdev)
>  {
>  #ifdef CONFIG_OF
> -	struct samsung_i2s_dai_data *data;
>  	if (pdev->dev.of_node) {
>  		const struct of_device_id *match;
>  		match = of_match_node(exynos_i2s_match, pdev->dev.of_node);
> -		data = (struct samsung_i2s_dai_data *) match->data;
> -		return data->dai_type;
> +		return (struct samsung_i2s_dai_data *) match->data;
>  	} else
>  #endif
> -		return platform_get_device_id(pdev)->driver_data;
> +		return (struct samsung_i2s_dai_data *)
> +				platform_get_device_id(pdev)->driver_data;
>  }
> 
>  #ifdef CONFIG_PM_RUNTIME
> @@ -1074,13 +1075,13 @@ static int samsung_i2s_probe(struct
> platform_device *pdev) struct resource *res;
>  	u32 regs_base, quirks = 0, idma_addr = 0;
>  	struct device_node *np = pdev->dev.of_node;
> -	enum samsung_dai_type samsung_dai_type;
> +	struct samsung_i2s_dai_data *i2s_dai_data;
>  	int ret = 0;
> 
>  	/* Call during Seconday interface registration */
> -	samsung_dai_type = samsung_i2s_get_driver_data(pdev);
> +	i2s_dai_data = samsung_i2s_get_driver_data(pdev);
> 
> -	if (samsung_dai_type == TYPE_SEC) {
> +	if (i2s_dai_data->dai_type == TYPE_SEC) {
>  		sec_dai = dev_get_drvdata(&pdev->dev);
>  		if (!sec_dai) {
>  			dev_err(&pdev->dev, "Unable to get drvdata\n");
> @@ -1129,15 +1130,7 @@ static int samsung_i2s_probe(struct
> platform_device *pdev) idma_addr = i2s_cfg->idma_addr;
>  		}
>  	} else {
> -		if (of_find_property(np, "samsung,supports-6ch", NULL))
> -			quirks |= QUIRK_PRI_6CHAN;
> -
> -		if (of_find_property(np, "samsung,supports-secdai", NULL))
> -			quirks |= QUIRK_SEC_DAI;
> -
> -		if (of_find_property(np, "samsung,supports-rstclr", NULL))
> -			quirks |= QUIRK_NEED_RSTCLR;
> -
> +		quirks = i2s_dai_data->quirks;
>  		if (of_property_read_u32(np, "samsung,idma-addr",
>  					 &idma_addr)) {
>  			if (quirks & QUIRK_SEC_DAI) {
> @@ -1250,27 +1243,60 @@ static int samsung_i2s_remove(struct
> platform_device *pdev) return 0;
>  }
> 
> +static struct samsung_i2s_dai_data i2sv3_dai_type = {
> +	.dai_type = TYPE_PRI,
> +	.quirks = QUIRK_NO_MUXPSR,
> +};
> +
> +static struct samsung_i2s_dai_data i2sv4_dai_type = {
> +	.dai_type = TYPE_PRI,
> +	.quirks = QUIRK_PRI_6CHAN | QUIRK_NO_MUXPSR,
> +};
> +
> +static struct samsung_i2s_dai_data i2sv5_c100_dai_type = {
> +	.dai_type = TYPE_PRI,
> +	.quirks = QUIRK_PRI_6CHAN | QUIRK_NO_MUXPSR | QUIRK_SEC_DAI |
> +			QUIRK_NEED_RSTCLR,
> +};
> +
> +static struct samsung_i2s_dai_data i2sv5_dai_type = {
> +	.dai_type = TYPE_PRI,
> +	.quirks = QUIRK_PRI_6CHAN | QUIRK_SEC_DAI | QUIRK_NEED_RSTCLR,
> +};
> +
> +static struct samsung_i2s_dai_data samsung_dai_type_sec = {
> +	.dai_type = TYPE_SEC,
> +};
> +
>  static struct platform_device_id samsung_i2s_driver_ids[] = {
>  	{
> -		.name           = "samsung-i2s",
> -		.driver_data	= TYPE_PRI,
> +		.name		= "samsung,s3c6410-i2s",
> +		.driver_data	= (kernel_ulong_t)&i2sv3_dai_type,
> +	}, {
> +		.name		= "samsung,s3c6410-i2s-multi",
> +		.driver_data	= (kernel_ulong_t)&i2sv4_dai_type,
> +	}, {
> +		.name		= "samsung,s5pc100-i2s",
> +		.driver_data	= (kernel_ulong_t)&i2sv5_c100_dai_type,
>  	}, {
> -		.name           = "samsung-i2s-sec",
> -		.driver_data	= TYPE_SEC,
> +		.name		= "samsung,s5pv210-i2s",
> +		.driver_data	= (kernel_ulong_t)&i2sv5_dai_type,
> +	}, {
> +		.name		= "samsung-i2s-sec",
> +		.driver_data	= (kernel_ulong_t)&samsung_dai_type_sec,

I don't think you need to change the legacy platform IDs at all.

IMHO it would be better to keep the old way of quirk retrieval from 
platform_data (which I think this patch does anyway, because the probe path 
without DT is unchanged), as it will be dropped in some point in time 
anyway.

This would also eliminate the need for patch 1.

Best regards,
Tomasz

[PATCH V3 2/3] ASoC: Samsung: I2S: Add quirks as driver data in I2S

[Padma Venkat]

Hi Tomasz,

On Wed, Aug 7, 2013 at 4:43 PM, Tomasz Figa <t.figa@samsung.com> wrote:
> Ahh, one more thing inline.
>

[snip]

>>
>> +static struct samsung_i2s_dai_data i2sv3_dai_type = {
>> +     .dai_type = TYPE_PRI,
>> +     .quirks = QUIRK_NO_MUXPSR,
>> +};
>> +
>> +static struct samsung_i2s_dai_data i2sv4_dai_type = {
>> +     .dai_type = TYPE_PRI,
>> +     .quirks = QUIRK_PRI_6CHAN | QUIRK_NO_MUXPSR,
>> +};
>> +
>> +static struct samsung_i2s_dai_data i2sv5_c100_dai_type = {
>> +     .dai_type = TYPE_PRI,
>> +     .quirks = QUIRK_PRI_6CHAN | QUIRK_NO_MUXPSR | QUIRK_SEC_DAI |
>> +                     QUIRK_NEED_RSTCLR,
>> +};
>> +
>> +static struct samsung_i2s_dai_data i2sv5_dai_type = {
>> +     .dai_type = TYPE_PRI,
>> +     .quirks = QUIRK_PRI_6CHAN | QUIRK_SEC_DAI | QUIRK_NEED_RSTCLR,
>> +};
>> +
>> +static struct samsung_i2s_dai_data samsung_dai_type_sec = {
>> +     .dai_type = TYPE_SEC,
>> +};
>> +
>>  static struct platform_device_id samsung_i2s_driver_ids[] = {
>>       {
>> -             .name           = "samsung-i2s",
>> -             .driver_data    = TYPE_PRI,
>> +             .name           = "samsung,s3c6410-i2s",
>> +             .driver_data    = (kernel_ulong_t)&i2sv3_dai_type,
>> +     }, {
>> +             .name           = "samsung,s3c6410-i2s-multi",
>> +             .driver_data    = (kernel_ulong_t)&i2sv4_dai_type,
>> +     }, {
>> +             .name           = "samsung,s5pc100-i2s",
>> +             .driver_data    = (kernel_ulong_t)&i2sv5_c100_dai_type,
>>       }, {
>> -             .name           = "samsung-i2s-sec",
>> -             .driver_data    = TYPE_SEC,
>> +             .name           = "samsung,s5pv210-i2s",
>> +             .driver_data    = (kernel_ulong_t)&i2sv5_dai_type,
>> +     }, {
>> +             .name           = "samsung-i2s-sec",
>> +             .driver_data    = (kernel_ulong_t)&samsung_dai_type_sec,
>
> I don't think you need to change the legacy platform IDs at all.

If legacy platforms not required to change then I need to introduce a
new samsung_i2s_dai_data structure which holds only dai_type for
non-dt platforms. If I change legacy platforms it breaks the older
platforms now. Is it okay adding a samsung_i2s_dai_data structure for
non-dt platforms which will be removed later?

>
> IMHO it would be better to keep the old way of quirk retrieval from
> platform_data (which I think this patch does anyway, because the probe path
> without DT is unchanged), as it will be dropped in some point in time
> anyway.
>
> This would also eliminate the need for patch 1.
>
> Best regards,
> Tomasz
>

Thanks
Padma

[PATCH V3 2/3] ASoC: Samsung: I2S: Add quirks as driver data in I2S

[Tomasz Figa]

On Thursday 08 of August 2013 13:13:02 Padma Venkat wrote:
> Hi Tomasz,
> 
> On Wed, Aug 7, 2013 at 4:43 PM, Tomasz Figa <t.figa@samsung.com> wrote:
> > Ahh, one more thing inline.
> 
> [snip]
> 
> >> +static struct samsung_i2s_dai_data i2sv3_dai_type = {
> >> +     .dai_type = TYPE_PRI,
> >> +     .quirks = QUIRK_NO_MUXPSR,
> >> +};
> >> +
> >> +static struct samsung_i2s_dai_data i2sv4_dai_type = {
> >> +     .dai_type = TYPE_PRI,
> >> +     .quirks = QUIRK_PRI_6CHAN | QUIRK_NO_MUXPSR,
> >> +};
> >> +
> >> +static struct samsung_i2s_dai_data i2sv5_c100_dai_type = {
> >> +     .dai_type = TYPE_PRI,
> >> +     .quirks = QUIRK_PRI_6CHAN | QUIRK_NO_MUXPSR | QUIRK_SEC_DAI |
> >> +                     QUIRK_NEED_RSTCLR,
> >> +};
> >> +
> >> +static struct samsung_i2s_dai_data i2sv5_dai_type = {
> >> +     .dai_type = TYPE_PRI,
> >> +     .quirks = QUIRK_PRI_6CHAN | QUIRK_SEC_DAI | QUIRK_NEED_RSTCLR,
> >> +};
> >> +
> >> +static struct samsung_i2s_dai_data samsung_dai_type_sec = {
> >> +     .dai_type = TYPE_SEC,
> >> +};
> >> +
> >> 
> >>  static struct platform_device_id samsung_i2s_driver_ids[] = {
> >>  
> >>       {
> >> 
> >> -             .name           = "samsung-i2s",
> >> -             .driver_data    = TYPE_PRI,
> >> +             .name           = "samsung,s3c6410-i2s",
> >> +             .driver_data    = (kernel_ulong_t)&i2sv3_dai_type,
> >> +     }, {
> >> +             .name           = "samsung,s3c6410-i2s-multi",
> >> +             .driver_data    = (kernel_ulong_t)&i2sv4_dai_type,
> >> +     }, {
> >> +             .name           = "samsung,s5pc100-i2s",
> >> +             .driver_data    = (kernel_ulong_t)&i2sv5_c100_dai_type,
> >> 
> >>       }, {
> >> 
> >> -             .name           = "samsung-i2s-sec",
> >> -             .driver_data    = TYPE_SEC,
> >> +             .name           = "samsung,s5pv210-i2s",
> >> +             .driver_data    = (kernel_ulong_t)&i2sv5_dai_type,
> >> +     }, {
> >> +             .name           = "samsung-i2s-sec",
> >> +             .driver_data    =
> >> (kernel_ulong_t)&samsung_dai_type_sec,
> > 
> > I don't think you need to change the legacy platform IDs at all.
> 
> If legacy platforms not required to change then I need to introduce a
> new samsung_i2s_dai_data structure which holds only dai_type for
> non-dt platforms. If I change legacy platforms it breaks the older
> platforms now. Is it okay adding a samsung_i2s_dai_data structure for
> non-dt platforms which will be removed later?

Sorry, I don't understand the problem here.

Original contents of samsung_i2s_driver_ids[] array already conveyed 
information about dai type inside driver_data field of each 
platform_device_id entry.

If you really need to have samsung_i2s_dai_data struct for both DT and 
non-DT cases you can create dummy dai_data for both platform ID entries, 
which would have only dai type field initialized. This would be fine, 
because the non-DT probe path takes anything else from platform_data and 
would not need samsung_i2s_dai_data struct in any other way than getting 
dai_type in probe.

Best regards,
Tomasz

> > IMHO it would be better to keep the old way of quirk retrieval from
> > platform_data (which I think this patch does anyway, because the probe
> > path without DT is unchanged), as it will be dropped in some point in
> > time anyway.
> > 
> > This would also eliminate the need for patch 1.
> > 
> > Best regards,
> > Tomasz
> 
> Thanks
> Padma

[PATCH V3 2/3] ASoC: Samsung: I2S: Add quirks as driver data in I2S

[Mark Brown]

On Thu, Aug 08, 2013 at 01:13:02PM +0530, Padma Venkat wrote:

> If legacy platforms not required to change then I need to introduce a
> new samsung_i2s_dai_data structure which holds only dai_type for
> non-dt platforms. If I change legacy platforms it breaks the older
> platforms now. Is it okay adding a samsung_i2s_dai_data structure for
> non-dt platforms which will be removed later?

This is totally fine and looks much nicer - you're not creating DT style
names in the platform bus, nor making names that are so long that we
need to expand the maximum length of a plaform device name (which isn't
awesome).
-------------- 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/20130808/3311f5b7/attachment.sig>

[PATCH V3 3/3] ASoC: Samsung: I2S: Modify the I2S driver to support I2S on Exynos5420

[Padmavathi Venna]

Exynos5420 added support for I2S TDM mode. For this, there are some
register changes in the I2S controller. This patch adds the relevant
register changes to support I2S in normal mode. This patch adds a
quirk for TDM mode and if TDM mode is present all the relevent changes
will be applied.

Signed-off-by: Padmavathi Venna <padma.v@samsung.com>
---
 .../devicetree/bindings/sound/samsung-i2s.txt      |    4 +
 include/linux/platform_data/asoc-s3c.h             |    1 +
 sound/soc/samsung/i2s-regs.h                       |   15 ++++
 sound/soc/samsung/i2s.c                            |   81 ++++++++++++++++++--
 4 files changed, 93 insertions(+), 8 deletions(-)

diff --git a/Documentation/devicetree/bindings/sound/samsung-i2s.txt b/Documentation/devicetree/bindings/sound/samsung-i2s.txt
index b3f6443..9b5c892 100644
--- a/Documentation/devicetree/bindings/sound/samsung-i2s.txt
+++ b/Documentation/devicetree/bindings/sound/samsung-i2s.txt
@@ -11,6 +11,10 @@ Required SoC Specific Properties:
      with secondary fifo and s/w reset control.
    - samsung,s5pv210-i2s: for 8/16/24bit multichannel(5.1) I2S with
      secondary fifo, s/w reset control and internal mux for root clk src.
+   - samsung,exynos5420-i2s: for 8/16/24bit multichannel(7.1) I2S with
+     secondary fifo, s/w reset control, internal mux for root clk src and
+     TDM support. TDM (Time division multiplexing) is to allow transfer of
+     multiple channel audio data on single data line.
 
 - reg: physical base address of the controller and length of memory mapped
   region.
diff --git a/include/linux/platform_data/asoc-s3c.h b/include/linux/platform_data/asoc-s3c.h
index 8827259..9efc04d 100644
--- a/include/linux/platform_data/asoc-s3c.h
+++ b/include/linux/platform_data/asoc-s3c.h
@@ -36,6 +36,7 @@ struct samsung_i2s {
  */
 #define QUIRK_NO_MUXPSR		(1 << 2)
 #define QUIRK_NEED_RSTCLR	(1 << 3)
+#define QUIRK_SUPPORTS_TDM	(1 << 4)
 	/* Quirks of the I2S controller */
 	u32 quirks;
 	dma_addr_t idma_addr;
diff --git a/sound/soc/samsung/i2s-regs.h b/sound/soc/samsung/i2s-regs.h
index 30513b7..821a502 100644
--- a/sound/soc/samsung/i2s-regs.h
+++ b/sound/soc/samsung/i2s-regs.h
@@ -31,6 +31,10 @@
 #define I2SLVL1ADDR	0x34
 #define I2SLVL2ADDR	0x38
 #define I2SLVL3ADDR	0x3c
+#define I2SSTR1		0x40
+#define I2SVER		0x44
+#define I2SFIC2		0x48
+#define I2STDM		0x4c
 
 #define CON_RSTCLR		(1 << 31)
 #define CON_FRXOFSTATUS		(1 << 26)
@@ -117,6 +121,17 @@
 #define MOD_BCLK_MASK		3
 #define MOD_8BIT		(1 << 0)
 
+#define EXYNOS5420_MOD_LRP_SHIFT	15
+#define EXYNOS5420_MOD_SDF_SHIFT	6
+#define EXYNOS5420_MOD_RCLK_SHIFT	4
+#define EXYNOS5420_MOD_BCLK_SHIFT	0
+#define EXYNOS5420_MOD_BCLK_64FS	4
+#define EXYNOS5420_MOD_BCLK_96FS	5
+#define EXYNOS5420_MOD_BCLK_128FS	6
+#define EXYNOS5420_MOD_BCLK_192FS	7
+#define EXYNOS5420_MOD_BCLK_256FS	8
+#define EXYNOS5420_MOD_BCLK_MASK	0xf
+
 #define MOD_CDCLKCON		(1 << 12)
 
 #define PSR_PSREN		(1 << 15)
diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c
index 8a5504c..6964672 100644
--- a/sound/soc/samsung/i2s.c
+++ b/sound/soc/samsung/i2s.c
@@ -199,7 +199,12 @@ static inline bool is_manager(struct i2s_dai *i2s)
 /* Read RCLK of I2S (in multiples of LRCLK) */
 static inline unsigned get_rfs(struct i2s_dai *i2s)
 {
-	u32 rfs = (readl(i2s->addr + I2SMOD) >> MOD_RCLK_SHIFT);
+	u32 rfs;
+
+	if (i2s->quirks & QUIRK_SUPPORTS_TDM)
+		rfs = readl(i2s->addr + I2SMOD) >> EXYNOS5420_MOD_RCLK_SHIFT;
+	else
+		rfs = (readl(i2s->addr + I2SMOD) >> MOD_RCLK_SHIFT);
 	rfs &= MOD_RCLK_MASK;
 
 	switch (rfs) {
@@ -214,8 +219,12 @@ static inline unsigned get_rfs(struct i2s_dai *i2s)
 static inline void set_rfs(struct i2s_dai *i2s, unsigned rfs)
 {
 	u32 mod = readl(i2s->addr + I2SMOD);
-	int rfs_shift =  MOD_RCLK_SHIFT;
+	int rfs_shift;
 
+	if (i2s->quirks & QUIRK_SUPPORTS_TDM)
+		rfs_shift = EXYNOS5420_MOD_RCLK_SHIFT;
+	else
+		rfs_shift = MOD_RCLK_SHIFT;
 	mod &= ~(MOD_RCLK_MASK << rfs_shift);
 
 	switch (rfs) {
@@ -239,10 +248,22 @@ static inline void set_rfs(struct i2s_dai *i2s, unsigned rfs)
 /* Read Bit-Clock of I2S (in multiples of LRCLK) */
 static inline unsigned get_bfs(struct i2s_dai *i2s)
 {
-	u32 bfs =  readl(i2s->addr + I2SMOD) >> MOD_BCLK_SHIFT;
-	bfs &= MOD_BCLK_MASK;
+	u32 bfs;
+
+	if (i2s->quirks & QUIRK_SUPPORTS_TDM) {
+		bfs = readl(i2s->addr + I2SMOD) >> EXYNOS5420_MOD_BCLK_SHIFT;
+		bfs &= EXYNOS5420_MOD_BCLK_MASK;
+	} else {
+		bfs =  readl(i2s->addr + I2SMOD) >> MOD_BCLK_SHIFT;
+		bfs &= MOD_BCLK_MASK;
+	}
 
 	switch (bfs) {
+	case 8: return 256;
+	case 7: return 192;
+	case 6: return 128;
+	case 5: return 96;
+	case 4: return 64;
 	case 3: return 24;
 	case 2: return 16;
 	case 1:	return 48;
@@ -254,9 +275,22 @@ static inline unsigned get_bfs(struct i2s_dai *i2s)
 static inline void set_bfs(struct i2s_dai *i2s, unsigned bfs)
 {
 	u32 mod = readl(i2s->addr + I2SMOD);
-	int bfs_shift = MOD_BCLK_SHIFT;
+	int bfs_shift;
+	int tdm = i2s->quirks & QUIRK_SUPPORTS_TDM;
 
-	mod &= ~(MOD_BCLK_MASK << bfs_shift);
+	if (i2s->quirks & QUIRK_SUPPORTS_TDM) {
+		bfs_shift = EXYNOS5420_MOD_BCLK_SHIFT;
+		mod &= ~(EXYNOS5420_MOD_BCLK_MASK << bfs_shift);
+	} else {
+		bfs_shift = MOD_BCLK_SHIFT;
+		mod &= ~(MOD_BCLK_MASK << bfs_shift);
+	}
+
+	/* Non-TDM I2S controllers do not support BCLK > 48 * FS */
+	if (!tdm && bfs > 48) {
+		dev_err(&i2s->pdev->dev, "Unsupported BCLK divider\n");
+		return;
+	}
 
 	switch (bfs) {
 	case 48:
@@ -271,6 +305,21 @@ static inline void set_bfs(struct i2s_dai *i2s, unsigned bfs)
 	case 16:
 		mod |= (MOD_BCLK_16FS << bfs_shift);
 		break;
+	case 64:
+		mod |= (EXYNOS5420_MOD_BCLK_64FS << bfs_shift);
+		break;
+	case 96:
+		mod |= (EXYNOS5420_MOD_BCLK_96FS << bfs_shift);
+		break;
+	case 128:
+		mod |= (EXYNOS5420_MOD_BCLK_128FS << bfs_shift);
+		break;
+	case 192:
+		mod |= (EXYNOS5420_MOD_BCLK_192FS << bfs_shift);
+		break;
+	case 256:
+		mod |= (EXYNOS5420_MOD_BCLK_256FS << bfs_shift);
+		break;
 	default:
 		dev_err(&i2s->pdev->dev, "Wrong BCLK Divider!\n");
 		return;
@@ -496,10 +545,17 @@ static int i2s_set_fmt(struct snd_soc_dai *dai,
 {
 	struct i2s_dai *i2s = to_info(dai);
 	u32 mod = readl(i2s->addr + I2SMOD);
-	int lrp_shift = MOD_LRP_SHIFT, sdf_shift = MOD_SDF_SHIFT;
-	int sdf_mask, lrp_rlow;
+	int lrp_shift, sdf_shift, sdf_mask, lrp_rlow;
 	u32 tmp = 0;
 
+	if (i2s->quirks & QUIRK_SUPPORTS_TDM) {
+		lrp_shift = EXYNOS5420_MOD_LRP_SHIFT;
+		sdf_shift = EXYNOS5420_MOD_SDF_SHIFT;
+	} else {
+		lrp_shift = MOD_LRP_SHIFT;
+		sdf_shift = MOD_SDF_SHIFT;
+	}
+
 	sdf_mask = MOD_SDF_MASK << sdf_shift;
 	lrp_rlow = MOD_LR_RLOW << lrp_shift;
 
@@ -1264,6 +1320,12 @@ static struct samsung_i2s_dai_data i2sv5_dai_type = {
 	.quirks = QUIRK_PRI_6CHAN | QUIRK_SEC_DAI | QUIRK_NEED_RSTCLR,
 };
 
+static struct samsung_i2s_dai_data i2sv6_dai_type = {
+	.dai_type = TYPE_PRI,
+	.quirks = QUIRK_PRI_6CHAN | QUIRK_SEC_DAI | QUIRK_NEED_RSTCLR |
+			QUIRK_SUPPORTS_TDM,
+};
+
 static struct samsung_i2s_dai_data samsung_dai_type_sec = {
 	.dai_type = TYPE_SEC,
 };
@@ -1297,6 +1359,9 @@ static const struct of_device_id exynos_i2s_match[] = {
 	}, {
 		.compatible = "samsung,s5pv210-i2s",
 		.data = &i2sv5_dai_type,
+	}, {
+		.compatible = "samsung,exynos5420-i2s",
+		.data = &i2sv6_dai_type,
 	},
 	{},
 };
-- 
1.7.4.4

[PATCH V3 3/3] ASoC: Samsung: I2S: Modify the I2S driver to support I2S on Exynos5420

[Tomasz Figa]

Hi Padmavathi,

On Wednesday 07 of August 2013 14:15:22 Padmavathi Venna wrote:
> Exynos5420 added support for I2S TDM mode. For this, there are some
> register changes in the I2S controller. This patch adds the relevant
> register changes to support I2S in normal mode. This patch adds a
> quirk for TDM mode and if TDM mode is present all the relevent changes
> will be applied.
> 
> Signed-off-by: Padmavathi Venna <padma.v@samsung.com>
> ---
>  .../devicetree/bindings/sound/samsung-i2s.txt      |    4 +
>  include/linux/platform_data/asoc-s3c.h             |    1 +
>  sound/soc/samsung/i2s-regs.h                       |   15 ++++
>  sound/soc/samsung/i2s.c                            |   81
> ++++++++++++++++++-- 4 files changed, 93 insertions(+), 8 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/sound/samsung-i2s.txt
> b/Documentation/devicetree/bindings/sound/samsung-i2s.txt index
> b3f6443..9b5c892 100644
> --- a/Documentation/devicetree/bindings/sound/samsung-i2s.txt
> +++ b/Documentation/devicetree/bindings/sound/samsung-i2s.txt
> @@ -11,6 +11,10 @@ Required SoC Specific Properties:
>       with secondary fifo and s/w reset control.
>     - samsung,s5pv210-i2s: for 8/16/24bit multichannel(5.1) I2S with
>       secondary fifo, s/w reset control and internal mux for root clk
> src. +   - samsung,exynos5420-i2s: for 8/16/24bit multichannel(7.1) I2S
> with +     secondary fifo, s/w reset control, internal mux for root clk
> src and +     TDM support. TDM (Time division multiplexing) is to allow
> transfer of +     multiple channel audio data on single data line.
> 
>  - reg: physical base address of the controller and length of memory
> mapped region.
> diff --git a/include/linux/platform_data/asoc-s3c.h
> b/include/linux/platform_data/asoc-s3c.h index 8827259..9efc04d 100644
> --- a/include/linux/platform_data/asoc-s3c.h
> +++ b/include/linux/platform_data/asoc-s3c.h
> @@ -36,6 +36,7 @@ struct samsung_i2s {
>   */
>  #define QUIRK_NO_MUXPSR		(1 << 2)
>  #define QUIRK_NEED_RSTCLR	(1 << 3)
> +#define QUIRK_SUPPORTS_TDM	(1 << 4)
>  	/* Quirks of the I2S controller */
>  	u32 quirks;
>  	dma_addr_t idma_addr;
> diff --git a/sound/soc/samsung/i2s-regs.h b/sound/soc/samsung/i2s-regs.h
> index 30513b7..821a502 100644
> --- a/sound/soc/samsung/i2s-regs.h
> +++ b/sound/soc/samsung/i2s-regs.h
> @@ -31,6 +31,10 @@
>  #define I2SLVL1ADDR	0x34
>  #define I2SLVL2ADDR	0x38
>  #define I2SLVL3ADDR	0x3c
> +#define I2SSTR1		0x40
> +#define I2SVER		0x44
> +#define I2SFIC2		0x48
> +#define I2STDM		0x4c
> 
>  #define CON_RSTCLR		(1 << 31)
>  #define CON_FRXOFSTATUS		(1 << 26)
> @@ -117,6 +121,17 @@
>  #define MOD_BCLK_MASK		3
>  #define MOD_8BIT		(1 << 0)
> 
> +#define EXYNOS5420_MOD_LRP_SHIFT	15
> +#define EXYNOS5420_MOD_SDF_SHIFT	6
> +#define EXYNOS5420_MOD_RCLK_SHIFT	4
> +#define EXYNOS5420_MOD_BCLK_SHIFT	0
> +#define EXYNOS5420_MOD_BCLK_64FS	4
> +#define EXYNOS5420_MOD_BCLK_96FS	5
> +#define EXYNOS5420_MOD_BCLK_128FS	6
> +#define EXYNOS5420_MOD_BCLK_192FS	7
> +#define EXYNOS5420_MOD_BCLK_256FS	8
> +#define EXYNOS5420_MOD_BCLK_MASK	0xf
> +
>  #define MOD_CDCLKCON		(1 << 12)
> 
>  #define PSR_PSREN		(1 << 15)
> diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c
> index 8a5504c..6964672 100644
> --- a/sound/soc/samsung/i2s.c
> +++ b/sound/soc/samsung/i2s.c
> @@ -199,7 +199,12 @@ static inline bool is_manager(struct i2s_dai *i2s)
>  /* Read RCLK of I2S (in multiples of LRCLK) */
>  static inline unsigned get_rfs(struct i2s_dai *i2s)
>  {
> -	u32 rfs = (readl(i2s->addr + I2SMOD) >> MOD_RCLK_SHIFT);
> +	u32 rfs;
> +
> +	if (i2s->quirks & QUIRK_SUPPORTS_TDM)
> +		rfs = readl(i2s->addr + I2SMOD) >> 
EXYNOS5420_MOD_RCLK_SHIFT;
> +	else
> +		rfs = (readl(i2s->addr + I2SMOD) >> MOD_RCLK_SHIFT);
>  	rfs &= MOD_RCLK_MASK;
> 
>  	switch (rfs) {
> @@ -214,8 +219,12 @@ static inline unsigned get_rfs(struct i2s_dai *i2s)
> static inline void set_rfs(struct i2s_dai *i2s, unsigned rfs) {
>  	u32 mod = readl(i2s->addr + I2SMOD);
> -	int rfs_shift =  MOD_RCLK_SHIFT;
> +	int rfs_shift;
> 
> +	if (i2s->quirks & QUIRK_SUPPORTS_TDM)
> +		rfs_shift = EXYNOS5420_MOD_RCLK_SHIFT;
> +	else
> +		rfs_shift = MOD_RCLK_SHIFT;
>  	mod &= ~(MOD_RCLK_MASK << rfs_shift);
> 
>  	switch (rfs) {
> @@ -239,10 +248,22 @@ static inline void set_rfs(struct i2s_dai *i2s,
> unsigned rfs) /* Read Bit-Clock of I2S (in multiples of LRCLK) */
>  static inline unsigned get_bfs(struct i2s_dai *i2s)
>  {
> -	u32 bfs =  readl(i2s->addr + I2SMOD) >> MOD_BCLK_SHIFT;
> -	bfs &= MOD_BCLK_MASK;
> +	u32 bfs;
> +
> +	if (i2s->quirks & QUIRK_SUPPORTS_TDM) {
> +		bfs = readl(i2s->addr + I2SMOD) >> 
EXYNOS5420_MOD_BCLK_SHIFT;
> +		bfs &= EXYNOS5420_MOD_BCLK_MASK;
> +	} else {
> +		bfs =  readl(i2s->addr + I2SMOD) >> MOD_BCLK_SHIFT;
> +		bfs &= MOD_BCLK_MASK;
> +	}
> 
>  	switch (bfs) {
> +	case 8: return 256;
> +	case 7: return 192;
> +	case 6: return 128;
> +	case 5: return 96;
> +	case 4: return 64;
>  	case 3: return 24;
>  	case 2: return 16;
>  	case 1:	return 48;
> @@ -254,9 +275,22 @@ static inline unsigned get_bfs(struct i2s_dai *i2s)
> static inline void set_bfs(struct i2s_dai *i2s, unsigned bfs) {
>  	u32 mod = readl(i2s->addr + I2SMOD);
> -	int bfs_shift = MOD_BCLK_SHIFT;
> +	int bfs_shift;
> +	int tdm = i2s->quirks & QUIRK_SUPPORTS_TDM;
> 
> -	mod &= ~(MOD_BCLK_MASK << bfs_shift);
> +	if (i2s->quirks & QUIRK_SUPPORTS_TDM) {
> +		bfs_shift = EXYNOS5420_MOD_BCLK_SHIFT;
> +		mod &= ~(EXYNOS5420_MOD_BCLK_MASK << bfs_shift);
> +	} else {
> +		bfs_shift = MOD_BCLK_SHIFT;
> +		mod &= ~(MOD_BCLK_MASK << bfs_shift);
> +	}
> +
> +	/* Non-TDM I2S controllers do not support BCLK > 48 * FS */
> +	if (!tdm && bfs > 48) {
> +		dev_err(&i2s->pdev->dev, "Unsupported BCLK divider\n");
> +		return;
> +	}
> 
>  	switch (bfs) {
>  	case 48:
> @@ -271,6 +305,21 @@ static inline void set_bfs(struct i2s_dai *i2s,
> unsigned bfs) case 16:
>  		mod |= (MOD_BCLK_16FS << bfs_shift);
>  		break;
> +	case 64:
> +		mod |= (EXYNOS5420_MOD_BCLK_64FS << bfs_shift);
> +		break;
> +	case 96:
> +		mod |= (EXYNOS5420_MOD_BCLK_96FS << bfs_shift);
> +		break;
> +	case 128:
> +		mod |= (EXYNOS5420_MOD_BCLK_128FS << bfs_shift);
> +		break;
> +	case 192:
> +		mod |= (EXYNOS5420_MOD_BCLK_192FS << bfs_shift);
> +		break;
> +	case 256:
> +		mod |= (EXYNOS5420_MOD_BCLK_256FS << bfs_shift);
> +		break;
>  	default:
>  		dev_err(&i2s->pdev->dev, "Wrong BCLK Divider!\n");
>  		return;
> @@ -496,10 +545,17 @@ static int i2s_set_fmt(struct snd_soc_dai *dai,
>  {
>  	struct i2s_dai *i2s = to_info(dai);
>  	u32 mod = readl(i2s->addr + I2SMOD);
> -	int lrp_shift = MOD_LRP_SHIFT, sdf_shift = MOD_SDF_SHIFT;
> -	int sdf_mask, lrp_rlow;
> +	int lrp_shift, sdf_shift, sdf_mask, lrp_rlow;
>  	u32 tmp = 0;
> 
> +	if (i2s->quirks & QUIRK_SUPPORTS_TDM) {
> +		lrp_shift = EXYNOS5420_MOD_LRP_SHIFT;
> +		sdf_shift = EXYNOS5420_MOD_SDF_SHIFT;
> +	} else {
> +		lrp_shift = MOD_LRP_SHIFT;
> +		sdf_shift = MOD_SDF_SHIFT;
> +	}
> +
>  	sdf_mask = MOD_SDF_MASK << sdf_shift;
>  	lrp_rlow = MOD_LR_RLOW << lrp_shift;
> 
> @@ -1264,6 +1320,12 @@ static struct samsung_i2s_dai_data i2sv5_dai_type
> = { .quirks = QUIRK_PRI_6CHAN | QUIRK_SEC_DAI | QUIRK_NEED_RSTCLR, };
> 
> +static struct samsung_i2s_dai_data i2sv6_dai_type = {
> +	.dai_type = TYPE_PRI,
> +	.quirks = QUIRK_PRI_6CHAN | QUIRK_SEC_DAI | QUIRK_NEED_RSTCLR |
> +			QUIRK_SUPPORTS_TDM,
> +};
> +
>  static struct samsung_i2s_dai_data samsung_dai_type_sec = {
>  	.dai_type = TYPE_SEC,
>  };
> @@ -1297,6 +1359,9 @@ static const struct of_device_id
> exynos_i2s_match[] = { }, {
>  		.compatible = "samsung,s5pv210-i2s",
>  		.data = &i2sv5_dai_type,
> +	}, {
> +		.compatible = "samsung,exynos5420-i2s",
> +		.data = &i2sv6_dai_type,
>  	},
>  	{},
>  };

This one looks good to me.

Reviewed-by: Tomasz Figa <t.figa@samsung.com>

Best regards,
Tomasz