Received: by 2002:a6b:fb09:0:0:0:0:0 with SMTP id h9csp3203465iog; Mon, 20 Jun 2022 13:57:15 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tqfI+T5I9ZIHiZ45BnYJIcarNq93Y/O201vx72WqfqAtoqdIl8nm0B0AqAR9LCVozdEqeu X-Received: by 2002:a17:90a:1588:b0:1e0:a45c:5c1 with SMTP id m8-20020a17090a158800b001e0a45c05c1mr29660753pja.65.1655758635151; Mon, 20 Jun 2022 13:57:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655758635; cv=none; d=google.com; s=arc-20160816; b=GwgyCHLjElmPOZ0ubxkJlURg5HSZClOx5mPpqoEAQtjmcOj2EBM2D3zosUPz0F8o3M K4jgHjaC6iUUVXjsSmZ6Elb5ciwk3Hp2fyhcc7fgE1R9+o8bgP2qVO4v3L3B/+bjpMTN /ZwL6PPSvUm/P7RmxJIWYoj+JdIj4daf/8IPofvpaow5m7IR5NNUy7NtGUu71ZgfSgs7 xSv/0ddvq/NVMOSc1673bqbfou5je3Nc6TtkDUOov7Cd518LzBTbj/GjNtgpNqcu2jAn dy8rkD5uYzopZE8NQlp4oP/jF7ArOqqE/rGTRkG4WT5s5naatqxaoud3l0f46Ac1+4fz 4aKg== 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=INRC33006aqUuPArI3gRuS6j4bKW1D87PmB0zZUMFSQ=; b=vDGLM9HoCQZk5LXuGi48cusoQYm5/8zVATv2+0AZ9EwDo2qlYKvF2Guw4zABm5hOVa QkkaLyCyQVzNUFpZR6eOS/n2Mwv9yGXTL93iI6jbbVz9gouWjETf/Na8YDBYYx7vx9PH zi1tjR84stoX9+OHAnei43YykTK/rWohzBVMObHIeV4WcyvQyWN0yRIKbFh2WNVpd3Zs lqf66x+z2Aic4E/tAbg9eR4ruM9IjFu+duYIkanCsF8tFrk9Rsr/yE3H+2mXk8nRA94S WW8+NmyeE3AQPx6J3nSYSY9XZNEeY5FTBwmydrhQQ/Uc7NCNdnKyxye3GmBqUJoGROU+ xGrQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b=FqNXqo2G; 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 m10-20020a1709026bca00b0016a3102f8ecsi1886225plt.440.2022.06.20.13.57.02; Mon, 20 Jun 2022 13:57:15 -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=FqNXqo2G; 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 S1344683AbiFTUzT (ORCPT + 99 others); Mon, 20 Jun 2022 16:55:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46862 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343917AbiFTUzK (ORCPT ); Mon, 20 Jun 2022 16:55:10 -0400 Received: from mx0b-001ae601.pphosted.com (mx0b-001ae601.pphosted.com [67.231.152.168]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5FBED1BE8C for ; Mon, 20 Jun 2022 13:55:03 -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 25KIfiVi023078; Mon, 20 Jun 2022 15:54:47 -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=INRC33006aqUuPArI3gRuS6j4bKW1D87PmB0zZUMFSQ=; b=FqNXqo2GDTNtZLw4QchP+rFOPAiCnaCzwRgqOMAUYptOTK6/OFHtJflcPUDDZRnVYDR6 GfQHy3vTSj6fWaHsBixsKzUJi7dV/t20Ccr7NouxYueLP2+RWuxMZZjv619jIEpK3Jxc YZV+W3HpAOktlOU78W68BYTOJwAQLG4Xzi1ZdZ4E/LFUlx1sDawVw3TXNKz8Quv9aE7M kC4LFL7IQGeuqfh0RJAj+61VeXP0mUSsGEezMeokImQhkzQJrsavwLhLrBBqJtlcUODu r8yobhDKZjIvflmOBJ/IRP3bajTvwDb3EGCU6x3c7DTq8ftQgq5otfNbqZau+1IqJwSH 9w== Received: from ediex02.ad.cirrus.com ([84.19.233.68]) by mx0b-001ae601.pphosted.com (PPS) with ESMTPS id 3gsb4p2p54-5 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Mon, 20 Jun 2022 15:54:47 -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; Mon, 20 Jun 2022 21:54:46 +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; Mon, 20 Jun 2022 21:54:46 +0100 Received: from vitaly-Legion-7-16ACHg6.ad.cirrus.com (unknown [198.90.238.175]) by ediswmail.ad.cirrus.com (Postfix) with ESMTP id 0F2F111D1; Mon, 20 Jun 2022 20:54:46 +0000 (UTC) From: Vitaly Rodionov To: Jaroslav Kysela , Takashi Iwai , Mark Brown CC: , , , Stefan Binding Subject: [PATCH v5 11/14] ALSA: hda: hda_cs_dsp_ctl: Add fw id strings Date: Mon, 20 Jun 2022 21:54:29 +0100 Message-ID: <20220620205432.3809-12-vitalyr@opensource.cirrus.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220620205432.3809-1-vitalyr@opensource.cirrus.com> References: <20220620205432.3809-1-vitalyr@opensource.cirrus.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Proofpoint-GUID: ISzF4kE3yTqZQMW5cdvMYshgbxqmNZDM X-Proofpoint-ORIG-GUID: ISzF4kE3yTqZQMW5cdvMYshgbxqmNZDM 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 c8c508e1f8aa..9eb36645062f 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