1 files changed, 17 insertions, 17 deletions
diff --git a/sound/soc/at91/at91rm9200-i2s.c b/sound/soc/at91/at91rm9200-i2s.c
index 91f1daa44f19..8c4d3b999053 100644
--- a/sound/soc/at91/at91rm9200-i2s.c
+++ b/sound/soc/at91/at91rm9200-i2s.c
@@ -52,9 +52,9 @@ static struct snd_soc_dai_mode at91rm9200_i2s[] = {
        /* 8k: BCLK = (MCLK/10) = (60MHz/50) = 1.2MHz */
        {
-                .fmt = AT91RM9200_I2S_DAIFMT, 
+                .fmt = AT91RM9200_I2S_DAIFMT,
-                .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE, 
+                .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE,
-                .pcmrate = SNDRV_PCM_RATE_8000, 
+                .pcmrate = SNDRV_PCM_RATE_8000,
                .pcmdir = AT91RM9200_I2S_DIR,
                .flags = SND_SOC_DAI_BFS_DIV,
                .fs = 1500,
@@ -63,38 +63,38 @@ static struct snd_soc_dai_mode at91rm9200_i2s[] = {
        },
        /* 16k: BCLK = (MCLK/3) ~= (60MHz/14) = 4.285714MHz */
-        { 
+        {
                .fmt = AT91RM9200_I2S_DAIFMT,
                .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE,
                .pcmrate = SNDRV_PCM_RATE_16000,
                .pcmdir = AT91RM9200_I2S_DIR,
-                .flags = SND_SOC_DAI_BFS_DIV, 
+                .flags = SND_SOC_DAI_BFS_DIV,
-                .fs = 750, 
+                .fs = 750,
                .bfs = SND_SOC_FSBD(3),
                .flags (7 << 16 | 133),
        },
        /* 24k: BCLK = (MCLK/10) = (60MHz/50) = 1.2MHz */
-        { 
+        {
                .fmt = AT91RM9200_I2S_DAIFMT,
-                .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE, 
+                .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE,
-                .pcmrate = SNDRV_PCM_RATE_22050, 
+                .pcmrate = SNDRV_PCM_RATE_22050,
                .pcmdir = AT91RM9200_I2S_DIR,
-                .flags = SND_SOC_DAI_BFS_DIV, 
+                .flags = SND_SOC_DAI_BFS_DIV,
-                .fs = 500, 
+                .fs = 500,
-                .bfs = SND_SOC_FSBD(10), 
+                .bfs = SND_SOC_FSBD(10),
                .priv = (25 << 16 | 24),
        },
        /* 48kHz: BCLK = (MCLK/5) ~= (60MHz/26) = 2.3076923MHz */
-        { 
+        {
                .fmt = AT91RM9200_I2S_DAIFMT,
                .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE,
-                .pcmrate = SNDRV_PCM_RATE_48000, 
+                .pcmrate = SNDRV_PCM_RATE_48000,
                .pcmdir = AT91RM9200_I2S_DIR,
-                .flags = SND_SOC_DAI_BFS_DIV, 
+                .flags = SND_SOC_DAI_BFS_DIV,
-                .fs = 250, 
+                .fs = 250,
-                .bfs SND_SOC_FSBD(5), 
+                .bfs SND_SOC_FSBD(5),
                .priv = (13 << 16 | 23),
        },
 };

diff --git a/sound/soc/at91/at91rm9200-i2s.c b/sound/soc/at91/at91rm9200-i2s.c index 91f1daa44f19..8c4d3b999053 100644 --- a/sound/soc/at91/at91rm9200-i2s.c +++ b/sound/soc/at91/at91rm9200-i2s.c
@@ -52,9 +52,9 @@ static struct snd_soc_dai_mode at91rm9200_i2s[] = {
52		52
53	/* 8k: BCLK = (MCLK/10) = (60MHz/50) = 1.2MHz */	53	/* 8k: BCLK = (MCLK/10) = (60MHz/50) = 1.2MHz */
54	{	54	{
55	.fmt = AT91RM9200_I2S_DAIFMT,	55	.fmt = AT91RM9200_I2S_DAIFMT,
56	.pcmfmt = SNDRV_PCM_FMTBIT_S16_LE,	56	.pcmfmt = SNDRV_PCM_FMTBIT_S16_LE,
57	.pcmrate = SNDRV_PCM_RATE_8000,	57	.pcmrate = SNDRV_PCM_RATE_8000,
58	.pcmdir = AT91RM9200_I2S_DIR,	58	.pcmdir = AT91RM9200_I2S_DIR,
59	.flags = SND_SOC_DAI_BFS_DIV,	59	.flags = SND_SOC_DAI_BFS_DIV,
60	.fs = 1500,	60	.fs = 1500,
@@ -63,38 +63,38 @@ static struct snd_soc_dai_mode at91rm9200_i2s[] = {
63	},	63	},
64		64
65	/* 16k: BCLK = (MCLK/3) ~= (60MHz/14) = 4.285714MHz */	65	/* 16k: BCLK = (MCLK/3) ~= (60MHz/14) = 4.285714MHz */
66	{	66	{
67	.fmt = AT91RM9200_I2S_DAIFMT,	67	.fmt = AT91RM9200_I2S_DAIFMT,
68	.pcmfmt = SNDRV_PCM_FMTBIT_S16_LE,	68	.pcmfmt = SNDRV_PCM_FMTBIT_S16_LE,
69	.pcmrate = SNDRV_PCM_RATE_16000,	69	.pcmrate = SNDRV_PCM_RATE_16000,
70	.pcmdir = AT91RM9200_I2S_DIR,	70	.pcmdir = AT91RM9200_I2S_DIR,
71	.flags = SND_SOC_DAI_BFS_DIV,	71	.flags = SND_SOC_DAI_BFS_DIV,
72	.fs = 750,	72	.fs = 750,
73	.bfs = SND_SOC_FSBD(3),	73	.bfs = SND_SOC_FSBD(3),
74	.flags (7 << 16 \| 133),	74	.flags (7 << 16 \| 133),
75	},	75	},
76		76
77	/* 24k: BCLK = (MCLK/10) = (60MHz/50) = 1.2MHz */	77	/* 24k: BCLK = (MCLK/10) = (60MHz/50) = 1.2MHz */
78	{	78	{
79	.fmt = AT91RM9200_I2S_DAIFMT,	79	.fmt = AT91RM9200_I2S_DAIFMT,
80	.pcmfmt = SNDRV_PCM_FMTBIT_S16_LE,	80	.pcmfmt = SNDRV_PCM_FMTBIT_S16_LE,
81	.pcmrate = SNDRV_PCM_RATE_22050,	81	.pcmrate = SNDRV_PCM_RATE_22050,
82	.pcmdir = AT91RM9200_I2S_DIR,	82	.pcmdir = AT91RM9200_I2S_DIR,
83	.flags = SND_SOC_DAI_BFS_DIV,	83	.flags = SND_SOC_DAI_BFS_DIV,
84	.fs = 500,	84	.fs = 500,
85	.bfs = SND_SOC_FSBD(10),	85	.bfs = SND_SOC_FSBD(10),
86	.priv = (25 << 16 \| 24),	86	.priv = (25 << 16 \| 24),
87	},	87	},
88		88
89	/* 48kHz: BCLK = (MCLK/5) ~= (60MHz/26) = 2.3076923MHz */	89	/* 48kHz: BCLK = (MCLK/5) ~= (60MHz/26) = 2.3076923MHz */
90	{	90	{
91	.fmt = AT91RM9200_I2S_DAIFMT,	91	.fmt = AT91RM9200_I2S_DAIFMT,
92	.pcmfmt = SNDRV_PCM_FMTBIT_S16_LE,	92	.pcmfmt = SNDRV_PCM_FMTBIT_S16_LE,
93	.pcmrate = SNDRV_PCM_RATE_48000,	93	.pcmrate = SNDRV_PCM_RATE_48000,
94	.pcmdir = AT91RM9200_I2S_DIR,	94	.pcmdir = AT91RM9200_I2S_DIR,
95	.flags = SND_SOC_DAI_BFS_DIV,	95	.flags = SND_SOC_DAI_BFS_DIV,
96	.fs = 250,	96	.fs = 250,
97	.bfs SND_SOC_FSBD(5),	97	.bfs SND_SOC_FSBD(5),
98	.priv = (13 << 16 \| 23),	98	.priv = (13 << 16 \| 23),
99	},	99	},
100	};	100	};