From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 29127178CF3; Fri, 29 Mar 2024 12:40:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711716046; cv=none; b=UcXDKk0jiJzUQWghbx8XaWctxAosccsvEOoKxrUjie8xMV1MjC0a60E0+DC5O/aVaf4uAIFnpGaGnjHsUg7AWwEhbohNocqkbB5Hpo2wmT96t2vTkKZGvQqQjQXLCanW3mz1+/+IYJ2nJmacnJH5WpCDXgrEbZ4OdTqBRfsj72Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711716046; c=relaxed/simple; bh=Jeq9r5IKNEZOepJLLoxhHkdVWMA6SpDKq9T/qzbQ2zA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UDNOU/8SS94qozs1GkWbktKS0lEMZ19rtj12WhWyJTIyCTKpOlIY01FC3lGuSkQJu8pBBJHuJ1LNYcZCqfTyEyEbn3WRCuZvj/7hEFm4xnlVXbWawHrww66aqyz6YZZLZnRnFrofbUMJmQuxlRIsabXy25v0a+r6j1RCr2OM2u4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=dQRH69yK; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="dQRH69yK" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DFDECC433C7; Fri, 29 Mar 2024 12:40:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711716046; bh=Jeq9r5IKNEZOepJLLoxhHkdVWMA6SpDKq9T/qzbQ2zA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dQRH69yK2FEO7d7VmGonmnrVyADTuSgW1smwzCzFQQj+ilwke5NByzzUQ4T0NMDZJ LAKUIYIPChSNExPhqoIFD84dP+FoqdNZR/2eY3Pob83tQCxWrks6rGZnfiYJ5HihMz Wx4AUsD2lEtWr8w2FuS5/V6O2Mp8ri7WJTYgATkFnPy2JMIbE5PHrRszi3q0yQDADq w3XNAVLskNogZgEXOX3We6hPQh9fWghsRPsdvHoHgIxEPaXXpsHEo690snKjSTE7h4 N+HaGd99vtq6q0o5SlwdWHsaUVvIp4ZRls+BOgTueqinynjp+LxWLl9iubYA3Ml9Zn WLzD/prnvgR/Q== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Brent Lu , Bard Liao , Pierre-Louis Bossart , Mark Brown , Sasha Levin , cezary.rojewski@intel.com, liam.r.girdwood@linux.intel.com, peter.ujfalusi@linux.intel.com, ranjani.sridharan@linux.intel.com, kai.vehmanen@linux.intel.com, perex@perex.cz, tiwai@suse.com, htcheong@chromium.org, uday.m.bhat@intel.com, kuninori.morimoto.gx@renesas.com, mac.chiang@intel.com, apoorv@intel.com, alsa-devel@alsa-project.org, linux-sound@vger.kernel.org Subject: [PATCH AUTOSEL 6.8 26/98] ASoC: Intel: sof_rt5682: dmi quirk cleanup for mtl boards Date: Fri, 29 Mar 2024 08:36:57 -0400 Message-ID: <20240329123919.3087149-26-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240329123919.3087149-1-sashal@kernel.org> References: <20240329123919.3087149-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.8.2 Content-Transfer-Encoding: 8bit From: Brent Lu [ Upstream commit 7a2a8730d51f95b263a1e8b888598dc6395220dc ] Some dmi quirks are duplicated since codec and amplifier type are removed from board quirk. Remove redundant quirks. Reviewed-by: Bard Liao Signed-off-by: Brent Lu Signed-off-by: Pierre-Louis Bossart Link: https://lore.kernel.org/r/20240208165545.93811-7-pierre-louis.bossart@linux.intel.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/intel/boards/sof_rt5682.c | 40 ----------------------------- 1 file changed, 40 deletions(-) diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c index cd50f26d1edbe..02705034e5713 100644 --- a/sound/soc/intel/boards/sof_rt5682.c +++ b/sound/soc/intel/boards/sof_rt5682.c @@ -154,46 +154,6 @@ static const struct dmi_system_id sof_rt5682_quirk_table[] = { SOF_RT5682_SSP_AMP(2) | SOF_RT5682_NUM_HDMIDEV(4)), }, - { - .callback = sof_rt5682_quirk_cb, - .matches = { - DMI_MATCH(DMI_PRODUCT_FAMILY, "Google_Rex"), - DMI_MATCH(DMI_OEM_STRING, "AUDIO-MAX98360_ALC5682I_I2S"), - }, - .driver_data = (void *)(SOF_RT5682_MCLK_EN | - SOF_RT5682_SSP_CODEC(2) | - SOF_RT5682_SSP_AMP(0) | - SOF_RT5682_NUM_HDMIDEV(3) | - SOF_BT_OFFLOAD_SSP(1) | - SOF_SSP_BT_OFFLOAD_PRESENT - ), - }, - { - .callback = sof_rt5682_quirk_cb, - .matches = { - DMI_MATCH(DMI_PRODUCT_FAMILY, "Google_Rex"), - DMI_MATCH(DMI_OEM_STRING, "AUDIO-MAX98360_ALC5682I_DISCRETE_I2S_BT"), - }, - .driver_data = (void *)(SOF_RT5682_MCLK_EN | - SOF_RT5682_SSP_CODEC(2) | - SOF_RT5682_SSP_AMP(0) | - SOF_RT5682_NUM_HDMIDEV(3) | - SOF_BT_OFFLOAD_SSP(1) | - SOF_SSP_BT_OFFLOAD_PRESENT - ), - }, - { - .callback = sof_rt5682_quirk_cb, - .matches = { - DMI_MATCH(DMI_PRODUCT_FAMILY, "Google_Rex"), - DMI_MATCH(DMI_OEM_STRING, "AUDIO-ALC1019_ALC5682I_I2S"), - }, - .driver_data = (void *)(SOF_RT5682_MCLK_EN | - SOF_RT5682_SSP_CODEC(2) | - SOF_RT5682_SSP_AMP(0) | - SOF_RT5682_NUM_HDMIDEV(3) - ), - }, { .callback = sof_rt5682_quirk_cb, .matches = { -- 2.43.0