From patchwork Sun Mar 7 16:23:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Robinson X-Patchwork-Id: 12120825 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 87504C433E0 for ; Sun, 7 Mar 2021 16:24:47 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id E93FA650F7 for ; Sun, 7 Mar 2021 16:24:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E93FA650F7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 8D9F61F32; Sun, 7 Mar 2021 17:23:53 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 8D9F61F32 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1615134283; bh=u7FbZ0Fdjr56d7WDm2XXNDcg4SP24E+ZJyb/BHUGMI8=; h=From:To:Subject:Date:Cc:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=EDNWTeMn3cb7mIdxrY+cave8OgBdB6k8mD647ZdjHlp0lvK6GrJZfwqFOT2vj7VKA /MIuYor0PzG957Fh8QJzBXTxJi3da3ksyXR0SpqD0E99cJESnq9SIT0yrYrp++LmU2 thmpFG4u9iq9h69k+Vc/52AVJ4F2/ho3aLh1gkx0= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id E90F4F8019B; Sun, 7 Mar 2021 17:23:52 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 4EC7EF80256; Sun, 7 Mar 2021 17:23:51 +0100 (CET) Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 2E1C0F80139 for ; Sun, 7 Mar 2021 17:23:43 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 2E1C0F80139 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="qrTREAnJ" Received: by mail-wr1-x435.google.com with SMTP id h98so8803512wrh.11 for ; Sun, 07 Mar 2021 08:23:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=BqpmxAEUNndFlhKRUxuyHtFM2QUv+uV9egrv4lIpLqw=; b=qrTREAnJAoU+lx5pJjQjcYqe1/7aGhvtuINUKFsfpZgZUh/hGejugbNdHxFAyuhazH 3WgGumFPZtaZlQzMfYJQuOE3DUZuyx6zvEHM1YxKNcDkVQet4IBInoOR7HgjHF/nf5XP mwMTOKCWV7rj1r7lQOk03Atf2BIPTfbrLRPpXkHuRY4sNGq2bRHLkKUQt4Jo3uVoqn+K vBceJlTCFCaV3AL5zqMC3I8LfKtiKNULv9/Dqh4xVhueRduwso9d2cBNX0jkoHML70Sj 8+aTdqXl2FmX+nmr6lFu6goD2iI0xbhD7gKNFH4PXI4tbPjd95Vl+NtbLFF4wj1mHAq0 j9Cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=BqpmxAEUNndFlhKRUxuyHtFM2QUv+uV9egrv4lIpLqw=; b=Wkg30FUYrWX+ZmjMfX+5UAVrSvndxMEVY5TYwhLCodPbB+qkGpyjfACp2yjLGxgeLC BuCSeQ7mINfXjd/SssxTqBfAW5h8+vlkXWfnW3eHC/N8wLAkoODEnupi8vpX5urhhM7r QxPBUpLO3BXUR1/cscDuBqPDSXv2a4jWPqzoORjDWaVO9uBde/xqiqR4pdTheCUYe2Hu bC4blYtLUZZaTl1S188P4s3favogtBNNpeAD0/PeHjZyxGAHZChrS8saVrTVdUGQa0+h oZ/P1q/CtcoJ0HD4AnRbYFEknl3I8FOrn6/+6JB5R62Pgy6bLz57VIvr6wYyQsksZn3p Zxew== X-Gm-Message-State: AOAM5326IT+Jcb+T1jzpEtVBUgwcSvEJepcv9H8bT3zBfI5jcw2acPY/ Awp0UsdF5YczI20iPMAYZVI= X-Google-Smtp-Source: ABdhPJwBJUAHEVB0tFe5Dj21Y5z4jW2tUbjLBdceJO9r8nluG7Eqsv92josv+RuHRqgbxa0l207+zw== X-Received: by 2002:a5d:4688:: with SMTP id u8mr18833304wrq.39.1615134222459; Sun, 07 Mar 2021 08:23:42 -0800 (PST) Received: from morpheus.home.roving-it.com (f.c.9.1.f.e.c.d.1.e.0.0.2.b.5.5.1.8.6.2.1.1.b.f.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:fb11:2681:55b2:e1:dcef:19cf]) by smtp.googlemail.com with ESMTPSA id a75sm14515541wme.10.2021.03.07.08.23.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Mar 2021 08:23:42 -0800 (PST) From: Peter Robinson To: Jun Nie , Shawn Guo , Liam Girdwood , Jaroslav Kysela , Takashi Iwai , Barry Song , alsa-devel@alsa-project.org Subject: [PATCH 1/2] ASoC: remove remnants of sirf prima/atlas audio codec Date: Sun, 7 Mar 2021 16:23:37 +0000 Message-Id: <20210307162338.1160604-1-pbrobinson@gmail.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Cc: Mark Brown , Peter Robinson , Arnd Bergmann X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" In 61fbeb5 the sirf prima/atlas drivers were removed. This cleans up a stray header and some Kconfig entries for the codec that were missed in the process. Fixes: 61fbeb5dcb3d (ASoC: remove sirf prima/atlas drivers) Signed-off-by: Peter Robinson Cc: Arnd Bergmann Cc: Mark Brown Acked-by: Arnd Bergmann --- sound/soc/codecs/Kconfig | 5 -- sound/soc/codecs/sirf-audio-codec.h | 124 ---------------------------- 2 files changed, 129 deletions(-) delete mode 100644 sound/soc/codecs/sirf-audio-codec.h diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index e4cf14e66a51..1c87b42606c9 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -186,7 +186,6 @@ config SND_SOC_ALL_CODECS imply SND_SOC_SI476X imply SND_SOC_SIMPLE_AMPLIFIER imply SND_SOC_SIMPLE_MUX - imply SND_SOC_SIRF_AUDIO_CODEC imply SND_SOC_SPDIF imply SND_SOC_SSM2305 imply SND_SOC_SSM2518 @@ -1279,10 +1278,6 @@ config SND_SOC_SIMPLE_MUX tristate "Simple Audio Mux" select GPIOLIB -config SND_SOC_SIRF_AUDIO_CODEC - tristate "SiRF SoC internal audio codec" - select REGMAP_MMIO - config SND_SOC_SPDIF tristate "S/PDIF CODEC" diff --git a/sound/soc/codecs/sirf-audio-codec.h b/sound/soc/codecs/sirf-audio-codec.h deleted file mode 100644 index a7fe2680f4c7..000000000000 --- a/sound/soc/codecs/sirf-audio-codec.h +++ /dev/null @@ -1,124 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ -/* - * SiRF inner codec controllers define - * - * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company. - */ - -#ifndef _SIRF_AUDIO_CODEC_H -#define _SIRF_AUDIO_CODEC_H - - -#define AUDIO_IC_CODEC_PWR (0x00E0) -#define AUDIO_IC_CODEC_CTRL0 (0x00E4) -#define AUDIO_IC_CODEC_CTRL1 (0x00E8) -#define AUDIO_IC_CODEC_CTRL2 (0x00EC) -#define AUDIO_IC_CODEC_CTRL3 (0x00F0) - -#define MICBIASEN (1 << 3) - -#define IC_RDACEN (1 << 0) -#define IC_LDACEN (1 << 1) -#define IC_HSREN (1 << 2) -#define IC_HSLEN (1 << 3) -#define IC_SPEN (1 << 4) -#define IC_CPEN (1 << 5) - -#define IC_HPRSELR (1 << 6) -#define IC_HPLSELR (1 << 7) -#define IC_HPRSELL (1 << 8) -#define IC_HPLSELL (1 << 9) -#define IC_SPSELR (1 << 10) -#define IC_SPSELL (1 << 11) - -#define IC_MONOR (1 << 12) -#define IC_MONOL (1 << 13) - -#define IC_RXOSRSEL (1 << 28) -#define IC_CPFREQ (1 << 29) -#define IC_HSINVEN (1 << 30) - -#define IC_MICINREN (1 << 0) -#define IC_MICINLEN (1 << 1) -#define IC_MICIN1SEL (1 << 2) -#define IC_MICIN2SEL (1 << 3) -#define IC_MICDIFSEL (1 << 4) -#define IC_LINEIN1SEL (1 << 5) -#define IC_LINEIN2SEL (1 << 6) -#define IC_RADCEN (1 << 7) -#define IC_LADCEN (1 << 8) -#define IC_ALM (1 << 9) - -#define IC_DIGMICEN (1 << 22) -#define IC_DIGMICFREQ (1 << 23) -#define IC_ADC14B_12 (1 << 24) -#define IC_FIRDAC_HSL_EN (1 << 25) -#define IC_FIRDAC_HSR_EN (1 << 26) -#define IC_FIRDAC_LOUT_EN (1 << 27) -#define IC_POR (1 << 28) -#define IC_CODEC_CLK_EN (1 << 29) -#define IC_HP_3DB_BOOST (1 << 30) - -#define IC_ADC_LEFT_GAIN_SHIFT 16 -#define IC_ADC_RIGHT_GAIN_SHIFT 10 -#define IC_ADC_GAIN_MASK 0x3F -#define IC_MIC_MAX_GAIN 0x39 - -#define IC_RXPGAR_MASK 0x3F -#define IC_RXPGAR_SHIFT 14 -#define IC_RXPGAL_MASK 0x3F -#define IC_RXPGAL_SHIFT 21 -#define IC_RXPGAR 0x7B -#define IC_RXPGAL 0x7B - -#define AUDIO_PORT_TX_FIFO_LEVEL_CHECK_MASK 0x3F -#define AUDIO_PORT_TX_FIFO_SC_OFFSET 0 -#define AUDIO_PORT_TX_FIFO_LC_OFFSET 10 -#define AUDIO_PORT_TX_FIFO_HC_OFFSET 20 - -#define TX_FIFO_SC(x) (((x) & AUDIO_PORT_TX_FIFO_LEVEL_CHECK_MASK) \ - << AUDIO_PORT_TX_FIFO_SC_OFFSET) -#define TX_FIFO_LC(x) (((x) & AUDIO_PORT_TX_FIFO_LEVEL_CHECK_MASK) \ - << AUDIO_PORT_TX_FIFO_LC_OFFSET) -#define TX_FIFO_HC(x) (((x) & AUDIO_PORT_TX_FIFO_LEVEL_CHECK_MASK) \ - << AUDIO_PORT_TX_FIFO_HC_OFFSET) - -#define AUDIO_PORT_RX_FIFO_LEVEL_CHECK_MASK 0x0F -#define AUDIO_PORT_RX_FIFO_SC_OFFSET 0 -#define AUDIO_PORT_RX_FIFO_LC_OFFSET 10 -#define AUDIO_PORT_RX_FIFO_HC_OFFSET 20 - -#define RX_FIFO_SC(x) (((x) & AUDIO_PORT_RX_FIFO_LEVEL_CHECK_MASK) \ - << AUDIO_PORT_RX_FIFO_SC_OFFSET) -#define RX_FIFO_LC(x) (((x) & AUDIO_PORT_RX_FIFO_LEVEL_CHECK_MASK) \ - << AUDIO_PORT_RX_FIFO_LC_OFFSET) -#define RX_FIFO_HC(x) (((x) & AUDIO_PORT_RX_FIFO_LEVEL_CHECK_MASK) \ - << AUDIO_PORT_RX_FIFO_HC_OFFSET) -#define AUDIO_PORT_IC_CODEC_TX_CTRL (0x00F4) -#define AUDIO_PORT_IC_CODEC_RX_CTRL (0x00F8) - -#define AUDIO_PORT_IC_TXFIFO_OP (0x00FC) -#define AUDIO_PORT_IC_TXFIFO_LEV_CHK (0x0100) -#define AUDIO_PORT_IC_TXFIFO_STS (0x0104) -#define AUDIO_PORT_IC_TXFIFO_INT (0x0108) -#define AUDIO_PORT_IC_TXFIFO_INT_MSK (0x010C) - -#define AUDIO_PORT_IC_RXFIFO_OP (0x0110) -#define AUDIO_PORT_IC_RXFIFO_LEV_CHK (0x0114) -#define AUDIO_PORT_IC_RXFIFO_STS (0x0118) -#define AUDIO_PORT_IC_RXFIFO_INT (0x011C) -#define AUDIO_PORT_IC_RXFIFO_INT_MSK (0x0120) - -#define AUDIO_FIFO_START (1 << 0) -#define AUDIO_FIFO_RESET (1 << 1) - -#define AUDIO_FIFO_FULL (1 << 0) -#define AUDIO_FIFO_EMPTY (1 << 1) -#define AUDIO_FIFO_OFLOW (1 << 2) -#define AUDIO_FIFO_UFLOW (1 << 3) - -#define IC_TX_ENABLE (0x03) -#define IC_RX_ENABLE_MONO (0x01) -#define IC_RX_ENABLE_STEREO (0x03) - -#endif /*__SIRF_AUDIO_CODEC_H*/ From patchwork Sun Mar 7 16:23:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Robinson X-Patchwork-Id: 12120827 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 26DD9C433DB for ; Sun, 7 Mar 2021 16:25:37 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 50AC964E33 for ; Sun, 7 Mar 2021 16:25:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 50AC964E33 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id A6D8C1F4E; Sun, 7 Mar 2021 17:24:44 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz A6D8C1F4E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1615134334; bh=+IS+HsEn9PScpKZSYsoN2mo3qELnqpdac9Pu1dWhtjE=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=EhPc/rmKA66buLblKpt48ZE6m3PcjvpLqBcGzg6l/rOhuyXnrzjlRhKRn+VKCex51 6NoubVNVAHGFuxaMmtJfP6sj2CTbSgn5+KpJYSElJmhGTfGggdSG9IGVs9D+h7vk0U vil8Nkox+kqKkPfmVDZS6B3EWtL+q6+S3Vk+RYTI= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 62F1DF80275; Sun, 7 Mar 2021 17:23:54 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id B23EBF8019B; Sun, 7 Mar 2021 17:23:51 +0100 (CET) Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 96AD0F800CC for ; Sun, 7 Mar 2021 17:23:43 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 96AD0F800CC Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="aJUEBRpX" Received: by mail-wr1-x42c.google.com with SMTP id v15so8840356wrx.4 for ; Sun, 07 Mar 2021 08:23:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oj2xRqbEeMFzhlH+V7733PkaePwuNrfh8/9dg+i8twk=; b=aJUEBRpXErCQ4G9hu/HmWGVaNlBlpJPKAYX6D2EpRKQ+Bncf4Dw0AsByA8ni5OeAJc 1Ax6MEkTAQcjUXPgyEnAEEbRNFy5LujGrOkv5JLcuJozseXzb9aGg+qSYQq/BJS5Z2Zk G5/uQM69YHXm0z2e6GOnNWjG/3d7ZYs4c2RFbSvU7IOrBKgtCvJqdNOvpftHIGHtiftB KU9GM35mF4WtwGZYQY7dnyGE4tKuA0sL0+2/xQwjicJBGGQs0bP1YY7DR61FmpjW89v9 FEVUjdUYHE4r5xCWswpilrWn2JUh2X1KfeePMTR4UeDpUyGfiPSbubEsHUU2iUdAPMNw MevQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=oj2xRqbEeMFzhlH+V7733PkaePwuNrfh8/9dg+i8twk=; b=SEwmdwg+l5o4BdXNQ1A8omfS1qq3rVcK0z0HkY+JCcytSjYPvbduFkI1UZjPna8+2P yk0naMaE0gVVqJ7bRvFhCpvOm1bfaAjBGEaplkEt8YuDe0VmBOuDbddBHHmlKupOCXZ7 jA/Dqcc7ue43vdyfDwtlxk8klVkJxMi/J3ig6fUqEqfiWaDmH3vf7UH1v8RSlW3dQKp6 cqk/IeGWKURRvS1GCZ6mw7iG6NFoWdaIRtvNXC5Kt9NO9YzwdmxD+8OdCVA2jnC2AnEx +EmlbeBdvDya1VTL7dZXAaJAD1mmVcFnIMfVkWiXNMKEnDkWwu5XR2OG8aayMvw8wPMP RKkA== X-Gm-Message-State: AOAM531BvnGie9dLLUHKndlGiTR3PxNv3bn0td9+u/15PpUMB9OPh9EX K80nOZR7impjMCjOLqXBm5g= X-Google-Smtp-Source: ABdhPJyoMDAbk3o5tKlKQRAAvmPn/eztheXA87xRydC7wBaubagKri49JAB+o1QVp30Nmfb34/YYUw== X-Received: by 2002:adf:8445:: with SMTP id 63mr19301582wrf.222.1615134223304; Sun, 07 Mar 2021 08:23:43 -0800 (PST) Received: from morpheus.home.roving-it.com (f.c.9.1.f.e.c.d.1.e.0.0.2.b.5.5.1.8.6.2.1.1.b.f.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:fb11:2681:55b2:e1:dcef:19cf]) by smtp.googlemail.com with ESMTPSA id a75sm14515541wme.10.2021.03.07.08.23.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Mar 2021 08:23:42 -0800 (PST) From: Peter Robinson To: Jun Nie , Shawn Guo , Liam Girdwood , Jaroslav Kysela , Takashi Iwai , Barry Song , alsa-devel@alsa-project.org Subject: [PATCH 2/2] ASoC: remove zte zx dangling kconfig Date: Sun, 7 Mar 2021 16:23:38 +0000 Message-Id: <20210307162338.1160604-2-pbrobinson@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210307162338.1160604-1-pbrobinson@gmail.com> References: <20210307162338.1160604-1-pbrobinson@gmail.com> MIME-Version: 1.0 Cc: Mark Brown , Peter Robinson , Arnd Bergmann X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" In commit dc98f1d we removed the zte zx sound drivers but there was a dangling Kconfig left around for the codec so fix this. Fixes: dc98f1d655ca (ASoC: ASoC: remove zte zx drivers) Signed-off-by: Peter Robinson Cc: Arnd Bergmann Cc: Mark Brown --- sound/soc/codecs/Kconfig | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 1c87b42606c9..e04fa8b5f178 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -1739,11 +1739,6 @@ config SND_SOC_ZL38060 which consists of a Digital Signal Processor (DSP), several Digital Audio Interfaces (DAIs), analog outputs, and a block of 14 GPIOs. -config SND_SOC_ZX_AUD96P22 - tristate "ZTE ZX AUD96P22 CODEC" - depends on I2C - select REGMAP_I2C - # Amp config SND_SOC_LM4857 tristate