Received: by 2002:a6b:fb09:0:0:0:0:0 with SMTP id h9csp4557581iog; Wed, 22 Jun 2022 00:52:32 -0700 (PDT) X-Google-Smtp-Source: AGRyM1t9dtkWh5a2LghJp2mjyVa/s5rLJ0PxYTSdo4A1iHTgehT+tdZq6MD0JakYh1GtCpstwtL+ X-Received: by 2002:a63:d949:0:b0:408:870f:70d1 with SMTP id e9-20020a63d949000000b00408870f70d1mr1876285pgj.620.1655884352609; Wed, 22 Jun 2022 00:52:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655884352; cv=none; d=google.com; s=arc-20160816; b=n5njSOXv++OqeFIAcCKkmJlcwdWODOe8HJL6vf1+ycVTaIY1vDP4z0rmBpSxJp3Jur D0YrF0abt+MCUwo4PW1ExVplIkAVOMveIhl7SGeBE0+KI8XkzyfJh/w2KSm2VvrVUQJB Y88iwDizK5135B4eWXNX0njs5yCzNbkPexN1QYx7CnCzDm3PSvP1wWgopJCh8C+i3Rsc RENSJMsqa6qWXrcX/QFXwF3GeUU0sHsApdRIw48m+nkKXNEPUOKBnvu7A6yDKQzVUV9K nW5DcAwfIs6rtbmW972kDFsyq04f5BbAqxiDatDpyrSmxqwyGD/PpQPZaydFAIE9trv1 dxtA== 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=leMMeFw9xjvYsUhcKWCZtXuXd0wyI7t+7bKwC0xfahk=; b=QfTrGUz/WPG5xHV5nvPalEOdv9d+F7PAR9EbK7Gl4ZNvvbaid+IoX3DHf54Q/Vqoku EfT/0Or2xuracjzLk0izfdEPH90COv+Ulw0+qkwP4YAS2vFt4tvcUhl6PHwS2f0hFjBs W+VMAuCX+lKFQczAfhn6GgxjLo/1sjeAbcgIfH87+gxkIoB8ezC1PXxhgNo+LxzsDej2 UJqh+NMEngfHYeEYZDYDyLWaXfCLAqMggsdavCQ+oCHzRUC8DfOPVbvrkLu4zgI8i62z PPTb1nfzVSEitHy6UssWjKLHbElgB39Rq/Zhx/dNRIYr+ADnoMDRfBRYv5+VL/uHzS0Z k3Rw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b=KKZDWZG5; 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 p11-20020a17090a868b00b001ecb29d5495si7381056pjn.155.2022.06.22.00.52.20; Wed, 22 Jun 2022 00:52:32 -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=KKZDWZG5; 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 S1351503AbiFVHsD (ORCPT + 99 others); Wed, 22 Jun 2022 03:48:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47796 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353950AbiFVHrW (ORCPT ); Wed, 22 Jun 2022 03:47:22 -0400 Received: from mx0b-001ae601.pphosted.com (mx0b-001ae601.pphosted.com [67.231.152.168]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2493F37A15 for ; Wed, 22 Jun 2022 00:47:20 -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 25M7Su1N003738; Wed, 22 Jun 2022 02:47:01 -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=leMMeFw9xjvYsUhcKWCZtXuXd0wyI7t+7bKwC0xfahk=; b=KKZDWZG5bKNjJSSBJIR920A9VbfU72gVRi0akB1iBlKIhS09+M2nadPuyHn9I7yIKA91 ci+q7w4tq9kpjAnHhUk2BWNMLiBTKjWBGnDvt1+xzAfpQuxw701dptRYXKHT/bHQae+j e9293e8Tm9JwiRvXsOJ6msJLwbIGilgJfC35dlJv275b5g7gl4oa2MlbA47tu4jAghAR FHwlkWnvCEkTwVR5MEqzpcLROB4et4vnemdlD8MOdApo+5DSqlk0fx0ZzQ711YGvKvl0 mkG9LHwJRZZCtdYq/giL7Ja8W7y+KAhMthbHcSlbt3RyOklHHYQCMQH5O2KlMc0UsDqS tA== Received: from ediex02.ad.cirrus.com ([84.19.233.68]) by mx0b-001ae601.pphosted.com (PPS) with ESMTPS id 3gsb4p4mwq-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Wed, 22 Jun 2022 02:47:00 -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.28; Wed, 22 Jun 2022 08:46:59 +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.28 via Frontend Transport; Wed, 22 Jun 2022 08:46:59 +0100 Received: from vitaly-Legion-7-16ACHg6.ad.cirrus.com (unknown [198.90.238.175]) by ediswmail.ad.cirrus.com (Postfix) with ESMTP id DE88A11D1; Wed, 22 Jun 2022 07:46:58 +0000 (UTC) From: Vitaly Rodionov To: Jaroslav Kysela , Takashi Iwai , Mark Brown CC: , , , Stefan Binding Subject: [PATCH v7 11/14] ALSA: hda: hda_cs_dsp_ctl: Add fw id strings Date: Wed, 22 Jun 2022 08:46:50 +0100 Message-ID: <20220622074653.179078-12-vitalyr@opensource.cirrus.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220622074653.179078-1-vitalyr@opensource.cirrus.com> References: <20220622074653.179078-1-vitalyr@opensource.cirrus.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Proofpoint-GUID: SXEjNAOyj_ojR1VAY7X-TJZXg9otusBc X-Proofpoint-ORIG-GUID: SXEjNAOyj_ojR1VAY7X-TJZXg9otusBc 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 91e37cb916dd..5eac43cf8736 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 int hda_cs_dsp_coeff_info(struct snd_kcontrol *kctl, struct snd_ctl_elem_info *uinfo) { struct hda_cs_dsp_coeff_ctl *ctl = (struct hda_cs_dsp_coeff_ctl *)kctl->private_value; diff --git a/sound/pci/hda/hda_cs_dsp_ctl.h b/sound/pci/hda/hda_cs_dsp_ctl.h index c65bfd6878fd..4babc69cf2f0 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 *device_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_write_ctl(struct cs_dsp *dsp, const char *name, int type, -- 2.34.1