From patchwork Fri Jun 6 06:51:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niranjan H Y X-Patchwork-Id: 895216 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F30CAC61DB2 for ; Tue, 10 Jun 2025 19:34:57 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [45.14.194.44]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id B3FC360211; Tue, 10 Jun 2025 21:34:43 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz B3FC360211 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1749584093; bh=nxa3PYsW5o+v8bg44bRchymZgJvbA1YySSHeKd9Iwao=; h=From:To:CC:Subject:Date:In-Reply-To:References:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=pr/hFv1Inygea3YQOlbsa7nI5A5vph61qdNQzxTtsgYPDLqJubLHak1uSe0tw4mjJ qU4nS4GGGJpaYyRrv0kjtxXs2lZNA61zElv3WpJycM5ckJO1BKZUlIhc/gQ4Bb5l/z 3ZzHs1UY0KzboW7SyniRkXAPrZ5RfiKahFJsVeRw= Received: by alsa1.perex.cz (Postfix, from userid 50401) id B134DF8068E; Tue, 10 Jun 2025 21:33:10 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id A47EEF80687; Tue, 10 Jun 2025 21:33:10 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id B271DF8010B; Fri, 6 Jun 2025 08:52:32 +0200 (CEST) Received: from lelvem-ot01.ext.ti.com (lelvem-ot01.ext.ti.com [198.47.23.234]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 73320F8003A for ; Fri, 6 Jun 2025 08:52:29 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 73320F8003A Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key, unprotected) header.d=ti.com header.i=@ti.com header.a=rsa-sha256 header.s=ti-com-17Q1 header.b=pfleOSId Received: from fllvem-sh03.itg.ti.com ([10.64.41.86]) by lelvem-ot01.ext.ti.com (8.15.2/8.15.2) with ESMTP id 5566qRtw1323395; Fri, 6 Jun 2025 01:52:27 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1749192747; bh=IL0UbWjx4pPSayogeWKWnaFYfqNTkvm+cXMiKv5fADM=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=pfleOSIdimShbX/6IxQErQs/GH7iZ7PFINH6ZL9OFaUlgfWDbCnTpny89lWgb1zO5 F3H4ON9h2YL9cbDH7fE+Pv29V/UkEFAKpMGF63JJgBO+qfS6IHkuXE0ddgBpGQ5TBq +BYdN/1hiyY3Bb0FsTwbtr0Xy9BYU+Bpi10aVfXI= Received: from DFLE100.ent.ti.com (dfle100.ent.ti.com [10.64.6.21]) by fllvem-sh03.itg.ti.com (8.18.1/8.18.1) with ESMTPS id 5566qRZS1386607 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA256 bits=128 verify=FAIL); Fri, 6 Jun 2025 01:52:27 -0500 Received: from DFLE110.ent.ti.com (10.64.6.31) by DFLE100.ent.ti.com (10.64.6.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Fri, 6 Jun 2025 01:52:27 -0500 Received: from lelvem-mr05.itg.ti.com (10.180.75.9) by DFLE110.ent.ti.com (10.64.6.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Fri, 6 Jun 2025 01:52:27 -0500 Received: from LTPW0EX92E.dhcp.ti.com (ltpw0ex92e.dhcp.ti.com [172.24.149.200]) by lelvem-mr05.itg.ti.com (8.18.1/8.18.1) with ESMTP id 5566q4Og677113; Fri, 6 Jun 2025 01:52:23 -0500 From: Niranjan H Y To: CC: , , , , , , , , , Subject: [PATCH v1 3/4] Asoc: pcm6240: remove support for taac5x1x family Date: Fri, 6 Jun 2025 12:21:35 +0530 Message-ID: <20250606065136.1821-4-niranjan.hy@ti.com> X-Mailer: git-send-email 2.33.0.windows.2 In-Reply-To: <20250606065136.1821-1-niranjan.hy@ti.com> References: <20250606065136.1821-1-niranjan.hy@ti.com> MIME-Version: 1.0 X-C2ProcessedOrg: 333ef613-75bf-4e12-a4b1-8e3623f5dcea X-MailFrom: niranjan.hy@ti.com X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1 Message-ID-Hash: WODALYJTML3OZ5V7OJ4VGRX7W6CO7GE7 X-Message-ID-Hash: WODALYJTML3OZ5V7OJ4VGRX7W6CO7GE7 X-Mailman-Approved-At: Tue, 10 Jun 2025 19:33:03 +0000 X-Mailman-Version: 3.3.9 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: tac5x1x codec driver suporrts tac5x1x family which includes the following ADCs and DACs. So removed the duplicate entries in the pcm6240 i2c driver. Signed-off-by: Niranjan H Y --- sound/soc/codecs/pcm6240.c | 124 +------------------------------------ sound/soc/codecs/pcm6240.h | 4 -- 2 files changed, 3 insertions(+), 125 deletions(-) diff --git a/sound/soc/codecs/pcm6240.c b/sound/soc/codecs/pcm6240.c index 75af12231d1d..bbf3eb18bf54 100644 --- a/sound/soc/codecs/pcm6240.c +++ b/sound/soc/codecs/pcm6240.c @@ -44,10 +44,6 @@ static const struct i2c_device_id pcmdevice_i2c_id[] = { { "pcmd3140", PCMD3140 }, { "pcmd3180", PCMD3180 }, { "pcmd512x", PCMD512X }, - { "taa5212", TAA5212 }, - { "taa5412", TAA5412 }, - { "tad5212", TAD5212 }, - { "tad5412", TAD5412 }, {} }; MODULE_DEVICE_TABLE(i2c, pcmdevice_i2c_id); @@ -442,60 +438,6 @@ static const struct pcmdevice_mixer_control pcmd3180_fine_gain_ctl[] = { } }; -static const struct pcmdevice_mixer_control taa5412_digi_vol_ctl[] = { - { - .shift = 0, - .reg = TAA5412_REG_CH1_DIGITAL_VOLUME, - .max = 0xff, - .invert = 0, - }, - { - .shift = 0, - .reg = TAA5412_REG_CH2_DIGITAL_VOLUME, - .max = 0xff, - .invert = 0, - }, - { - .shift = 0, - .reg = TAA5412_REG_CH3_DIGITAL_VOLUME, - .max = 0xff, - .invert = 0, - }, - { - .shift = 0, - .reg = TAA5412_REG_CH4_DIGITAL_VOLUME, - .max = 0xff, - .invert = 0, - } -}; - -static const struct pcmdevice_mixer_control taa5412_fine_gain_ctl[] = { - { - .shift = 4, - .reg = TAA5412_REG_CH1_FINE_GAIN, - .max = 0xf, - .invert = 0, - }, - { - .shift = 4, - .reg = TAA5412_REG_CH2_FINE_GAIN, - .max = 0xf, - .invert = 0, - }, - { - .shift = 4, - .reg = TAA5412_REG_CH3_FINE_GAIN, - .max = 0xf, - .invert = 4, - }, - { - .shift = 0, - .reg = TAA5412_REG_CH4_FINE_GAIN, - .max = 0xf, - .invert = 4, - } -}; - static const DECLARE_TLV_DB_MINMAX_MUTE(pcmd3140_dig_gain_tlv, -10000, 2700); static const DECLARE_TLV_DB_MINMAX_MUTE(pcm1690_fine_dig_gain_tlv, @@ -512,7 +454,7 @@ static const DECLARE_TLV_DB_MINMAX_MUTE(pcm6260_fgain_tlv, static const DECLARE_TLV_DB_LINEAR(pcm6260_chgain_tlv, 0, 4200); static const DECLARE_TLV_DB_MINMAX_MUTE(taa5412_dig_vol_tlv, -8050, 4700); -static const DECLARE_TLV_DB_LINEAR(taa5412_fine_gain_tlv, +static const DECLARE_TLV_DB_LINEAR(pcmd31x0_fine_gain_tlv, -80, 70); static int pcmdev_change_dev(struct pcmdevice_priv *pcm_priv, @@ -981,7 +923,7 @@ static const struct pcmdev_ctrl_info pcmdev_gain_ctl_info[][2] = { // PCMD3140 { { - .gain = taa5412_fine_gain_tlv, + .gain = pcmd31x0_fine_gain_tlv, .pcmdev_ctrl = pcmd3140_fine_gain_ctl, .ctrl_array_size = ARRAY_SIZE(pcmd3140_fine_gain_ctl), .get = pcmdevice_get_volsw, @@ -1000,7 +942,7 @@ static const struct pcmdev_ctrl_info pcmdev_gain_ctl_info[][2] = { // PCMD3180 { { - .gain = taa5412_fine_gain_tlv, + .gain = pcmd31x0_fine_gain_tlv, .pcmdev_ctrl = pcmd3180_fine_gain_ctl, .ctrl_array_size = ARRAY_SIZE(pcmd3180_fine_gain_ctl), .get = pcmdevice_get_volsw, @@ -1025,62 +967,6 @@ static const struct pcmdev_ctrl_info pcmdev_gain_ctl_info[][2] = { .ctrl_array_size = 0, }, }, - // TAA5212 - { - { - .gain = taa5412_fine_gain_tlv, - .pcmdev_ctrl = taa5412_fine_gain_ctl, - .ctrl_array_size = ARRAY_SIZE(taa5412_fine_gain_ctl), - .get = pcmdevice_get_volsw, - .put = pcmdevice_put_volsw, - .pcmdev_ctrl_name_id = 2, - }, - { - .gain = taa5412_dig_vol_tlv, - .pcmdev_ctrl = taa5412_digi_vol_ctl, - .ctrl_array_size = ARRAY_SIZE(taa5412_digi_vol_ctl), - .get = pcmdevice_get_volsw, - .put = pcmdevice_put_volsw, - .pcmdev_ctrl_name_id = 1, - }, - }, - // TAA5412 - { - { - .gain = taa5412_fine_gain_tlv, - .pcmdev_ctrl = taa5412_fine_gain_ctl, - .ctrl_array_size = ARRAY_SIZE(taa5412_fine_gain_ctl), - .get = pcmdevice_get_volsw, - .put = pcmdevice_put_volsw, - .pcmdev_ctrl_name_id = 2, - }, - { - .gain = taa5412_dig_vol_tlv, - .pcmdev_ctrl = taa5412_digi_vol_ctl, - .ctrl_array_size = ARRAY_SIZE(taa5412_digi_vol_ctl), - .get = pcmdevice_get_volsw, - .put = pcmdevice_put_volsw, - .pcmdev_ctrl_name_id = 1, - }, - }, - // TAD5212 - { - { - .ctrl_array_size = 0, - }, - { - .ctrl_array_size = 0, - }, - }, - // TAD5412 - { - { - .ctrl_array_size = 0, - }, - { - .ctrl_array_size = 0, - }, - }, }; static int pcmdev_dev_bulk_write(struct pcmdevice_priv *pcm_dev, @@ -2002,10 +1888,6 @@ static const struct of_device_id pcmdevice_of_match[] = { { .compatible = "ti,pcmd3140" }, { .compatible = "ti,pcmd3180" }, { .compatible = "ti,pcmd512x" }, - { .compatible = "ti,taa5212" }, - { .compatible = "ti,taa5412" }, - { .compatible = "ti,tad5212" }, - { .compatible = "ti,tad5412" }, {}, }; MODULE_DEVICE_TABLE(of, pcmdevice_of_match); diff --git a/sound/soc/codecs/pcm6240.h b/sound/soc/codecs/pcm6240.h index 2d8f9e798139..86b1ef734a3d 100644 --- a/sound/soc/codecs/pcm6240.h +++ b/sound/soc/codecs/pcm6240.h @@ -33,10 +33,6 @@ enum pcm_device { PCMD3140, PCMD3180, PCMD512X, - TAA5212, - TAA5412, - TAD5212, - TAD5412, MAX_DEVICE, };