Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp5413269iob; Mon, 9 May 2022 16:07:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxmLc1qqc/YcH+OxNkI/CYsqm4vq0x54bzD8prod90opJgFlNPEjrKaJ1Hd9uzPK3p7wM0d X-Received: by 2002:a17:907:33c2:b0:6f3:9aff:d532 with SMTP id zk2-20020a17090733c200b006f39affd532mr16699729ejb.394.1652137675954; Mon, 09 May 2022 16:07:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652137675; cv=none; d=google.com; s=arc-20160816; b=Ao8l4+n55WxJCFwJX1FJFYjS0nqCo+7y92Z4UyEFJuZ8t80t4IY8w5HY/sTP6RgfW6 wnTb/YYSK3DjaUL4iw++VO0UIt3fRMPqR+rGwQhJmftEn8MAIJ2dWHtix5pSCHjdw3kb hSVqviF5zKt0yCDx8jkrqMFA+2s565Bj4+D9v1eVC7o3tWZrK0jHQar7DEzLhqqYN5iv tQ4Xg9nggbu/6qlMIFV9RT+HFT++3kmK5AUsXU6A77VrRQBvJyz1Fz8mcT1MI8akDSc6 fk8ObhSv3Jx5zZ3NS4Y1tgwCCdGByRCePwtb4XX+z2msFopz2zeU2tkewis430pdNhSl xpGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=BHvt0GoazKSHegeYyWk5aMj+yVaa8Tq7p3VCq6SFMPM=; b=wOO/mIYqBSjyiGsQmt6fLX2VVS61DhYAyfAp7K7o9JYTs2/zxFfn1ef+kgIvy0h4iM wQ2YSItkV2kKx+FVv0Xbld9DsZ9X9UqZCgzZRBzoHDzi6D4U7OdUvz4sdvtqqqjsSgha HdnHpOzZgdUYkYXds9O5xKYaLzdhfLY7HmfwVQwgmDJ6oDdx2fjF3TPxZTzU4gHGM89U X8xnf8VizeXFjVxSqZXRsbejtpo/a4j84JlTWR4tkFdAX2D3lTvebUNzpKHvctnkZ+PF rS6V3X7LBBLc25iTd/jYrre2KCawBqWk1rEymK94b6D78E1ZMNGfxJK9XD1gnH5/q+ao B9Bg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b=HclHPvZ3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cirrus.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p17-20020a17090635d100b006f464383e74si13666456ejb.564.2022.05.09.16.07.32; Mon, 09 May 2022 16:07:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b=HclHPvZ3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cirrus.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230372AbiEIVwT (ORCPT + 99 others); Mon, 9 May 2022 17:52:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55854 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230250AbiEIVvR (ORCPT ); Mon, 9 May 2022 17:51:17 -0400 Received: from mx0b-001ae601.pphosted.com (mx0a-001ae601.pphosted.com [67.231.149.25]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ACB7C26FA39 for ; Mon, 9 May 2022 14:47:22 -0700 (PDT) Received: from pps.filterd (m0077473.ppops.net [127.0.0.1]) by mx0a-001ae601.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 249BF6xh021606; Mon, 9 May 2022 16:47:14 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cirrus.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=PODMain02222019; bh=BHvt0GoazKSHegeYyWk5aMj+yVaa8Tq7p3VCq6SFMPM=; b=HclHPvZ3H3ozi6LdIvsPvHfqLwFXmaEtF3hkdGRTz0vsG8CffEB30mWoTGBDugiCnx7K LxlcE8jH090FE9x8xU2wn1lrwzN0lsQqV8rM5WuiDUuzsBYiEVFBxUTNdGnxGvLv+uyD Av4aS9xGwkjcoZdKOWcngAqt4N1vThzmejOH6gdnf4e90Zu+Pd15I6zF4FyoWD0jnZ15 9LBJDFGpoWSWYA4eVQq2TZB5byZMedOloznRsyCp+XkE76DOjgrcXI7hSeF5zzzDvCl0 k9wBMa79xjPX1Q1o5+6+oItMllhiUpYFHuCAt9qVrzlJ9JLyCCDPnaaOw0iBzm+N9Ndc gQ== Received: from ediex02.ad.cirrus.com ([84.19.233.68]) by mx0a-001ae601.pphosted.com (PPS) with ESMTPS id 3fwp613jer-12 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Mon, 09 May 2022 16:47:14 -0500 Received: from EDIEX01.ad.cirrus.com (198.61.84.80) by EDIEX02.ad.cirrus.com (198.61.84.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Mon, 9 May 2022 22:47:13 +0100 Received: from ediswmail.ad.cirrus.com (198.61.86.93) by EDIEX01.ad.cirrus.com (198.61.84.80) with Microsoft SMTP Server id 15.1.2375.24 via Frontend Transport; Mon, 9 May 2022 22:47:13 +0100 Received: from vitaly-Legion-7-16ACHg6.ad.cirrus.com (unknown [198.90.238.55]) by ediswmail.ad.cirrus.com (Postfix) with ESMTP id 381DAB10; Mon, 9 May 2022 21:47:13 +0000 (UTC) From: Vitaly Rodionov To: Jaroslav Kysela , Takashi Iwai , Mark Brown CC: , , , Stefan Binding Subject: [PATCH v2 23/26] ALSA: hda: hda_cs_dsp_ctl: Add fw id strings Date: Mon, 9 May 2022 22:47:00 +0100 Message-ID: <20220509214703.4482-24-vitalyr@opensource.cirrus.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220509214703.4482-1-vitalyr@opensource.cirrus.com> References: <20220509214703.4482-1-vitalyr@opensource.cirrus.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Proofpoint-GUID: lE73GHNFk5uzm4zr8kYfE3IfTNpsOPPL X-Proofpoint-ORIG-GUID: lE73GHNFk5uzm4zr8kYfE3IfTNpsOPPL X-Proofpoint-Spam-Reason: safe X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Stefan Binding This will be used to define the firmware names. Signed-off-by: Stefan Binding Signed-off-by: Vitaly Rodionov --- sound/pci/hda/hda_cs_dsp_ctl.c | 8 ++++++++ sound/pci/hda/hda_cs_dsp_ctl.h | 2 ++ 2 files changed, 10 insertions(+) diff --git a/sound/pci/hda/hda_cs_dsp_ctl.c b/sound/pci/hda/hda_cs_dsp_ctl.c index 4b4446043356..b1fbccc56efa 100644 --- a/sound/pci/hda/hda_cs_dsp_ctl.c +++ b/sound/pci/hda/hda_cs_dsp_ctl.c @@ -28,6 +28,14 @@ static const char * const hda_cs_dsp_fw_text[HDA_CS_DSP_NUM_FW] = { [HDA_CS_DSP_FW_MISC] = "Misc", }; +const char * const hda_cs_dsp_fw_ids[HDA_CS_DSP_NUM_FW] = { + [HDA_CS_DSP_FW_SPK_PROT] = "spk-prot", + [HDA_CS_DSP_FW_SPK_CALI] = "spk-cali", + [HDA_CS_DSP_FW_SPK_DIAG] = "spk-diag", + [HDA_CS_DSP_FW_MISC] = "misc", +}; +EXPORT_SYMBOL_NS_GPL(hda_cs_dsp_fw_ids, SND_HDA_CS_DSP_CONTROLS); + static inline struct hda_cs_dsp_coeff_ctl *bytes_ext_to_ctl(struct soc_bytes_ext *ext) { return container_of(ext, struct hda_cs_dsp_coeff_ctl, bytes_ext); diff --git a/sound/pci/hda/hda_cs_dsp_ctl.h b/sound/pci/hda/hda_cs_dsp_ctl.h index 65b9c5c68957..265d8024eec9 100644 --- a/sound/pci/hda/hda_cs_dsp_ctl.h +++ b/sound/pci/hda/hda_cs_dsp_ctl.h @@ -27,6 +27,8 @@ struct hda_cs_dsp_ctl_info { const char *amp_name; }; +extern const char * const hda_cs_dsp_fw_ids[HDA_CS_DSP_NUM_FW]; + int hda_cs_dsp_control_add(struct cs_dsp_coeff_ctl *cs_ctl, struct hda_cs_dsp_ctl_info *info); void hda_cs_dsp_control_remove(struct cs_dsp_coeff_ctl *cs_ctl); int hda_cs_dsp_remove_kcontrol(struct snd_card *card, const char *name); -- 2.34.1