From fbcef33ad3a7e8eaba293d3b8f68ca1772f35e9f2b194b1cc5b51aa9bbd5704b Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Wed, 18 Jan 2023 13:33:58 +0000 Subject: [PATCH] Accepting request 1059381 from home:tiwai:branches:Kernel:HEAD OBS-URL: https://build.opensuse.org/request/show/1059381 OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-firmware?expand=0&rev=406 --- aliases.list | 26 +++++++++++++------------- fwtopics.py | 2 ++ kernel-firmware.changes | 6 ++++++ kernel-firmware.spec | 29 +++++++++++++++++------------ 4 files changed, 38 insertions(+), 25 deletions(-) diff --git a/aliases.list b/aliases.list index 5bda21e..762894d 100644 --- a/aliases.list +++ b/aliases.list @@ -694,7 +694,7 @@ carl9170: usb:v2019p5304d*dc*dsc*dp*ic*isc*ip*in* carl9170: usb:vCACEp0300d*dc*dsc*dp*ic*isc*ip*in* cassini: pci:v0000100Bd00000035sv*sd*bc*sc*i* cassini: pci:v0000108Ed0000ABBAsv*sd*bc*sc*i* -ccp: acpi*:AMDI0C00:* +ccp: acpi*:AMDI0C00%3A* ccp: of:N*T*Camd,ccp-seattle-v1a ccp: of:N*T*Camd,ccp-seattle-v1aC* ccp: pci:v00001022d00001456sv*sd*bc*sc*i* @@ -5102,12 +5102,12 @@ smc91c92_cs: pcmcia:m0140c000Af*fn*pfn00pa*pb*pc*pd* smc91c92_cs: pcmcia:m016Cc0020f*fn00pfn*pa*pb*pc*pd* smc91c92_cs: pcmcia:m016Cc0023f*fn*pfn*pa*pb*pc*pd* snd_hda_codec_ca0132: hdaudio:v11020011r*a01* -snd_hda_scodec_cs35l41_i2c: acpi*:CLSA0100:* -snd_hda_scodec_cs35l41_i2c: acpi*:CLSA0101:* -snd_hda_scodec_cs35l41_i2c: acpi*:CSC3551:* -snd_hda_scodec_cs35l41_spi: acpi*:CSC3551:* -snd_intel_sst_acpi: acpi*:80860F28:* -snd_intel_sst_acpi: acpi*:808622A8:* +snd_hda_scodec_cs35l41_i2c: acpi*:CLSA0100%3A* +snd_hda_scodec_cs35l41_i2c: acpi*:CLSA0101%3A* +snd_hda_scodec_cs35l41_i2c: acpi*:CSC3551%3A* +snd_hda_scodec_cs35l41_spi: acpi*:CSC3551%3A* +snd_intel_sst_acpi: acpi*:80860F28%3A* +snd_intel_sst_acpi: acpi*:808622A8%3A* snd_intel_sst_acpi: sst snd_korg1212: pci:v000010B5d0000906Dsv*sd*bc*sc*i* snd_maestro3: pci:v0000125Dd00001988sv*sd*bc04sc01i* @@ -5126,16 +5126,16 @@ snd_soc_skl: pci:v00008086d00009D70sv*sd*bc*sc*i* snd_soc_skl: pci:v00008086d00009D71sv*sd*bc*sc*i* snd_soc_skl: pci:v00008086d00009DC8sv*sd*bc*sc*i* snd_soc_skl: pci:v00008086d0000A348sv*sd*bc*sc*i* -snd_soc_sst_acpi: acpi*:INT33C8:* -snd_soc_sst_acpi: acpi*:INT3438:* +snd_soc_sst_acpi: acpi*:INT33C8%3A* +snd_soc_sst_acpi: acpi*:INT3438%3A* snd_sof_mt8186: of:N*T*Cmediatek,mt8186-dsp snd_sof_mt8186: of:N*T*Cmediatek,mt8186-dspC* snd_sof_mt8195: of:N*T*Cmediatek,mt8195-dsp snd_sof_mt8195: of:N*T*Cmediatek,mt8195-dspC* -snd_wavefront: acpi*:CSC0000:* -snd_wavefront: acpi*:CSC0004:* -snd_wavefront: acpi*:CSC0010:* -snd_wavefront: acpi*:PNPB006:* +snd_wavefront: acpi*:CSC0000%3A* +snd_wavefront: acpi*:CSC0004%3A* +snd_wavefront: acpi*:CSC0010%3A* +snd_wavefront: acpi*:PNPB006%3A* snd_wavefront: pnp:dCSC0000* snd_wavefront: pnp:dCSC0004* snd_wavefront: pnp:dCSC0010* diff --git a/fwtopics.py b/fwtopics.py index cb2a35f..0e0fdf6 100644 --- a/fwtopics.py +++ b/fwtopics.py @@ -125,6 +125,8 @@ class FWTopics(object): for f in self.modinfo(ko, 'alias'): if f == '': continue + if re.match(r'^acpi', f): + f = re.sub(r'([^:]*):([^:]*)$', r'\1%3A\2', f) if self.aliases.get(name) == None: self.aliases[name] = [] if not f in self.aliases[name]: diff --git a/kernel-firmware.changes b/kernel-firmware.changes index ed9a700..605302f 100644 --- a/kernel-firmware.changes +++ b/kernel-firmware.changes @@ -1,7 +1,13 @@ +------------------------------------------------------------------- +Wed Jan 18 13:26:13 UTC 2023 - Takashi Iwai + +- Correct alias list for ACPI entries (bsc#1207211) + ------------------------------------------------------------------- Thu Jan 12 10:49:08 UTC 2023 - tiwai@suse.com - Update to version 20230110 (git commit a1ad1d5b5062): + (preparation for jsc#PED-1167, jsc#PED-1169, jsc#PED-1171) * amdgpu: add VCN4.0.4 firmware from amd-5.4 * amdgpu: add SMU13.0.7 firmware from amd-5.4 * amdgpu: add SDMA6.0.2 firmware from amd-5.4 diff --git a/kernel-firmware.spec b/kernel-firmware.spec index e0cf89c..302f58d 100644 --- a/kernel-firmware.spec +++ b/kernel-firmware.spec @@ -2791,6 +2791,8 @@ Supplements: modalias(of:N*T*Camlogic,sm1-vdec) Supplements: modalias(of:N*T*Camlogic,sm1-vdecC*) Supplements: modalias(of:N*T*Cmediatek,mt8173-vpu) Supplements: modalias(of:N*T*Cmediatek,mt8173-vpuC*) +Supplements: modalias(of:N*T*Csamsung,exynos3250-mfc) +Supplements: modalias(of:N*T*Csamsung,exynos3250-mfcC*) Supplements: modalias(of:N*T*Csamsung,exynos5433-mfc) Supplements: modalias(of:N*T*Csamsung,exynos5433-mfcC*) Supplements: modalias(of:N*T*Csamsung,mfc-v10) @@ -3505,7 +3507,7 @@ Conflicts: kernel < 5.3 # make sure we have post-usrmerge filesystem package on TW Conflicts: filesystem < 84 %endif -Supplements: modalias(acpi*:AMDI0C00:*) +Supplements: modalias(acpi*:AMDI0C00%3A*) Supplements: modalias(eisa:sABP7401*) Supplements: modalias(eisa:sABP7501*) Supplements: modalias(of:N*T*Camd,ccp-seattle-v1a) @@ -3532,6 +3534,8 @@ Supplements: modalias(of:N*T*Cinside-secure,safexcel-eip197) Supplements: modalias(of:N*T*Cinside-secure,safexcel-eip197C*) Supplements: modalias(of:N*T*Cinside-secure,safexcel-eip197b) Supplements: modalias(of:N*T*Cinside-secure,safexcel-eip197bC*) +Supplements: modalias(of:N*T*Cinside-secure,safexcel-eip197c-mxl) +Supplements: modalias(of:N*T*Cinside-secure,safexcel-eip197c-mxlC*) Supplements: modalias(of:N*T*Cinside-secure,safexcel-eip197d) Supplements: modalias(of:N*T*Cinside-secure,safexcel-eip197dC*) Supplements: modalias(of:N*T*Cinside-secure,safexcel-eip97) @@ -5459,6 +5463,7 @@ Supplements: modalias(usb:v0BDAp8754d*dc*dsc*dp*ic*isc*ip*in*) Supplements: modalias(usb:v0BDApB720d*dc*dsc*dp*icFFiscFFipFFin*) Supplements: modalias(usb:v0BDApC512d*dc*dsc*dp*ic*isc*ip*in*) Supplements: modalias(usb:v0BDApF179d*dc*dsc*dp*ic*isc*ip*in*) +Supplements: modalias(usb:v0BDApF179d*dc*dsc*dp*icFFiscFFipFFin*) Supplements: modalias(usb:v0BDApFFEFd*dc*dsc*dp*ic*isc*ip*in*) Supplements: modalias(usb:v0CDEp0022d*dc*dsc*dp*ic*isc*ip*in*) Supplements: modalias(usb:v0CDEp0025d*dc*dsc*dp*ic*isc*ip*in*) @@ -6010,17 +6015,17 @@ Conflicts: kernel < 5.3 # make sure we have post-usrmerge filesystem package on TW Conflicts: filesystem < 84 %endif -Supplements: modalias(acpi*:80860F28:*) -Supplements: modalias(acpi*:808622A8:*) -Supplements: modalias(acpi*:CLSA0100:*) -Supplements: modalias(acpi*:CLSA0101:*) -Supplements: modalias(acpi*:CSC0000:*) -Supplements: modalias(acpi*:CSC0004:*) -Supplements: modalias(acpi*:CSC0010:*) -Supplements: modalias(acpi*:CSC3551:*) -Supplements: modalias(acpi*:INT33C8:*) -Supplements: modalias(acpi*:INT3438:*) -Supplements: modalias(acpi*:PNPB006:*) +Supplements: modalias(acpi*:80860F28%3A*) +Supplements: modalias(acpi*:808622A8%3A*) +Supplements: modalias(acpi*:CLSA0100%3A*) +Supplements: modalias(acpi*:CLSA0101%3A*) +Supplements: modalias(acpi*:CSC0000%3A*) +Supplements: modalias(acpi*:CSC0004%3A*) +Supplements: modalias(acpi*:CSC0010%3A*) +Supplements: modalias(acpi*:CSC3551%3A*) +Supplements: modalias(acpi*:INT33C8%3A*) +Supplements: modalias(acpi*:INT3438%3A*) +Supplements: modalias(acpi*:PNPB006%3A*) Supplements: modalias(hdaudio:v11020011r*a01*) Supplements: modalias(of:N*T*Cmediatek,mt8186-dsp) Supplements: modalias(of:N*T*Cmediatek,mt8186-dspC*)