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: codecs: Update device_id tables for Realtek

Merge series from Cezary Rojewski <cezary.rojewski@intel.com>:

The series aims to streamline the formatting for ACPI IDs so that a
single pattern can be used to identify the device.

Work implicitly suggested by Andy Shevchenko - reading and learning from
number of his reviews on the Linux mailing lists.

Several formats do exists, however, after technical discussion PCI-based
format has been selected as the recommended one. For Realtek devices, it
is going to be 10ECxxxx where 10EC unambiguously identifies Realtek
company whereas the following 4 hexes specify the PART_ID i.e.: the
device.

While at it, there shall be no comma after the terminator entry and
initializing fields with 0 for statically defined structs is redundant.

Mark Brown 24056de9 ee3cce59

+80 -76
+3 -3
sound/soc/codecs/rt1011.c
··· 2192 2192 #if defined(CONFIG_OF) 2193 2193 static const struct of_device_id rt1011_of_match[] = { 2194 2194 { .compatible = "realtek,rt1011", }, 2195 - {}, 2195 + { } 2196 2196 }; 2197 2197 MODULE_DEVICE_TABLE(of, rt1011_of_match); 2198 2198 #endif 2199 2199 2200 2200 #ifdef CONFIG_ACPI 2201 2201 static const struct acpi_device_id rt1011_acpi_match[] = { 2202 - {"10EC1011", 0,}, 2203 - {}, 2202 + { "10EC1011" }, 2203 + { } 2204 2204 }; 2205 2205 MODULE_DEVICE_TABLE(acpi, rt1011_acpi_match); 2206 2206 #endif
+3 -3
sound/soc/codecs/rt1015.c
··· 1105 1105 #if defined(CONFIG_OF) 1106 1106 static const struct of_device_id rt1015_of_match[] = { 1107 1107 { .compatible = "realtek,rt1015", }, 1108 - {}, 1108 + { } 1109 1109 }; 1110 1110 MODULE_DEVICE_TABLE(of, rt1015_of_match); 1111 1111 #endif 1112 1112 1113 1113 #ifdef CONFIG_ACPI 1114 1114 static const struct acpi_device_id rt1015_acpi_match[] = { 1115 - {"10EC1015", 0,}, 1116 - {}, 1115 + { "10EC1015" }, 1116 + { } 1117 1117 }; 1118 1118 MODULE_DEVICE_TABLE(acpi, rt1015_acpi_match); 1119 1119 #endif
+3 -3
sound/soc/codecs/rt1016.c
··· 616 616 #if defined(CONFIG_OF) 617 617 static const struct of_device_id rt1016_of_match[] = { 618 618 { .compatible = "realtek,rt1016", }, 619 - {}, 619 + { } 620 620 }; 621 621 MODULE_DEVICE_TABLE(of, rt1016_of_match); 622 622 #endif 623 623 624 624 #ifdef CONFIG_ACPI 625 625 static const struct acpi_device_id rt1016_acpi_match[] = { 626 - {"10EC1016", 0,}, 627 - {}, 626 + { "10EC1016" }, 627 + { } 628 628 }; 629 629 MODULE_DEVICE_TABLE(acpi, rt1016_acpi_match); 630 630 #endif
+3 -3
sound/soc/codecs/rt1019.c
··· 547 547 548 548 static const struct of_device_id rt1019_of_match[] __maybe_unused = { 549 549 { .compatible = "realtek,rt1019", }, 550 - {}, 550 + { } 551 551 }; 552 552 MODULE_DEVICE_TABLE(of, rt1019_of_match); 553 553 554 554 #ifdef CONFIG_ACPI 555 555 static const struct acpi_device_id rt1019_acpi_match[] = { 556 - { "10EC1019", 0}, 557 - { }, 556 + { "10EC1019" }, 557 + { } 558 558 }; 559 559 MODULE_DEVICE_TABLE(acpi, rt1019_acpi_match); 560 560 #endif
+4 -4
sound/soc/codecs/rt1305.c
··· 966 966 static const struct of_device_id rt1305_of_match[] = { 967 967 { .compatible = "realtek,rt1305", }, 968 968 { .compatible = "realtek,rt1306", }, 969 - {}, 969 + { } 970 970 }; 971 971 MODULE_DEVICE_TABLE(of, rt1305_of_match); 972 972 #endif 973 973 974 974 #ifdef CONFIG_ACPI 975 975 static const struct acpi_device_id rt1305_acpi_match[] = { 976 - {"10EC1305", 0,}, 977 - {"10EC1306", 0,}, 978 - {}, 976 + { "10EC1305" }, 977 + { "10EC1306" }, 978 + { } 979 979 }; 980 980 MODULE_DEVICE_TABLE(acpi, rt1305_acpi_match); 981 981 #endif
+3 -3
sound/soc/codecs/rt1308.c
··· 781 781 #ifdef CONFIG_OF 782 782 static const struct of_device_id rt1308_of_match[] = { 783 783 { .compatible = "realtek,rt1308", }, 784 - { }, 784 + { } 785 785 }; 786 786 MODULE_DEVICE_TABLE(of, rt1308_of_match); 787 787 #endif 788 788 789 789 #ifdef CONFIG_ACPI 790 790 static const struct acpi_device_id rt1308_acpi_match[] = { 791 - { "10EC1308", 0, }, 792 - { }, 791 + { "10EC1308" }, 792 + { } 793 793 }; 794 794 MODULE_DEVICE_TABLE(acpi, rt1308_acpi_match); 795 795 #endif
+3 -3
sound/soc/codecs/rt1318.c
··· 1147 1147 1148 1148 static const struct of_device_id rt1318_of_match[] = { 1149 1149 { .compatible = "realtek,rt1318", }, 1150 - {}, 1150 + { } 1151 1151 }; 1152 1152 MODULE_DEVICE_TABLE(of, rt1318_of_match); 1153 1153 1154 1154 #ifdef CONFIG_ACPI 1155 1155 static const struct acpi_device_id rt1318_acpi_match[] = { 1156 - { "10EC1318", 0}, 1157 - { }, 1156 + { "10EC1318" }, 1157 + { } 1158 1158 }; 1159 1159 MODULE_DEVICE_TABLE(acpi, rt1318_acpi_match); 1160 1160 #endif
+4 -4
sound/soc/codecs/rt274.c
··· 1091 1091 #ifdef CONFIG_OF 1092 1092 static const struct of_device_id rt274_of_match[] = { 1093 1093 {.compatible = "realtek,rt274"}, 1094 - {}, 1094 + { } 1095 1095 }; 1096 1096 MODULE_DEVICE_TABLE(of, rt274_of_match); 1097 1097 #endif ··· 1104 1104 1105 1105 #ifdef CONFIG_ACPI 1106 1106 static const struct acpi_device_id rt274_acpi_match[] = { 1107 - { "10EC0274", 0 }, 1108 - { "INT34C2", 0 }, 1109 - {}, 1107 + { "10EC0274" }, 1108 + { "INT34C2" }, 1109 + { } 1110 1110 }; 1111 1111 MODULE_DEVICE_TABLE(acpi, rt274_acpi_match); 1112 1112 #endif
+3 -2
sound/soc/codecs/rt286.c
··· 1083 1083 1084 1084 #ifdef CONFIG_ACPI 1085 1085 static const struct acpi_device_id rt286_acpi_match[] = { 1086 - { "INT343A", 0 }, 1087 - {}, 1086 + { "10EC0286" }, 1087 + { "INT343A" }, 1088 + { } 1088 1089 }; 1089 1090 MODULE_DEVICE_TABLE(acpi, rt286_acpi_match); 1090 1091 #endif
+3 -2
sound/soc/codecs/rt298.c
··· 1144 1144 1145 1145 #ifdef CONFIG_ACPI 1146 1146 static const struct acpi_device_id rt298_acpi_match[] = { 1147 - { "INT343A", 0 }, 1148 - {}, 1147 + { "10EC0298" }, 1148 + { "INT343A" }, 1149 + { } 1149 1150 }; 1150 1151 MODULE_DEVICE_TABLE(acpi, rt298_acpi_match); 1151 1152 #endif
+3 -3
sound/soc/codecs/rt5514.c
··· 1206 1206 #if defined(CONFIG_OF) 1207 1207 static const struct of_device_id rt5514_of_match[] = { 1208 1208 { .compatible = "realtek,rt5514", }, 1209 - {}, 1209 + { } 1210 1210 }; 1211 1211 MODULE_DEVICE_TABLE(of, rt5514_of_match); 1212 1212 #endif 1213 1213 1214 1214 #ifdef CONFIG_ACPI 1215 1215 static const struct acpi_device_id rt5514_acpi_match[] = { 1216 - { "10EC5514", 0}, 1217 - {}, 1216 + { "10EC5514" }, 1217 + { } 1218 1218 }; 1219 1219 MODULE_DEVICE_TABLE(acpi, rt5514_acpi_match); 1220 1220 #endif
+7 -7
sound/soc/codecs/rt5640.c
··· 2963 2963 static const struct of_device_id rt5640_of_match[] = { 2964 2964 { .compatible = "realtek,rt5639", }, 2965 2965 { .compatible = "realtek,rt5640", }, 2966 - {}, 2966 + { } 2967 2967 }; 2968 2968 MODULE_DEVICE_TABLE(of, rt5640_of_match); 2969 2969 #endif 2970 2970 2971 2971 #ifdef CONFIG_ACPI 2972 2972 static const struct acpi_device_id rt5640_acpi_match[] = { 2973 - { "INT33CA", 0 }, 2974 - { "10EC3276", 0 }, 2975 - { "10EC5640", 0 }, 2976 - { "10EC5642", 0 }, 2977 - { "INTCCFFD", 0 }, 2978 - { }, 2973 + { "10EC3276" }, 2974 + { "10EC5640" }, 2975 + { "10EC5642" }, 2976 + { "INT33CA" }, 2977 + { "INTCCFFD" }, 2978 + { } 2979 2979 }; 2980 2980 MODULE_DEVICE_TABLE(acpi, rt5640_acpi_match); 2981 2981 #endif
+6 -6
sound/soc/codecs/rt5645.c
··· 3660 3660 3661 3661 #ifdef CONFIG_ACPI 3662 3662 static const struct acpi_device_id rt5645_acpi_match[] = { 3663 - { "10EC5645", 0 }, 3664 - { "10EC5648", 0 }, 3665 - { "10EC5650", 0 }, 3666 - { "10EC5640", 0 }, 3667 - { "10EC3270", 0 }, 3668 - {}, 3663 + { "10EC3270" }, 3664 + { "10EC5640" }, 3665 + { "10EC5645" }, 3666 + { "10EC5648" }, 3667 + { "10EC5650" }, 3668 + { } 3669 3669 }; 3670 3670 MODULE_DEVICE_TABLE(acpi, rt5645_acpi_match); 3671 3671 #endif
+4 -4
sound/soc/codecs/rt5651.c
··· 2184 2184 #if defined(CONFIG_OF) 2185 2185 static const struct of_device_id rt5651_of_match[] = { 2186 2186 { .compatible = "realtek,rt5651", }, 2187 - {}, 2187 + { } 2188 2188 }; 2189 2189 MODULE_DEVICE_TABLE(of, rt5651_of_match); 2190 2190 #endif 2191 2191 2192 2192 #ifdef CONFIG_ACPI 2193 2193 static const struct acpi_device_id rt5651_acpi_match[] = { 2194 - { "10EC5651", 0 }, 2195 - { "10EC5640", 0 }, 2196 - { }, 2194 + { "10EC5640" }, 2195 + { "10EC5651" }, 2196 + { } 2197 2197 }; 2198 2198 MODULE_DEVICE_TABLE(acpi, rt5651_acpi_match); 2199 2199 #endif
+4 -4
sound/soc/codecs/rt5659.c
··· 4315 4315 static const struct of_device_id rt5659_of_match[] = { 4316 4316 { .compatible = "realtek,rt5658", }, 4317 4317 { .compatible = "realtek,rt5659", }, 4318 - { }, 4318 + { } 4319 4319 }; 4320 4320 MODULE_DEVICE_TABLE(of, rt5659_of_match); 4321 4321 #endif 4322 4322 4323 4323 #ifdef CONFIG_ACPI 4324 4324 static const struct acpi_device_id rt5659_acpi_match[] = { 4325 - { "10EC5658", 0, }, 4326 - { "10EC5659", 0, }, 4327 - { }, 4325 + { "10EC5658" }, 4326 + { "10EC5659" }, 4327 + { } 4328 4328 }; 4329 4329 MODULE_DEVICE_TABLE(acpi, rt5659_acpi_match); 4330 4330 #endif
+4 -4
sound/soc/codecs/rt5660.c
··· 1232 1232 #ifdef CONFIG_OF 1233 1233 static const struct of_device_id rt5660_of_match[] = { 1234 1234 { .compatible = "realtek,rt5660", }, 1235 - {}, 1235 + { } 1236 1236 }; 1237 1237 MODULE_DEVICE_TABLE(of, rt5660_of_match); 1238 1238 #endif 1239 1239 1240 1240 #ifdef CONFIG_ACPI 1241 1241 static const struct acpi_device_id rt5660_acpi_match[] = { 1242 - { "10EC5660", 0 }, 1243 - { "10EC3277", 0 }, 1244 - { }, 1242 + { "10EC3277" }, 1243 + { "10EC5660" }, 1244 + { } 1245 1245 }; 1246 1246 MODULE_DEVICE_TABLE(acpi, rt5660_acpi_match); 1247 1247 #endif
+3 -3
sound/soc/codecs/rt5663.c
··· 3315 3315 #if defined(CONFIG_OF) 3316 3316 static const struct of_device_id rt5663_of_match[] = { 3317 3317 { .compatible = "realtek,rt5663", }, 3318 - {}, 3318 + { } 3319 3319 }; 3320 3320 MODULE_DEVICE_TABLE(of, rt5663_of_match); 3321 3321 #endif 3322 3322 3323 3323 #ifdef CONFIG_ACPI 3324 3324 static const struct acpi_device_id rt5663_acpi_match[] = { 3325 - { "10EC5663", 0}, 3326 - {}, 3325 + { "10EC5663" }, 3326 + { } 3327 3327 }; 3328 3328 MODULE_DEVICE_TABLE(acpi, rt5663_acpi_match); 3329 3329 #endif
+4 -4
sound/soc/codecs/rt5665.c
··· 4949 4949 static const struct of_device_id rt5665_of_match[] = { 4950 4950 {.compatible = "realtek,rt5665"}, 4951 4951 {.compatible = "realtek,rt5666"}, 4952 - {}, 4952 + { } 4953 4953 }; 4954 4954 MODULE_DEVICE_TABLE(of, rt5665_of_match); 4955 4955 #endif 4956 4956 4957 4957 #ifdef CONFIG_ACPI 4958 4958 static const struct acpi_device_id rt5665_acpi_match[] = { 4959 - {"10EC5665", 0,}, 4960 - {"10EC5666", 0,}, 4961 - {}, 4959 + { "10EC5665" }, 4960 + { "10EC5666" }, 4961 + { } 4962 4962 }; 4963 4963 MODULE_DEVICE_TABLE(acpi, rt5665_acpi_match); 4964 4964 #endif
+3 -3
sound/soc/codecs/rt5668.c
··· 2598 2598 #ifdef CONFIG_OF 2599 2599 static const struct of_device_id rt5668_of_match[] = { 2600 2600 {.compatible = "realtek,rt5668b"}, 2601 - {}, 2601 + { } 2602 2602 }; 2603 2603 MODULE_DEVICE_TABLE(of, rt5668_of_match); 2604 2604 #endif 2605 2605 2606 2606 #ifdef CONFIG_ACPI 2607 2607 static const struct acpi_device_id rt5668_acpi_match[] = { 2608 - {"10EC5668", 0,}, 2609 - {}, 2608 + { "10EC5668" }, 2609 + { } 2610 2610 }; 2611 2611 MODULE_DEVICE_TABLE(acpi, rt5668_acpi_match); 2612 2612 #endif
+4 -4
sound/soc/codecs/rt5670.c
··· 2880 2880 2881 2881 #ifdef CONFIG_ACPI 2882 2882 static const struct acpi_device_id rt5670_acpi_match[] = { 2883 - { "10EC5670", 0}, 2884 - { "10EC5672", 0}, 2885 - { "10EC5640", 0}, /* quirk */ 2886 - { }, 2883 + { "10EC5640" }, /* quirk */ 2884 + { "10EC5670" }, 2885 + { "10EC5672" }, 2886 + { } 2887 2887 }; 2888 2888 MODULE_DEVICE_TABLE(acpi, rt5670_acpi_match); 2889 2889 #endif
+2 -1
sound/soc/codecs/rt5677-spi.c
··· 617 617 618 618 #ifdef CONFIG_ACPI 619 619 static const struct acpi_device_id rt5677_spi_acpi_id[] = { 620 - { "RT5677AA", 0 }, 620 + { "10EC5677" }, 621 + { "RT5677AA" }, 621 622 { } 622 623 }; 623 624 MODULE_DEVICE_TABLE(acpi, rt5677_spi_acpi_id);
+1
sound/soc/codecs/rt5677.c
··· 5201 5201 MODULE_DEVICE_TABLE(of, rt5677_of_match); 5202 5202 5203 5203 static const struct acpi_device_id rt5677_acpi_match[] = { 5204 + { "10EC5677", RT5677 }, 5204 5205 { "RT5677CE", RT5677 }, 5205 5206 { } 5206 5207 };
+3 -3
sound/soc/codecs/rt5682-i2c.c
··· 313 313 314 314 static const struct of_device_id rt5682_of_match[] = { 315 315 {.compatible = "realtek,rt5682i"}, 316 - {}, 316 + { } 317 317 }; 318 318 MODULE_DEVICE_TABLE(of, rt5682_of_match); 319 319 320 320 static const struct acpi_device_id rt5682_acpi_match[] = { 321 - {"10EC5682", 0,}, 322 - {}, 321 + { "10EC5682" }, 322 + { } 323 323 }; 324 324 MODULE_DEVICE_TABLE(acpi, rt5682_acpi_match); 325 325