Received: by 2002:a05:6602:18e:0:0:0:0 with SMTP id m14csp1207341ioo; Fri, 27 May 2022 04:03:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzSsKOgiDEA/UeiWjecibl81T6IoycakSqjbrSCWltNn5GMhzJ1z2IszGlm80jin3m/4EGg X-Received: by 2002:a17:907:60d1:b0:6ff:1421:2985 with SMTP id hv17-20020a17090760d100b006ff14212985mr10656940ejc.706.1653649436900; Fri, 27 May 2022 04:03:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653649436; cv=none; d=google.com; s=arc-20160816; b=X6E3blGmFJfEfyRFJ9YUo5vWPcIt0YT+xiORIl2UtB5z1thvUkoTg6NYu8TWoxTYwE 9N4QK3dumuuZCD2r3zYyJE70T5nmO9l8rg8HI1/zw1cL0uj3nvKE1K5H8t65EGi3pf97 VcqR9BLhwJgA1+D3OYat41vw/tTvAP9NsuHjLgwT+WUGJvnCzZeT8/Zi9NxZyarsly3H pK0KQ1dWlgKWm/mGk7OoZmrnf3g6BtEUJ0lvFdOpTJBH+YLMjUfqcn0jlGSDsmxnOiMB Q8zsvWWZ6TNDZw+nRezmFNa4kDpZ6pCq5jm5uXzfID6tHyEfrjzn3deF/o0T0QcBMEAN 9QUQ== 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=y5NxJDai2b66chEInerfInRGg+7Ze3xGpQ9oCiFKUGNyjALXPHtIv1PtyXbtBbE/qO PxBo+Atzzi/5VmnZdVmprBpkD3x0YgcS8C6UzeS8zhtCOuuOvlhy/og0PqfQqA643/zA 0FDYmeR5/lFfYh2ZGzI3UTryY2pl6jBEYb+IMffqln2N0NewZPq9tuy2JsmTH5JSHvay DoPkUypFWqiEV10/WUmKCEqkurHd0Hob0MfTrHCICJAr3O3Q9mXI0JKtYLCyxs5blUhf nkyQB2bW8KwqRwANRcOhJSXS78Yvz5yBf70rLqCemD8uZHDnIxJuKvkA6EXXFxxULDuW d9UQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b="nt9dKgx/"; 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 hc36-20020a17090716a400b006e8cb75fd59si4233732ejc.723.2022.05.27.04.03.29; Fri, 27 May 2022 04:03:56 -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="nt9dKgx/"; 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 S244163AbiEYNRT (ORCPT + 99 others); Wed, 25 May 2022 09:17:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34366 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236925AbiEYNQ7 (ORCPT ); Wed, 25 May 2022 09:16:59 -0400 Received: from mx0b-001ae601.pphosted.com (mx0b-001ae601.pphosted.com [67.231.152.168]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B0E90E002 for ; Wed, 25 May 2022 06:16:56 -0700 (PDT) Received: from pps.filterd (m0077474.ppops.net [127.0.0.1]) by mx0b-001ae601.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 24P7Sjcr031231; Wed, 25 May 2022 08:16:49 -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=nt9dKgx/6wwZD/E6yEuUvionppErET5wgK0O3dDPSIKMW34I4kjP8HuTJbYGeKuQrIR3 NuFyL/n9gixEb+TLFWOZMXTc4WqDuhD4unQ/Spw5GeBgFHy4X/ZKZ05CRXfvVwMv1nZg WVmPiQTZOBaGDMbelhxhtQfTsnoXjuhYgk5/NXTCPRi7z9I9MSar95qFW8gWGClTLl29 2qA2zzRA3nTNqOBoPmomdmk1TEi7uH1dL1Q3m8hZid0Un/uOF0AF6hNsFlHn7FzTf8GU TuQKr7QGJBbGzV8NqoFE42hXtoke3ugLLUjGDZwVc3iR7UHk81zpsYvxGWyqtNnyvj7I og== Received: from ediex02.ad.cirrus.com ([84.19.233.68]) by mx0b-001ae601.pphosted.com (PPS) with ESMTPS id 3g93u20web-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Wed, 25 May 2022 08:16:48 -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; Wed, 25 May 2022 14:16:45 +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; Wed, 25 May 2022 14:16:45 +0100 Received: from vitaly-Legion-7-16ACHg6.ad.cirrus.com (unknown [198.90.238.233]) by ediswmail.ad.cirrus.com (Postfix) with ESMTP id 13BE046C; Wed, 25 May 2022 13:16:45 +0000 (UTC) From: Vitaly Rodionov To: Jaroslav Kysela , Takashi Iwai , Mark Brown CC: , , , Stefan Binding Subject: [PATCH v4 14/17] ALSA: hda: hda_cs_dsp_ctl: Add fw id strings Date: Wed, 25 May 2022 14:16:35 +0100 Message-ID: <20220525131638.5512-15-vitalyr@opensource.cirrus.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220525131638.5512-1-vitalyr@opensource.cirrus.com> References: <20220525131638.5512-1-vitalyr@opensource.cirrus.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Proofpoint-ORIG-GUID: 4svRktvXs-WOUTjLWTNw70CPr-v42idL X-Proofpoint-GUID: 4svRktvXs-WOUTjLWTNw70CPr-v42idL 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