| Message ID | 20250220112643.3813295-21-cezary.rojewski@intel.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | ASoC: codecs: Update device_id tables for Realtek drivers | expand |
> -----Original Message----- > From: Cezary Rojewski <cezary.rojewski@intel.com> > Sent: Thursday, February 20, 2025 7:27 PM > To: broonie@kernel.org > Cc: tiwai@suse.com; perex@perex.cz; amadeuszx.slawinski@linux.intel.com; > linux-sound@vger.kernel.org; Oder Chiou <oder_chiou@realtek.com>; > Flove(HsinFu) <flove@realtek.com>; andriy.shevchenko@linux.intel.com; > Cezary Rojewski <cezary.rojewski@intel.com> > Subject: [PATCH 20/24] ASoC: codecs: rt1015p: Update definition of device_id > tables > > > External mail : This email originated from outside the organization. Do not > reply, click links, or open attachments unless you recognize the sender and > know the content is safe. > > > > Follow PCI-based format (10ECxxxx) for ACPI IDs by adding relevant > entries to the existing table. > > While at it, there shall be no comma after the terminator entry and > initializing fields with 0 for statically defined structs is redundant. > > Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com> > --- > sound/soc/codecs/rt1015p.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/sound/soc/codecs/rt1015p.c b/sound/soc/codecs/rt1015p.c > index 44e7fe3c32da..33917438196f 100644 > --- a/sound/soc/codecs/rt1015p.c > +++ b/sound/soc/codecs/rt1015p.c > @@ -133,9 +133,11 @@ MODULE_DEVICE_TABLE(of, rt1015p_device_id); > > #ifdef CONFIG_ACPI > static const struct acpi_device_id rt1015p_acpi_match[] = { > - { "RTL1015", 0}, > - { "RTL1019", 0}, > - { }, > + { "RTL1015" }, > + { "RTL1019" }, > + { "10EC1015" }, > + { "10EC1019" }, > + {} There are different settings for RTL1015, RTL1019, 10EC1015, and 10EC1019. RTL1015 and RTL1019 are used for powering up and down via the GPIO. 10EC1015 and 10EC1019 are used for the I2C-controlled driver. Therefore 10EC1015 and 10EC1019 should be removed. > }; > MODULE_DEVICE_TABLE(acpi, rt1015p_acpi_match); > #endif > -- > 2.25.1
diff --git a/sound/soc/codecs/rt1015p.c b/sound/soc/codecs/rt1015p.c index 44e7fe3c32da..33917438196f 100644 --- a/sound/soc/codecs/rt1015p.c +++ b/sound/soc/codecs/rt1015p.c @@ -133,9 +133,11 @@ MODULE_DEVICE_TABLE(of, rt1015p_device_id); #ifdef CONFIG_ACPI static const struct acpi_device_id rt1015p_acpi_match[] = { - { "RTL1015", 0}, - { "RTL1019", 0}, - { }, + { "RTL1015" }, + { "RTL1019" }, + { "10EC1015" }, + { "10EC1019" }, + {} }; MODULE_DEVICE_TABLE(acpi, rt1015p_acpi_match); #endif
Follow PCI-based format (10ECxxxx) for ACPI IDs by adding relevant entries to the existing table. While at it, there shall be no comma after the terminator entry and initializing fields with 0 for statically defined structs is redundant. Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com> --- sound/soc/codecs/rt1015p.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)