Skip to content

Commit d8638b6

Browse files
committed
Merge pull request #55 from abradianu/odroid-3.8.y
ASoC: HKDK : max98090: Update master clock frequencies
2 parents 1c093bb + 68eabe6 commit d8638b6

File tree

1 file changed

+12
-22
lines changed

1 file changed

+12
-22
lines changed

sound/soc/samsung/hkdk_max98090.c

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ static int odroid_hw_params(struct snd_pcm_substream *substream,
5454
struct snd_soc_pcm_runtime *rtd = substream->private_data;
5555
struct snd_soc_dai *codec_dai = rtd->codec_dai;
5656
struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
57-
int bfs, psr, rfs, ret;
57+
int bfs, psr, ret;
5858
unsigned long rclk;
5959
switch (params_format(params)) {
6060
case SNDRV_PCM_FORMAT_U24:
@@ -69,43 +69,33 @@ static int odroid_hw_params(struct snd_pcm_substream *substream,
6969
return -EINVAL;
7070
}
7171
switch (params_rate(params)) {
72+
case 8000:
73+
case 12000:
7274
case 16000:
73-
case 22050:
7475
case 24000:
7576
case 32000:
76-
case 44100:
7777
case 48000:
78-
case 88200:
78+
case 64000:
7979
case 96000:
8080
if (bfs == 48)
81-
rfs = 384;
81+
rclk = 18432000;
8282
else
83-
rfs = 256;
84-
break;
85-
case 64000:
86-
rfs = 384;
83+
rclk = 12288000;
8784
break;
88-
case 8000:
8985
case 11025:
90-
case 12000:
86+
case 22050:
87+
case 44100:
88+
case 88200:
9189
if (bfs == 48)
92-
rfs = 768;
90+
rclk = 16934400;
9391
else
94-
rfs = 512;
92+
rclk = 11289600;
9593
break;
9694
default:
9795
return -EINVAL;
9896
}
99-
rclk = params_rate(params) * rfs;
97+
10098
switch (rclk) {
101-
case 4096000:
102-
case 5644800:
103-
case 6144000:
104-
case 8467200:
105-
case 9216000:
106-
psr = 8;
107-
break;
108-
case 8192000:
10999
case 11289600:
110100
case 12288000:
111101
case 16934400:

0 commit comments

Comments
 (0)