From patchwork Wed Mar 13 01:58:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiawei Wang X-Patchwork-Id: 13590852 Received: from out-171.mta1.migadu.com (out-171.mta1.migadu.com [95.215.58.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9A53FAD21 for ; Wed, 13 Mar 2024 02:00:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710295208; cv=none; b=L8of1+4CoTDer98To8dq77FUOXbMtvN3BKE6Khfc16ukzqvg2MmU4lAPhvUN5+3y7RWEgSEbR8taxH/e9/q5V6uG+l8PI88dyvFDj3iShK1JV8vRs/1dI6GFvlYoNQDv41rQru+fh9E8KNeM8FkpDFIvKW9eTiFgREhFhzn/m8A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710295208; c=relaxed/simple; bh=APTa/8Fhdr3cFmkiQSmv4Cee2OoQldd7OYx7dwB+9ts=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=EXE9ZbxO0vTxNfMeETGX9/2NzW0RwzSwFNoy5RMrtpB5h0vVtBcxZdfUde2XJoAlP3BzUVS4EzsrrAVhWSjHSZ4mGhVayWxnVid2IkEyrozT6j834PDETRGWECe/4wbRYN8LXuHCHjCoCg1AC5Uvzisx4NlZenKL7UBcqlDOcGk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=jwang.link; spf=pass smtp.mailfrom=jwang.link; dkim=pass (2048-bit key) header.d=jwang.link header.i=@jwang.link header.b=IhD+07LW; arc=none smtp.client-ip=95.215.58.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=jwang.link Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=jwang.link Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=jwang.link header.i=@jwang.link header.b="IhD+07LW" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jwang.link; s=key1; t=1710295200; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HzuNIXQtvXRiIKbJM4BL72narhpcWuIm7CcPK5xNzYk=; b=IhD+07LWuE8n0mizyzeA9pjIMSYV5hJtfcE3qngeG3/I3wtWC06UZecV8Q0IdEZA7htUxs jR4Zjqozvk0QV4SzZn4GzGCFQFoYpw0Zpc1C+++QCjQUNdBbIdNHx6JYbgy2wZK/xj+GA1 +SYd4AAWg2fkjWj4QTAkHj4D8mvGKVpEuNlZip8sUJN8zELOv7b4GiPCPIMUAkFxoz7pZE wK8UerrX0KFagT28X4IvRNFJ+FSHZ0ie+pwJMqjFWGeciKzqpyoUR09ly5evNfqbB0CdAV r6UgiLDFmSMnDD4tiZ2HbP/2XvHCtpjXDkJtOwJo1IRab0xsfvK+Fy/FWH/FrQ== From: Jiawei Wang To: broonie@kernel.org Cc: linux-sound@vger.kernel.org, me@jwang.link, sashal@kernel.org, vijendar.mukunda@amd.com, Liam Girdwood , Jaroslav Kysela , Takashi Iwai , Mario Limonciello , Jeremy Soller , August Wikerfors , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v3 1/2] ASoC: amd: yc: Revert "Fix non-functional mic on Lenovo 21J2" Date: Wed, 13 Mar 2024 09:58:52 +0800 Message-Id: <20240313015853.3573242-2-me@jwang.link> In-Reply-To: <20240313015853.3573242-1-me@jwang.link> References: <20240313015853.3573242-1-me@jwang.link> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT This reverts commit ed00a6945dc32462c2d3744a3518d2316da66fcc, which added a quirk entry to enable the Yellow Carp (YC) driver for the Lenovo 21J2 laptop. Although the microphone functioned with the YC driver, it resulted in incorrect driver usage. The Lenovo 21J2 is not a Yellow Carp platform, but a Pink Sardine platform, which already has an upstreamed driver. The microphone on the Lenovo 21J2 operates correctly with the CONFIG_SND_SOC_AMD_PS flag enabled and does not require the quirk entry. So this patch removes the quirk entry. Thanks to Mukunda Vijendar [1] for pointing this out. Link: https://lore.kernel.org/linux-sound/023092e1-689c-4b00-b93f-4092c3724fb6@amd.com/ [1] Signed-off-by: Jiawei Wang --- sound/soc/amd/yc/acp6x-mach.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/sound/soc/amd/yc/acp6x-mach.c b/sound/soc/amd/yc/acp6x-mach.c index 1ab69a53174e..69c68d8e7a6b 100644 --- a/sound/soc/amd/yc/acp6x-mach.c +++ b/sound/soc/amd/yc/acp6x-mach.c @@ -199,13 +199,6 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "21HY"), } }, - { - .driver_data = &acp6x_card, - .matches = { - DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"), - DMI_MATCH(DMI_PRODUCT_NAME, "21J2"), - } - }, { .driver_data = &acp6x_card, .matches = { From patchwork Wed Mar 13 01:58:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiawei Wang X-Patchwork-Id: 13590853 Received: from out-173.mta1.migadu.com (out-173.mta1.migadu.com [95.215.58.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 37E10BA37 for ; Wed, 13 Mar 2024 02:00:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710295210; cv=none; b=f+nqPcHhlca2KmVQ2JE4XvDzXSG9WYLGtzIDADh0+RFdG4xPI7bWWSyBDlPHurrGsRpq38j//JzRALnWFl/4vTDnBoH1mBb+vZ0yDoi4o8fe5W6b9coFfi/hYd2qZ4vwbUqGseXIGSt5FqDunwdVy1pYT/WtrfuoISFtug+n7GM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710295210; c=relaxed/simple; bh=3S+ml9Q6wYDAd17jCHPrCumLNoYX/YCTLP2FSb8YSPo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=c+ELGB+zPhAqE1gMTeW9V6aiR5wrGrGZ7AUSuZwZQ4cu7jrBj+asLiS0Sp4WZle8mQm2hwu/1Re2BwMDpyR/v3Zhl+XlqJ+0REPp1jUwhiaIZ+guFFrNr9Z7aGLYiJ95LFUg5ZYx6SdtwkDe2NPDxhvd/ZAYPmoHwc7J/iu2C20= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=jwang.link; spf=pass smtp.mailfrom=jwang.link; dkim=pass (2048-bit key) header.d=jwang.link header.i=@jwang.link header.b=SqGtKKwB; arc=none smtp.client-ip=95.215.58.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=jwang.link Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=jwang.link Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=jwang.link header.i=@jwang.link header.b="SqGtKKwB" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jwang.link; s=key1; t=1710295206; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ujRJgU6f66VX27X6ZaO6EbWjKporwX3PrXShnhBOR40=; b=SqGtKKwBA+9PAhnDNa8xlMraSaT8Xd4BXgV6BbwBzvzvsFJlizH9Gu0sPusdbx0F0YNf1i UHBRtsVe5am0GEz1KSD/bbrBLBf7MldZlXK2JSJfpWXGu0/KRXuCnCu1cTketO/dwqhj5R lKOrN4wAEoGiLNf5mZRY7fRYs2ErhsGeqQAhUe2S36SZQurSzXdKqqlZTYgGvcDZvPRZnd OTgJLcIhGrucBmrNiZLMNqjk9ffHatO37igluSFxs4xJSCerQnwt0EuHZtrJt9Lel8n1YP qL7hwLoEth74OxLKDbIiDYjZKJkA3WJ7GQykkzQblA0+iyvcjuHKAC1k+Xl1jg== From: Jiawei Wang To: broonie@kernel.org Cc: linux-sound@vger.kernel.org, me@jwang.link, sashal@kernel.org, vijendar.mukunda@amd.com, Liam Girdwood , Jaroslav Kysela , Takashi Iwai , Syed Saba Kareem , Vijendar Mukunda , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v3 2/2] ASoC: amd: yc: Revert "add new YC platform variant (0x63) support" Date: Wed, 13 Mar 2024 09:58:53 +0800 Message-Id: <20240313015853.3573242-3-me@jwang.link> In-Reply-To: <20240313015853.3573242-1-me@jwang.link> References: <20240313015853.3573242-1-me@jwang.link> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT This reverts commit 316a784839b21b122e1761cdca54677bb19a47fa, that enabled Yellow Carp (YC) driver for PCI revision id 0x63. Mukunda Vijendar [1] points out that revision 0x63 is Pink Sardine platform, not Yellow Carp. The YC driver should not be enabled for this platform. This patch prevents the YC driver from being incorrectly enabled. Link: https://lore.kernel.org/linux-sound/023092e1-689c-4b00-b93f-4092c3724fb6@amd.com/ [1] Signed-off-by: Jiawei Wang --- sound/soc/amd/yc/pci-acp6x.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/amd/yc/pci-acp6x.c b/sound/soc/amd/yc/pci-acp6x.c index 694b8e313902..7af6a349b1d4 100644 --- a/sound/soc/amd/yc/pci-acp6x.c +++ b/sound/soc/amd/yc/pci-acp6x.c @@ -162,7 +162,6 @@ static int snd_acp6x_probe(struct pci_dev *pci, /* Yellow Carp device check */ switch (pci->revision) { case 0x60: - case 0x63: case 0x6f: break; default: