Discussion:
[PATCH v3 1/2] ASoC: fsl_ssi: Remove unneeded 'i2s-slave' property
Fabio Estevam
2014-09-30 02:25:29 UTC
Permalink
From: Fabio Estevam <***@freescale.com>

There is no need to use 'i2s-slave' property, since master/slave configuration
are passed via machine layer.

This change does not break existing users because they do check for slave
mode inside sound/soc/fsl/mpc8610_hpcd.c/p1022_ds.c/p1022_rdk.c

Signed-off-by: Fabio Estevam <***@freescale.com>
Acked-by: Timur Tabi <***@tabi.org>
---
Changes since v2:
- Added Timur's Ack and CC the alsa-list
Changes since v1:
- None

sound/soc/fsl/fsl_ssi.c | 3 ---
1 file changed, 3 deletions(-)

diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index 2fc3e66..0e7ce50 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -1285,9 +1285,6 @@ static int fsl_ssi_probe(struct platform_device *pdev)
if (sprop) {
if (!strcmp(sprop, "ac97-slave"))
ssi_private->dai_fmt = SND_SOC_DAIFMT_AC97;
- else if (!strcmp(sprop, "i2s-slave"))
- ssi_private->dai_fmt = SND_SOC_DAIFMT_I2S |
- SND_SOC_DAIFMT_CBM_CFM;
}

ssi_private->use_dma = !of_property_read_bool(np,
--
1.9.1
Fabio Estevam
2014-09-30 02:25:30 UTC
Permalink
From: Fabio Estevam <***@freescale.com>

The fsl_ssi driver only checks for the ac97 mode property, so remove the unused
ones.

Suggested-by: Nicolin Chen <***@gmail.com>
Signed-off-by: Fabio Estevam <***@freescale.com>
Acked-by: Timur Tabi <***@tabi.org>
---
Changes since v2:
- Added Timur's Ack and CC the alsa-list
Changes since v1:
- Newly introduced in this series

Documentation/devicetree/bindings/sound/fsl,ssi.txt | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/Documentation/devicetree/bindings/sound/fsl,ssi.txt b/Documentation/devicetree/bindings/sound/fsl,ssi.txt
index 3aa4a8f..5b76be4 100644
--- a/Documentation/devicetree/bindings/sound/fsl,ssi.txt
+++ b/Documentation/devicetree/bindings/sound/fsl,ssi.txt
@@ -58,13 +58,7 @@ Optional properties:
Documentation/devicetree/bindings/dma/dma.txt.
- dma-names: Two dmas have to be defined, "tx" and "rx", if fsl,imx-fiq
is not defined.
-- fsl,mode: The operating mode for the SSI interface.
- "i2s-slave" - I2S mode, SSI is clock slave
- "i2s-master" - I2S mode, SSI is clock master
- "lj-slave" - left-justified mode, SSI is clock slave
- "lj-master" - l.j. mode, SSI is clock master
- "rj-slave" - right-justified mode, SSI is clock slave
- "rj-master" - r.j., SSI is clock master
+- fsl,mode: The operating mode for the AC97 interface only.
"ac97-slave" - AC97 mode, SSI is clock slave
"ac97-master" - AC97 mode, SSI is clock master
--
1.9.1
Mark Brown
2014-09-30 12:43:17 UTC
Permalink
Post by Fabio Estevam
There is no need to use 'i2s-slave' property, since master/slave configuration
are passed via machine layer.
Applied both, thanks.

Loading...