| Message ID | 20240418040240.2337-2-baojun.xu@ti.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | ALSA: hda/tas2781: Add tas2781 driver for SPI. | expand |
On Thu, Apr 18, 2024 at 12:02:37PM +0800, Baojun Xu wrote: > Integrate tas2781 configs for HP Laptops. Every tas2781 in the laptop > will work as a single speaker on SPI bus. The code support realtek as Realtek > the primary codec. ... > sound/pci/hda/Kconfig | 15 +++++++++++++++ > sound/pci/hda/Makefile | 2 ++ Is this correct? You are adding a dead "code", isn't it? ... The rest LGTM.
Hi Andy, Thanks for your feedback. > From: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > Sent: 18 April 2024 19:56 > To: Xu, Baojun > Cc: tiwai@suse.de; robh+dt@kernel.org; lgirdwood@gmail.com; perex@perex.cz; pierre-louis.bossart@linux.intel.com; Lu, Kevin; Ding, Shenghao; Navada Kanyana, Mukund; 13916275206@139.com; P O, Vijeth; Holalu Yogendra, Niranjan; alsa-devel@alsa-project.org; linux-kernel@vger.kernel.org; liam.r.girdwood@intel.com; yung-chuan.liao@linux.intel.com; broonie@kernel.org; soyer@irl.hu > Subject: [EXTERNAL] Re: [PATCH v3 1/3] ALSA: hda/tas2781: Modification for add tas2781 driver for SPI > > On Thu, Apr 18, 2024 at 12: 02: 37PM +0800, Baojun Xu wrote: > Integrate tas2781 configs for HP Laptops. Every tas2781 in the laptop > will work as a single speaker on SPI bus. The code support realtek as Realtek > the primary codec. > ZjQcmQRYFpfptBannerStart > This message was sent from outside of Texas Instruments. > Do not click links or open attachments unless you recognize the source of this email and know the content is safe. If you wish to report this message to IT Security, please forward the message as an attachment to phishing@list.ti.com > > ZjQcmQRYFpfptBannerEnd > > On Thu, Apr 18, 2024 at 12:02:37PM +0800, Baojun Xu wrote: > > Integrate tas2781 configs for HP Laptops. Every tas2781 in the laptop > > will work as a single speaker on SPI bus. The code support realtek as > > Realtek > > > the primary codec. > > ... > > > sound/pci/hda/Kconfig | 15 +++++++++++++++ > > sound/pci/hda/Makefile | 2 ++ > > Is this correct? You are adding a dead "code", isn't it? > What's mean "dead code"? After add CONFIG_SND_HDA_SCODEC_TAS2781_SPI=m in my config file, the whole patch code has worked. > ... > > The rest LGTM. > > -- > With Best Regards, > Andy Shevchenko > Best Regards Jim
On Thu, Apr 25, 2024 at 07:54:41AM +0000, Xu, Baojun wrote: > > From: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > > Sent: 18 April 2024 19:56 > > On Thu, Apr 18, 2024 at 12: 02: 37PM +0800, Baojun Xu wrote: > > On Thu, Apr 18, 2024 at 12:02:37PM +0800, Baojun Xu wrote: ... > > > sound/pci/hda/Kconfig | 15 +++++++++++++++ > > > sound/pci/hda/Makefile | 2 ++ > > > > Is this correct? You are adding a dead "code", isn't it? > > What's mean "dead code"? After add CONFIG_SND_HDA_SCODEC_TAS2781_SPI=m > in my config file, the whole patch code has worked. Is that file already in the repository? If not, I don't see it in this patch either --> dead code.
Hi Andy Thanks for your comments, answer in line: > From: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > Sent: 02 May 2024 18:22 > To: Xu, Baojun > Cc: tiwai@suse.de; robh+dt@kernel.org; lgirdwood@gmail.com; perex@perex.cz; pierre-louis.bossart@linux.intel.com; Lu, Kevin; Ding, Shenghao; Navada Kanyana, Mukund; 13916275206@139.com; P O, Vijeth; Holalu Yogendra, Niranjan; alsa-devel@alsa-project.org; linux-kernel@vger.kernel.org; liam.r.girdwood@intel.com; yung-chuan.liao@linux.intel.com; broonie@kernel.org; soyer@irl.hu > Subject: Re: [EXTERNAL] Re: [PATCH v3 1/3] ALSA: hda/tas2781: Modification for add tas2781 driver for SPI > > On Thu, Apr 25, 2024 at 07: 54: 41AM +0000, Xu, Baojun wrote: > > From: Andy Shevchenko <andriy. shevchenko@ linux. intel. com> > > Sent: 18 April 2024 19: 56 > > On Thu, Apr 18, 2024 at 12: 02: 37PM +0800, Baojun Xu wrote: > ZjQcmQRYFpfptBannerStart > This message was sent from outside of Texas Instruments. > Do not click links or open attachments unless you recognize the source of this email and know the content is safe. If you wish to report this message to IT Security, please forward the message as an attachment to phishing@list.ti.com > > ZjQcmQRYFpfptBannerEnd > > On Thu, Apr 25, 2024 at 07:54:41AM +0000, Xu, Baojun wrote: > > > From: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > > > Sent: 18 April 2024 19:56 > > > On Thu, Apr 18, 2024 at 12: 02: 37PM +0800, Baojun Xu wrote: > > > On Thu, Apr 18, 2024 at 12:02:37PM +0800, Baojun Xu wrote: > > ... > > > > > sound/pci/hda/Kconfig | 15 +++++++++++++++ > > > > sound/pci/hda/Makefile | 2 ++ > > > > > Is this correct? You are adding a dead "code", isn't it? > > > > What's mean "dead code"? After add CONFIG_SND_HDA_SCODEC_TAS2781_SPI=m > > in my config file, the whole patch code has worked. > > Is that file already in the repository? > If not, I don't see it in this patch either --> dead code. When I integrated CONFIG_SND_HDA_SCODEC_TAS2781_SPI and compiled the whole kernel, it used to popup the following message for TAS2781 SPI module in first compile: Build TAS2781 HD-audio side codec support for SPI Bus (SND_HDA_SCODEC_TAS2781_SPI) [N/m/?] (NEW) Normally, selected m. And TAS2781 SPI module would be compiled. > > -- > With Best Regards, > Andy Shevchenko > >
On Mon, May 06, 2024 at 07:44:05AM +0000, Xu, Baojun wrote: > > From: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > > Sent: 02 May 2024 18:22 > > To: Xu, Baojun > > On Thu, Apr 25, 2024 at 07: 54: 41AM +0000, Xu, Baojun wrote: > > On Thu, Apr 25, 2024 at 07:54:41AM +0000, Xu, Baojun wrote: > > > > From: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > > > > Sent: 18 April 2024 19:56 > > > > On Thu, Apr 18, 2024 at 12: 02: 37PM +0800, Baojun Xu wrote: > > > > On Thu, Apr 18, 2024 at 12:02:37PM +0800, Baojun Xu wrote: ... > > > > > sound/pci/hda/Kconfig | 15 +++++++++++++++ > > > > > sound/pci/hda/Makefile | 2 ++ > > > > > > > Is this correct? You are adding a dead "code", isn't it? > > > > > > What's mean "dead code"? After add CONFIG_SND_HDA_SCODEC_TAS2781_SPI=m > > > in my config file, the whole patch code has worked. > > > > Is that file already in the repository? > > If not, I don't see it in this patch either --> dead code. > > When I integrated CONFIG_SND_HDA_SCODEC_TAS2781_SPI and compiled the whole kernel, > it used to popup the following message for TAS2781 SPI module in first compile: > > Build TAS2781 HD-audio side codec support for SPI Bus (SND_HDA_SCODEC_TAS2781_SPI) [N/m/?] (NEW) > > Normally, selected m. And TAS2781 SPI module would be compiled. The above is a dead code if this SPI driver is not yet in the kernel. Is it? What is the path to it in the current kernel source tree?
On Mon, 06 May 2024 09:44:05 +0200, Xu, Baojun wrote: > > Hi Andy > > Thanks for your comments, answer in line: > > > From: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > > Sent: 02 May 2024 18:22 > > To: Xu, Baojun > > Cc: tiwai@suse.de; robh+dt@kernel.org; lgirdwood@gmail.com; perex@perex.cz; pierre-louis.bossart@linux.intel.com; Lu, Kevin; Ding, Shenghao; Navada Kanyana, Mukund; 13916275206@139.com; P O, Vijeth; Holalu Yogendra, Niranjan; alsa-devel@alsa-project.org; linux-kernel@vger.kernel.org; liam.r.girdwood@intel.com; yung-chuan.liao@linux.intel.com; broonie@kernel.org; soyer@irl.hu > > Subject: Re: [EXTERNAL] Re: [PATCH v3 1/3] ALSA: hda/tas2781: Modification for add tas2781 driver for SPI > > > > On Thu, Apr 25, 2024 at 07: 54: 41AM +0000, Xu, Baojun wrote: > > From: Andy Shevchenko <andriy. shevchenko@ linux. intel. com> > > Sent: 18 April 2024 19: 56 > > On Thu, Apr 18, 2024 at 12: 02: 37PM +0800, Baojun Xu wrote: > > ZjQcmQRYFpfptBannerStart > > This message was sent from outside of Texas Instruments. > > Do not click links or open attachments unless you recognize the source of this email and know the content is safe. If you wish to report this message to IT Security, please forward the message as an attachment to phishing@list.ti.com > > > > ZjQcmQRYFpfptBannerEnd > > > > On Thu, Apr 25, 2024 at 07:54:41AM +0000, Xu, Baojun wrote: > > > > From: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > > > > Sent: 18 April 2024 19:56 > > > > On Thu, Apr 18, 2024 at 12: 02: 37PM +0800, Baojun Xu wrote: > > > > On Thu, Apr 18, 2024 at 12:02:37PM +0800, Baojun Xu wrote: > > > > ... > > > > > > > sound/pci/hda/Kconfig | 15 +++++++++++++++ > > > > > sound/pci/hda/Makefile | 2 ++ > > > > > > > Is this correct? You are adding a dead "code", isn't it? > > > > > > What's mean "dead code"? After add CONFIG_SND_HDA_SCODEC_TAS2781_SPI=m > > > in my config file, the whole patch code has worked. > > > > Is that file already in the repository? > > If not, I don't see it in this patch either --> dead code. > > When I integrated CONFIG_SND_HDA_SCODEC_TAS2781_SPI and compiled the whole kernel, > it used to popup the following message for TAS2781 SPI module in first compile: > > Build TAS2781 HD-audio side codec support for SPI Bus (SND_HDA_SCODEC_TAS2781_SPI) [N/m/?] (NEW) > > Normally, selected m. And TAS2781 SPI module would be compiled. At each patch / commit, the build must be kept successful. In your case, in the patch 1, you introduced the new driver stuff to Kconfig and Makefile while there is no actual code for that yet (which will be added in later patches). This breaks the build at this commit (lacking tas2781_hda_spi.c and co), and it's not acceptable. You have to split patches in sensible manners; those to be logically split, and yet they must not break builds. thanks, Takashi
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index d1464324de95..371a42a13fc8 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -1765,6 +1765,7 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) {"CSC3557", }, {"INT33FE", }, {"INT3515", }, + {"TXNW2781", }, /* Non-conforming _HID for Cirrus Logic already released */ {"CLSA0100", }, {"CLSA0101", }, diff --git a/drivers/platform/x86/serial-multi-instantiate.c b/drivers/platform/x86/serial-multi-instantiate.c index 97b9c6392230..2dcf66bb6216 100644 --- a/drivers/platform/x86/serial-multi-instantiate.c +++ b/drivers/platform/x86/serial-multi-instantiate.c @@ -368,6 +368,15 @@ static const struct smi_node cs35l57_hda = { .bus_type = SMI_AUTO_DETECT, }; +static const struct smi_node tas2781_hda = { + .instances = { + { "tas2781-hda", IRQ_RESOURCE_AUTO, 0 }, + { "tas2781-hda", IRQ_RESOURCE_AUTO, 0 }, + {} + }, + .bus_type = SMI_AUTO_DETECT, +}; + /* * Note new device-ids must also be added to ignore_serial_bus_ids in * drivers/acpi/scan.c: acpi_device_enumeration_by_parent(). @@ -380,6 +389,7 @@ static const struct acpi_device_id smi_acpi_ids[] = { { "CSC3556", (unsigned long)&cs35l56_hda }, { "CSC3557", (unsigned long)&cs35l57_hda }, { "INT3515", (unsigned long)&int3515_data }, + { "TXNW2781", (unsigned long)&tas2781_hda }, /* Non-conforming _HID for Cirrus Logic already released */ { "CLSA0100", (unsigned long)&cs35l41_hda }, { "CLSA0101", (unsigned long)&cs35l41_hda }, diff --git a/sound/pci/hda/Kconfig b/sound/pci/hda/Kconfig index f806636242ee..f25ad9ea51d9 100644 --- a/sound/pci/hda/Kconfig +++ b/sound/pci/hda/Kconfig @@ -202,6 +202,21 @@ config SND_HDA_SCODEC_TAS2781_I2C comment "Set to Y if you want auto-loading the side codec driver" depends on SND_HDA=y && SND_HDA_SCODEC_TAS2781_I2C=m +config SND_HDA_SCODEC_TAS2781_SPI + tristate "Build TAS2781 HD-audio side codec support for SPI Bus" + depends on SPI_MASTER + depends on ACPI + depends on EFI + depends on SND_SOC + select SND_HDA_SCODEC_COMPONENT + select CRC32_SARWATE + help + Say Y or M here to include TAS2781 SPI HD-audio side codec support + in snd-hda-intel driver, such as ALC287. + +comment "Set to Y if you want auto-loading the side codec driver" + depends on SND_HDA=y && SND_HDA_SCODEC_TAS2781_SPI=m + config SND_HDA_CODEC_REALTEK tristate "Build Realtek HD-audio codec support" select SND_HDA_GENERIC diff --git a/sound/pci/hda/Makefile b/sound/pci/hda/Makefile index 13e04e1f65de..ce5da317578f 100644 --- a/sound/pci/hda/Makefile +++ b/sound/pci/hda/Makefile @@ -39,6 +39,7 @@ snd-hda-scodec-cs35l56-spi-objs := cs35l56_hda_spi.o snd-hda-cs-dsp-ctls-objs := hda_cs_dsp_ctl.o snd-hda-scodec-component-objs := hda_component.o snd-hda-scodec-tas2781-i2c-objs := tas2781_hda_i2c.o +snd-hda-scodec-tas2781-spi-y := tas2781_hda_spi.o tas2781_spi_fwlib.o # common driver obj-$(CONFIG_SND_HDA) := snd-hda-codec.o @@ -70,6 +71,7 @@ obj-$(CONFIG_SND_HDA_SCODEC_CS35L56_SPI) += snd-hda-scodec-cs35l56-spi.o obj-$(CONFIG_SND_HDA_CS_DSP_CONTROLS) += snd-hda-cs-dsp-ctls.o obj-$(CONFIG_SND_HDA_SCODEC_COMPONENT) += snd-hda-scodec-component.o obj-$(CONFIG_SND_HDA_SCODEC_TAS2781_I2C) += snd-hda-scodec-tas2781-i2c.o +obj-$(CONFIG_SND_HDA_SCODEC_TAS2781_SPI) += snd-hda-scodec-tas2781-spi.o # this must be the last entry after codec drivers; # otherwise the codec patches won't be hooked before the PCI probe diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index cdcb28aa9d7b..558c48cc53a1 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -6895,6 +6895,11 @@ static void cs35l56_fixup_spi_four(struct hda_codec *cdc, const struct hda_fixup comp_generic_fixup(cdc, action, "spi", "CSC3556", "-%s:00-cs35l56-hda.%d", 4); } +static void tas2781_fixup_spi_two(struct hda_codec *cdc, const struct hda_fixup *fix, int action) +{ + comp_generic_fixup(cdc, action, "spi", "TXNW2781", "-%s:00-tas2781-hda.%d", 2); +} + static void alc285_fixup_asus_ga403u(struct hda_codec *cdc, const struct hda_fixup *fix, int action) { /* @@ -7451,6 +7456,7 @@ enum { ALC236_FIXUP_DELL_DUAL_CODECS, ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI, ALC287_FIXUP_TAS2781_I2C, + ALC245_FIXUP_TAS2781_SPI_2_HP_GPIO_LED, ALC287_FIXUP_YOGA7_14ARB7_I2C, ALC245_FIXUP_HP_MUTE_LED_COEFBIT, ALC245_FIXUP_HP_X360_MUTE_LEDS, @@ -9614,6 +9620,12 @@ static const struct hda_fixup alc269_fixups[] = { .chained = true, .chain_id = ALC285_FIXUP_THINKPAD_HEADSET_JACK, }, + [ALC245_FIXUP_TAS2781_SPI_2_HP_GPIO_LED] = { + .type = HDA_FIXUP_FUNC, + .v.func = tas2781_fixup_spi_two, + .chained = true, + .chain_id = ALC285_FIXUP_HP_GPIO_LED, + }, [ALC287_FIXUP_YOGA7_14ARB7_I2C] = { .type = HDA_FIXUP_FUNC, .v.func = yoga7_14arb7_fixup_i2c, @@ -10038,6 +10050,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x103c, 0x8b8d, "HP", ALC236_FIXUP_HP_GPIO_LED), SND_PCI_QUIRK(0x103c, 0x8b8f, "HP", ALC245_FIXUP_CS35L41_SPI_4_HP_GPIO_LED), SND_PCI_QUIRK(0x103c, 0x8b92, "HP", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED), + SND_PCI_QUIRK(0x103c, 0x8b93, "HP", ALC245_FIXUP_TAS2781_SPI_2_HP_GPIO_LED), SND_PCI_QUIRK(0x103c, 0x8b96, "HP", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF), SND_PCI_QUIRK(0x103c, 0x8b97, "HP", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF), SND_PCI_QUIRK(0x103c, 0x8bdd, "HP Envy 17", ALC287_FIXUP_CS35L41_I2C_2),
Integrate tas2781 configs for HP Laptops. Every tas2781 in the laptop will work as a single speaker on SPI bus. The code support realtek as the primary codec. Signed-off-by: Baojun Xu <baojun.xu@ti.com> --- v3: - Move HID up to above /* Non-conforming _HID ... */ in scan.c, for avoid misunderstanding. - Move HID up to above /* Non-conforming _HID ... */ in serial-multi-instantiate.c, for avoid misunderstanding. - Change objs to y for snd-hda-scodec-tas2781-spi- in Makefile. --- drivers/acpi/scan.c | 1 + drivers/platform/x86/serial-multi-instantiate.c | 10 ++++++++++ sound/pci/hda/Kconfig | 15 +++++++++++++++ sound/pci/hda/Makefile | 2 ++ sound/pci/hda/patch_realtek.c | 13 +++++++++++++ 5 files changed, 41 insertions(+)