tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

ASoC: Intel: sof_rt5682: reorder quirk table

Reorder the entries in quirk table to group entries with same platform.

Signed-off-by: Terry Cheong <htcheong@chromium.org>
Signed-off-by: Mac Chiang <mac.chiang@intel.com>
Link: https://lore.kernel.org/r/20230616063617.25900-1-mac.chiang@intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Terry Cheong and committed by
Mark Brown 1f583cbd 1afc383a

+28 -28
+28 -28
sound/soc/intel/boards/sof_rt5682.c
··· 981 981 .name = "sof_rt5682", 982 982 }, 983 983 { 984 - .name = "tgl_mx98357_rt5682", 984 + .name = "cml_rt1015_rt5682", 985 985 .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN | 986 + SOF_RT5682_MCLK_24MHZ | 986 987 SOF_RT5682_SSP_CODEC(0) | 987 988 SOF_SPEAKER_AMP_PRESENT | 988 - SOF_RT5682_SSP_AMP(1) | 989 - SOF_RT5682_NUM_HDMIDEV(4) | 990 - SOF_BT_OFFLOAD_SSP(2) | 991 - SOF_SSP_BT_OFFLOAD_PRESENT), 989 + SOF_RT1015_SPEAKER_AMP_PRESENT | 990 + SOF_RT5682_SSP_AMP(1)), 992 991 }, 993 992 { 994 993 .name = "jsl_rt5682_rt1015", ··· 999 1000 SOF_RT5682_SSP_AMP(1)), 1000 1001 }, 1001 1002 { 1002 - .name = "tgl_mx98373_rt5682", 1003 - .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN | 1004 - SOF_RT5682_SSP_CODEC(0) | 1005 - SOF_SPEAKER_AMP_PRESENT | 1006 - SOF_MAX98373_SPEAKER_AMP_PRESENT | 1007 - SOF_RT5682_SSP_AMP(1) | 1008 - SOF_RT5682_NUM_HDMIDEV(4) | 1009 - SOF_BT_OFFLOAD_SSP(2) | 1010 - SOF_SSP_BT_OFFLOAD_PRESENT), 1011 - }, 1012 - { 1013 1003 .name = "jsl_rt5682_mx98360", 1014 1004 .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN | 1015 1005 SOF_RT5682_MCLK_24MHZ | ··· 1008 1020 SOF_RT5682_SSP_AMP(1)), 1009 1021 }, 1010 1022 { 1011 - .name = "cml_rt1015_rt5682", 1023 + .name = "jsl_rt5682_rt1015p", 1012 1024 .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN | 1013 1025 SOF_RT5682_MCLK_24MHZ | 1014 1026 SOF_RT5682_SSP_CODEC(0) | 1015 1027 SOF_SPEAKER_AMP_PRESENT | 1016 - SOF_RT1015_SPEAKER_AMP_PRESENT | 1028 + SOF_RT1015P_SPEAKER_AMP_PRESENT | 1017 1029 SOF_RT5682_SSP_AMP(1)), 1030 + }, 1031 + { 1032 + .name = "jsl_rt5682", 1033 + .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN | 1034 + SOF_RT5682_MCLK_24MHZ | 1035 + SOF_RT5682_SSP_CODEC(0)), 1036 + }, 1037 + { 1038 + .name = "tgl_mx98357_rt5682", 1039 + .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN | 1040 + SOF_RT5682_SSP_CODEC(0) | 1041 + SOF_SPEAKER_AMP_PRESENT | 1042 + SOF_RT5682_SSP_AMP(1) | 1043 + SOF_RT5682_NUM_HDMIDEV(4) | 1044 + SOF_BT_OFFLOAD_SSP(2) | 1045 + SOF_SSP_BT_OFFLOAD_PRESENT), 1018 1046 }, 1019 1047 { 1020 1048 .name = "tgl_rt1011_rt5682", ··· 1044 1040 SOF_SSP_BT_OFFLOAD_PRESENT), 1045 1041 }, 1046 1042 { 1047 - .name = "jsl_rt5682_rt1015p", 1043 + .name = "tgl_mx98373_rt5682", 1048 1044 .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN | 1049 - SOF_RT5682_MCLK_24MHZ | 1050 1045 SOF_RT5682_SSP_CODEC(0) | 1051 1046 SOF_SPEAKER_AMP_PRESENT | 1052 - SOF_RT1015P_SPEAKER_AMP_PRESENT | 1053 - SOF_RT5682_SSP_AMP(1)), 1047 + SOF_MAX98373_SPEAKER_AMP_PRESENT | 1048 + SOF_RT5682_SSP_AMP(1) | 1049 + SOF_RT5682_NUM_HDMIDEV(4) | 1050 + SOF_BT_OFFLOAD_SSP(2) | 1051 + SOF_SSP_BT_OFFLOAD_PRESENT), 1054 1052 }, 1055 1053 { 1056 1054 .name = "adl_mx98373_rt5682", ··· 1154 1148 SOF_MAX98360A_SPEAKER_AMP_PRESENT | 1155 1149 SOF_RT5682_SSP_AMP(1) | 1156 1150 SOF_RT5682_NUM_HDMIDEV(4)), 1157 - }, 1158 - { 1159 - .name = "jsl_rt5682", 1160 - .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN | 1161 - SOF_RT5682_MCLK_24MHZ | 1162 - SOF_RT5682_SSP_CODEC(0)), 1163 1151 }, 1164 1152 { } 1165 1153 };