Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp2039973iob; Thu, 19 May 2022 23:47:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxXcGrSkunq4lyFXSwNegWdzgiJEcJf5lCni4JZfT9topkGDvclk90oi2C4LUr499/AgYLc X-Received: by 2002:a05:6402:28ac:b0:42a:42d3:7ba0 with SMTP id eg44-20020a05640228ac00b0042a42d37ba0mr9227851edb.289.1653029241138; Thu, 19 May 2022 23:47:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653029241; cv=none; d=google.com; s=arc-20160816; b=mnXd/9ziMMpTQSae0dImIXlO6bdKKBwknrxFHtURF8RCcapY+jSKFiWfpvJ3ZtpPZe /r1RYRppCXx7MB6HknHDlOrtHalk8xmUoRwkaTxe0FIuXydzbakiJ1L4Svy4KQvLzRXy a66fnzBKLb0XmrAGz3+VHXqYClx7YgyjiwgwpK+pFtO8hykv6G/vN34U7V7LLaG9psKZ RdFh+wUtdSjLdCaXPxcAevbPfmLm2BB7RfXLlSb8QGx2EdFBpxODl2U9Y54XdT7mwzn2 AfeMRtHcaI7Ezk/TxkZr2ajBu5KNh02p05k/woZVCYsvhSxk633uhhwLhaFswcjnsEvd uDtg== 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=i1KBfpmWq85BkKRplVpoCF4sGjk4Y2NdJNchd02pEJA=; b=Uyl3IufOwIyH6a60KA4BGsgpMZQZRTsJxRWfl/S4/rwcg8rSxVaHIcO6yvpQg52Cv+ qtM9xIo/jsHguHoihkwUzJ5kbinWJyyeOdM8iJPVf/iWCO5nobFcSH9I+AgGHIRTqhJr kUJXH2I75kZtLo9B36Cqz0W7egFvQEpajX89NJluYInvWEGHoXRqMEcJLZHk1y9XKJbe qX0twP4CpdTnBuorMCsB5ejDC5WL3D/s1tp3YnjvzYNNnPO1umO/mOeErOgid4IViRch hanvMWT1TexOOXG8V+b5IkVRXHcaowaIedYWyoQEU1goLNaRBv/LQQ1bx2SKweTaZmBh EaVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b=W88ZVcfJ; 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 w2-20020a056402268200b004284d9f0f6csi9365175edd.21.2022.05.19.23.46.54; Thu, 19 May 2022 23:47:21 -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=W88ZVcfJ; 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 S243223AbiESRse (ORCPT + 99 others); Thu, 19 May 2022 13:48:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50904 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243140AbiESRsH (ORCPT ); Thu, 19 May 2022 13:48:07 -0400 Received: from mx0b-001ae601.pphosted.com (mx0a-001ae601.pphosted.com [67.231.149.25]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4DDF7B0408 for ; Thu, 19 May 2022 10:48:06 -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 24J5MiMw023727; Thu, 19 May 2022 12:47:58 -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=i1KBfpmWq85BkKRplVpoCF4sGjk4Y2NdJNchd02pEJA=; b=W88ZVcfJhmPnzUxupTGM9MsmjLQCGtMHwMqPD1YJJo/dAeDjRrGUDtmVtjf7vIfDge23 g3jpR9Vk8WAdX1rmA6JE8Ua8urL+RRMkUCg4l9EG0ePlDwbXZQCvvfI/VuZrulnJXQpf gL3zZt25y/k18DZ2Tllqf31CT4j79O1pKP5ue2J0RHNJWqbbyJjWGyNbjMHGFgdaLuN6 CJ4/6Vhbp5gqWiMCHEq+5d8IKZFRPQO/ozMbxuMFjIA6kknn8KuxoRX6J9atQ2aiE8ih 7sI5ouMXQk1Mr1rX4inziEhxR5H1mfhhsY9OkVx5qID6J2qlH1h8NAxlzHnqx88qApyH WA== Received: from ediex01.ad.cirrus.com ([84.19.233.68]) by mx0a-001ae601.pphosted.com (PPS) with ESMTPS id 3g29u37tee-8 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Thu, 19 May 2022 12:47:57 -0500 Received: from EDIEX01.ad.cirrus.com (198.61.84.80) by EDIEX01.ad.cirrus.com (198.61.84.80) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Thu, 19 May 2022 18:47:56 +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; Thu, 19 May 2022 18:47:56 +0100 Received: from vitaly-Legion-7-16ACHg6.ad.cirrus.com (unknown [198.90.238.59]) by ediswmail.ad.cirrus.com (Postfix) with ESMTP id AA5C8476; Thu, 19 May 2022 17:47:55 +0000 (UTC) From: Vitaly Rodionov To: Jaroslav Kysela , Takashi Iwai , Mark Brown CC: , , , Stefan Binding Subject: [PATCH v3 14/17] ALSA: hda: hda_cs_dsp_ctl: Add fw id strings Date: Thu, 19 May 2022 18:47:46 +0100 Message-ID: <20220519174749.15459-15-vitalyr@opensource.cirrus.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220519174749.15459-1-vitalyr@opensource.cirrus.com> References: <20220519174749.15459-1-vitalyr@opensource.cirrus.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Proofpoint-GUID: qjMIQxDJpqHELbsaoxr2Ja2eYVTl37xm X-Proofpoint-ORIG-GUID: qjMIQxDJpqHELbsaoxr2Ja2eYVTl37xm X-Proofpoint-Spam-Reason: safe X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,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 --- Changes since v2: - No change 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 3b837d000a00..4cf5f7c2e267 100644 --- a/sound/pci/hda/hda_cs_dsp_ctl.c +++ b/sound/pci/hda/hda_cs_dsp_ctl.c @@ -30,6 +30,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