Skip to content

Commit ab617db

Browse files
committed
ASoC: cs43130: Fix numerator/denominator mixup
In converting to using the standard u16_fract type, commit [1] made the obvious mistake and failed to take account of the difference in numerator and denominator ordering, breaking all uses of the cs43130 codec. Fix it. [1] commit e14bd35 ("ASoC: cs43130: Re-use generic struct u16_fract") Fixes: e14bd35 ("ASoC: cs43130: Re-use generic struct u16_fract") Signed-off-by: Phil Elwell <[email protected]>
1 parent bd8e59b commit ab617db

File tree

1 file changed

+71
-71
lines changed

1 file changed

+71
-71
lines changed

sound/soc/codecs/cs43130.h

Lines changed: 71 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -381,89 +381,89 @@ struct cs43130_clk_gen {
381381

382382
/* frm_size = 16 */
383383
static const struct cs43130_clk_gen cs43130_16_clk_gen[] = {
384-
{ 22579200, 32000, .v = { 441, 10, }, },
385-
{ 22579200, 44100, .v = { 32, 1, }, },
386-
{ 22579200, 48000, .v = { 147, 5, }, },
387-
{ 22579200, 88200, .v = { 16, 1, }, },
388-
{ 22579200, 96000, .v = { 147, 10, }, },
389-
{ 22579200, 176400, .v = { 8, 1, }, },
390-
{ 22579200, 192000, .v = { 147, 20, }, },
391-
{ 22579200, 352800, .v = { 4, 1, }, },
392-
{ 22579200, 384000, .v = { 147, 40, }, },
393-
{ 24576000, 32000, .v = { 48, 1, }, },
394-
{ 24576000, 44100, .v = { 5120, 147, }, },
395-
{ 24576000, 48000, .v = { 32, 1, }, },
396-
{ 24576000, 88200, .v = { 2560, 147, }, },
397-
{ 24576000, 96000, .v = { 16, 1, }, },
398-
{ 24576000, 176400, .v = { 1280, 147, }, },
399-
{ 24576000, 192000, .v = { 8, 1, }, },
400-
{ 24576000, 352800, .v = { 640, 147, }, },
401-
{ 24576000, 384000, .v = { 4, 1, }, },
384+
{ 22579200, 32000, .v = { 10, 441, }, },
385+
{ 22579200, 44100, .v = { 1, 32, }, },
386+
{ 22579200, 48000, .v = { 5, 147, }, },
387+
{ 22579200, 88200, .v = { 1, 16, }, },
388+
{ 22579200, 96000, .v = { 10, 147, }, },
389+
{ 22579200, 176400, .v = { 1, 8, }, },
390+
{ 22579200, 192000, .v = { 20, 147, }, },
391+
{ 22579200, 352800, .v = { 1, 4, }, },
392+
{ 22579200, 384000, .v = { 40, 147, }, },
393+
{ 24576000, 32000, .v = { 1, 48, }, },
394+
{ 24576000, 44100, .v = { 147, 5120, }, },
395+
{ 24576000, 48000, .v = { 1, 32, }, },
396+
{ 24576000, 88200, .v = { 147, 2560, }, },
397+
{ 24576000, 96000, .v = { 1, 16, }, },
398+
{ 24576000, 176400, .v = { 147, 1280, }, },
399+
{ 24576000, 192000, .v = { 1, 8, }, },
400+
{ 24576000, 352800, .v = { 147, 640, }, },
401+
{ 24576000, 384000, .v = { 1, 4, }, },
402402
};
403403

404404
/* frm_size = 32 */
405405
static const struct cs43130_clk_gen cs43130_32_clk_gen[] = {
406-
{ 22579200, 32000, .v = { 441, 20, }, },
407-
{ 22579200, 44100, .v = { 16, 1, }, },
408-
{ 22579200, 48000, .v = { 147, 10, }, },
409-
{ 22579200, 88200, .v = { 8, 1, }, },
410-
{ 22579200, 96000, .v = { 147, 20, }, },
411-
{ 22579200, 176400, .v = { 4, 1, }, },
412-
{ 22579200, 192000, .v = { 147, 40, }, },
413-
{ 22579200, 352800, .v = { 2, 1, }, },
414-
{ 22579200, 384000, .v = { 147, 80, }, },
415-
{ 24576000, 32000, .v = { 24, 1, }, },
416-
{ 24576000, 44100, .v = { 2560, 147, }, },
417-
{ 24576000, 48000, .v = { 16, 1, }, },
418-
{ 24576000, 88200, .v = { 1280, 147, }, },
419-
{ 24576000, 96000, .v = { 8, 1, }, },
420-
{ 24576000, 176400, .v = { 640, 147, }, },
421-
{ 24576000, 192000, .v = { 4, 1, }, },
422-
{ 24576000, 352800, .v = { 320, 147, }, },
423-
{ 24576000, 384000, .v = { 2, 1, }, },
406+
{ 22579200, 32000, .v = { 20, 441, }, },
407+
{ 22579200, 44100, .v = { 1, 16, }, },
408+
{ 22579200, 48000, .v = { 10, 147, }, },
409+
{ 22579200, 88200, .v = { 1, 8, }, },
410+
{ 22579200, 96000, .v = { 20, 147, }, },
411+
{ 22579200, 176400, .v = { 1, 4, }, },
412+
{ 22579200, 192000, .v = { 40, 147, }, },
413+
{ 22579200, 352800, .v = { 1, 2, }, },
414+
{ 22579200, 384000, .v = { 80, 147, }, },
415+
{ 24576000, 32000, .v = { 1, 24, }, },
416+
{ 24576000, 44100, .v = { 147, 2560, }, },
417+
{ 24576000, 48000, .v = { 1, 16, }, },
418+
{ 24576000, 88200, .v = { 147, 1280, }, },
419+
{ 24576000, 96000, .v = { 1, 8, }, },
420+
{ 24576000, 176400, .v = { 147, 640, }, },
421+
{ 24576000, 192000, .v = { 1, 4, }, },
422+
{ 24576000, 352800, .v = { 147, 320, }, },
423+
{ 24576000, 384000, .v = { 1, 2, }, },
424424
};
425425

426426
/* frm_size = 48 */
427427
static const struct cs43130_clk_gen cs43130_48_clk_gen[] = {
428-
{ 22579200, 32000, .v = { 147, 100, }, },
429-
{ 22579200, 44100, .v = { 32, 3, }, },
430-
{ 22579200, 48000, .v = { 49, 5, }, },
431-
{ 22579200, 88200, .v = { 16, 3, }, },
432-
{ 22579200, 96000, .v = { 49, 10, }, },
433-
{ 22579200, 176400, .v = { 8, 3, }, },
434-
{ 22579200, 192000, .v = { 49, 20, }, },
435-
{ 22579200, 352800, .v = { 4, 3, }, },
436-
{ 22579200, 384000, .v = { 49, 40, }, },
437-
{ 24576000, 32000, .v = { 16, 1, }, },
438-
{ 24576000, 44100, .v = { 5120, 441, }, },
439-
{ 24576000, 48000, .v = { 32, 3, }, },
440-
{ 24576000, 88200, .v = { 2560, 441, }, },
441-
{ 24576000, 96000, .v = { 16, 3, }, },
442-
{ 24576000, 176400, .v = { 1280, 441, }, },
443-
{ 24576000, 192000, .v = { 8, 3, }, },
444-
{ 24576000, 352800, .v = { 640, 441, }, },
445-
{ 24576000, 384000, .v = { 4, 3, }, },
428+
{ 22579200, 32000, .v = { 100, 147, }, },
429+
{ 22579200, 44100, .v = { 3, 32, }, },
430+
{ 22579200, 48000, .v = { 5, 49, }, },
431+
{ 22579200, 88200, .v = { 3, 16, }, },
432+
{ 22579200, 96000, .v = { 10, 49, }, },
433+
{ 22579200, 176400, .v = { 3, 8, }, },
434+
{ 22579200, 192000, .v = { 20, 49, }, },
435+
{ 22579200, 352800, .v = { 3, 4, }, },
436+
{ 22579200, 384000, .v = { 40, 49, }, },
437+
{ 24576000, 32000, .v = { 1, 16, }, },
438+
{ 24576000, 44100, .v = { 441, 5120, }, },
439+
{ 24576000, 48000, .v = { 3, 32, }, },
440+
{ 24576000, 88200, .v = { 441, 2560, }, },
441+
{ 24576000, 96000, .v = { 3, 16, }, },
442+
{ 24576000, 176400, .v = { 441, 1280, }, },
443+
{ 24576000, 192000, .v = { 3, 8, }, },
444+
{ 24576000, 352800, .v = { 441, 640, }, },
445+
{ 24576000, 384000, .v = { 3, 4, }, },
446446
};
447447

448448
/* frm_size = 64 */
449449
static const struct cs43130_clk_gen cs43130_64_clk_gen[] = {
450-
{ 22579200, 32000, .v = { 441, 40, }, },
451-
{ 22579200, 44100, .v = { 8, 1, }, },
452-
{ 22579200, 48000, .v = { 147, 20, }, },
453-
{ 22579200, 88200, .v = { 4, 1, }, },
454-
{ 22579200, 96000, .v = { 147, 40, }, },
455-
{ 22579200, 176400, .v = { 2, 1, }, },
456-
{ 22579200, 192000, .v = { 147, 80, }, },
457-
{ 22579200, 352800, .v = { 1, 1, }, },
458-
{ 24576000, 32000, .v = { 12, 1, }, },
459-
{ 24576000, 44100, .v = { 1280, 147, }, },
460-
{ 24576000, 48000, .v = { 8, 1, }, },
461-
{ 24576000, 88200, .v = { 640, 147, }, },
462-
{ 24576000, 96000, .v = { 4, 1, }, },
463-
{ 24576000, 176400, .v = { 320, 147, }, },
464-
{ 24576000, 192000, .v = { 2, 1, }, },
465-
{ 24576000, 352800, .v = { 160, 147, }, },
466-
{ 24576000, 384000, .v = { 1, 1, }, },
450+
{ 22579200, 32000, .v = { 40, 441, }, },
451+
{ 22579200, 44100, .v = { 1, 8, }, },
452+
{ 22579200, 48000, .v = { 20, 147, }, },
453+
{ 22579200, 88200, .v = { 1, 4, }, },
454+
{ 22579200, 96000, .v = { 40, 147, }, },
455+
{ 22579200, 176400, .v = { 1, 2, }, },
456+
{ 22579200, 192000, .v = { 80, 147, }, },
457+
{ 22579200, 352800, .v = { 1, 1, }, },
458+
{ 24576000, 32000, .v = { 1, 12, }, },
459+
{ 24576000, 44100, .v = { 147, 1280, }, },
460+
{ 24576000, 48000, .v = { 1, 8, }, },
461+
{ 24576000, 88200, .v = { 147, 640, }, },
462+
{ 24576000, 96000, .v = { 1, 4, }, },
463+
{ 24576000, 176400, .v = { 147, 320, }, },
464+
{ 24576000, 192000, .v = { 1, 2, }, },
465+
{ 24576000, 352800, .v = { 147, 160, }, },
466+
{ 24576000, 384000, .v = { 1, 1, }, },
467467
};
468468

469469
struct cs43130_bitwidth_map {

0 commit comments

Comments
 (0)