diff mbox series

ASoC: AMD Renoir - add DMI entry for Lenovo 2020 AMD platforms

Message ID 20210531145502.6079-1-markpearson@lenovo.com (mailing list archive)
State Superseded
Commit 19a0aa9b04c5ab9a063b6ceaf7211ee7d9a9d24d
Headers show
Series ASoC: AMD Renoir - add DMI entry for Lenovo 2020 AMD platforms | expand

Commit Message

Mark Pearson May 31, 2021, 2:55 p.m. UTC
More laptops identified where the AMD ACP bridge needs to be blocked
or the microphone will not work when connected to HDMI.

Use DMI to block the microphone PCM device for these platforms.

Suggested-by: Gabriel Craciunescu <nix.or.die@gmail.com>
Signed-off-by: Mark Pearson <markpearson@lenovo.com>
---
 sound/soc/amd/renoir/rn-pci-acp3x.c | 35 +++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

Comments

Mark Brown June 2, 2021, 4:16 p.m. UTC | #1
On Mon, 31 May 2021 10:55:02 -0400, Mark Pearson wrote:
> More laptops identified where the AMD ACP bridge needs to be blocked
> or the microphone will not work when connected to HDMI.
> 
> Use DMI to block the microphone PCM device for these platforms.

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: AMD Renoir - add DMI entry for Lenovo 2020 AMD platforms
      commit: 19a0aa9b04c5ab9a063b6ceaf7211ee7d9a9d24d

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark
Mark Pearson June 2, 2021, 4:19 p.m. UTC | #2
Hi mark

On 2021-06-02 12:16 p.m., Mark Brown wrote:
> On Mon, 31 May 2021 10:55:02 -0400, Mark Pearson wrote:
>> More laptops identified where the AMD ACP bridge needs to be blocked
>> or the microphone will not work when connected to HDMI.
>>
>> Use DMI to block the microphone PCM device for these platforms.
> 
> Applied to
> 
>    https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
> 
> Thanks!
> 
> [1/1] ASoC: AMD Renoir - add DMI entry for Lenovo 2020 AMD platforms
>       commit: 19a0aa9b04c5ab9a063b6ceaf7211ee7d9a9d24d
> 
> All being well this means that it will be integrated into the linux-next
> tree (usually sometime in the next 24 hours) and sent to Linus during
> the next merge window (or sooner if it is a bug fix), however if
> problems are discovered then the patch may be dropped or reverted.
> 
> You may get further e-mails resulting from automated or manual testing
> and review of the tree, please engage with people reporting problems and
> send followup patches addressing any issues that are reported if needed.
> 
> If any updates are required or you are submitting further changes they
> should be sent as incremental updates against current git, existing
> patches will not be replaced.
> 
> Please add any relevant lists and maintainers to the CCs when replying
> to this mail.
> 
> Thanks,
> Mark
> 
My apologies - I found out just now that this patch causes problems for
the microphone that I'd missed so need to revert it. I was writing the
email to pull the patch when I got your update :(

Sorry for the confusion and churn - I need to go and work with the
firmware team to solve this one.

Mark
Mark Brown June 2, 2021, 4:23 p.m. UTC | #3
On Wed, Jun 02, 2021 at 12:19:25PM -0400, Mark Pearson wrote:
> On 2021-06-02 12:16 p.m., Mark Brown wrote:

> My apologies - I found out just now that this patch causes problems for
> the microphone that I'd missed so need to revert it. I was writing the
> email to pull the patch when I got your update :(

> Sorry for the confusion and churn - I need to go and work with the
> firmware team to solve this one.

OK, please send a patch doing the revert, explaining why it's required.
diff mbox series

Patch

diff --git a/sound/soc/amd/renoir/rn-pci-acp3x.c b/sound/soc/amd/renoir/rn-pci-acp3x.c
index 19438da5dfa5..c9fb1c8fbf8c 100644
--- a/sound/soc/amd/renoir/rn-pci-acp3x.c
+++ b/sound/soc/amd/renoir/rn-pci-acp3x.c
@@ -199,6 +199,41 @@  static const struct dmi_system_id rn_acp_quirk_table[] = {
 			DMI_EXACT_MATCH(DMI_BOARD_NAME, "20NLCTO1WW"),
 		}
 	},
+	{
+		/* Lenovo ThinkPad P14s Gen 1 (20Y1) */
+		.matches = {
+			DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
+			DMI_MATCH(DMI_BOARD_NAME, "20Y1"),
+		}
+	},
+	{
+		/* Lenovo ThinkPad T14s Gen1 */
+		.matches = {
+			DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
+			DMI_MATCH(DMI_BOARD_NAME, "20UH"),
+		}
+	},
+	{
+		/* Lenovo ThinkPad T14s Gen1 Campus */
+		.matches = {
+			DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
+			DMI_MATCH(DMI_BOARD_NAME, "20UJ"),
+		}
+	},
+	{
+		/* Lenovo ThinkPad T14 Gen 1*/
+		.matches = {
+			DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
+			DMI_MATCH(DMI_BOARD_NAME, "20UD"),
+		}
+	},
+	{
+		/* Lenovo ThinkPad X13 Gen 1*/
+		.matches = {
+			DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
+			DMI_MATCH(DMI_BOARD_NAME, "20UF"),
+		}
+	},
 	{}
 };