Received: by 2002:a05:6602:2086:0:0:0:0 with SMTP id a6csp4670571ioa; Wed, 27 Apr 2022 08:36:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJztoBqtCQ0oDMVLc+mfQZyXCb7wCtBebIE7YkZ+ePejBxQXtR64WmLPz9i7NrFcHRCEb/VU X-Received: by 2002:a63:194b:0:b0:3ab:71e5:161 with SMTP id 11-20020a63194b000000b003ab71e50161mr10434531pgz.115.1651073808531; Wed, 27 Apr 2022 08:36:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651073808; cv=none; d=google.com; s=arc-20160816; b=WVvtWcVvs4HQSkBLufnGDEGJo1UnVgbBoeLn03cBYAhCKzFO7KaC2idYuNM+JBfgRo 3lpBkYj83YibnIo4xN1JUbSKLLqWkcgrtszJKfcRbSMLkrc/AcU9XePb4sPGa5PS7Eed Yy/GHivwl1R8jhDI2cxde12hZ7oZltPBQ3gvQgUE8FQS4G0TlfDTdU5jxGqXQNXwnVEx uFrDHlDj68hjzoLhZijRVjx6FqZ9t96kpCQzsuA/Mov1VByPTbfklRRIYADVnc8h+Lo0 zEnXmuK0aFksCTiP3sn6u2Fgtm3pe/DhgpC/9rDhJSF2kraMJ5r8GiaxEvS0VKQvumP/ /TKw== 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=uAW5W49MK2PvqxczWLn7lRsgK1Eta9jaQncSm39yqLY=; b=Kq+JOQm/vC19ca7l+l/9QkDrG6iIAHjWLLdWdjznCn1eL/wpCFEBq3VCEvhMVY8ClZ icPuBMQRhdjjEnuaamPoj0JYdPsl8axA/fuU/LSOLGlFVE0Cbv2PQb6TERiIaf0CQThN pYKjnit+BCweoCpRRZ4WLFUv07k23P6rffz3e0zKSmwIrxyrv5ymt30EGrA6L3ChiNbq gRX3lPknPM512q/Nv7UmwpkUb5IBCdbRxgwu8Jt/yWTgL2LsROZpXSVrVwmQd6FEzBY2 iEcxNsz3o1z9BxQ4eyYdvfgr6n2as6SaU0chwpQ4UZMrUUWl+SPQlxpNJqLfWP4oW/NP ybOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b=PnUFOemd; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 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 lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id s20-20020a056a00179400b004fa3a8e007fsi1883010pfg.310.2022.04.27.08.36.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Apr 2022 08:36:48 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b=PnUFOemd; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cirrus.com Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id B62BC2A7DAE; Wed, 27 Apr 2022 08:09:22 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239307AbiD0PMU (ORCPT + 99 others); Wed, 27 Apr 2022 11:12:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41178 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239101AbiD0PLE (ORCPT ); Wed, 27 Apr 2022 11:11:04 -0400 Received: from mx0b-001ae601.pphosted.com (mx0b-001ae601.pphosted.com [67.231.152.168]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 469CF53B5E for ; Wed, 27 Apr 2022 08:07:52 -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 23RBg6qK022428; Wed, 27 Apr 2022 10:07:42 -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=uAW5W49MK2PvqxczWLn7lRsgK1Eta9jaQncSm39yqLY=; b=PnUFOemd6/q/1YZqhAanZeTPYWBNqzmvNHGUPYHGyPU8pWKNVbTd6FunNJTaATegNOyx uwC74++SVzOF8kJ8XWf9emu0O873WZyFZB5t9L1d8y+FYa8if4oUvQylEBlMSIn+01gk fPIkSGh/ycAi7rNfg5BkWQgi9uiX8qd5hdXgI3ohLl5mmzwoVgDfnFdp2Mtd1vmWyygo J/XMAXi/UxVGHoFRAn72aZkbj8U7MPQC1NWWqUD7GIEt7gXU7n2JFt55/swWN1grEZjL XOxwXcF2LiWQazz0LuOinsh7TRRpFpLRGs4EYBMHOjdZzHKHk3484qVgfzsjTogc9uBa Xg== Received: from ediex01.ad.cirrus.com ([84.19.233.68]) by mx0b-001ae601.pphosted.com (PPS) with ESMTPS id 3fprt60xte-13 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Wed, 27 Apr 2022 10:07:41 -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; Wed, 27 Apr 2022 16:07:32 +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, 27 Apr 2022 16:07:32 +0100 Received: from vitaly-Legion-7-16ACHg6.ad.cirrus.com (unknown [198.90.238.170]) by ediswmail.ad.cirrus.com (Postfix) with ESMTP id 7780846C; Wed, 27 Apr 2022 15:07:32 +0000 (UTC) From: Vitaly Rodionov To: Jaroslav Kysela , Takashi Iwai , Mark Brown CC: , , , Stefan Binding Subject: [PATCH 23/26] ALSA: hda: hda_cs_dsp_ctl: Add fw id strings Date: Wed, 27 Apr 2022 16:07:17 +0100 Message-ID: <20220427150720.9194-24-vitalyr@opensource.cirrus.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220427150720.9194-1-vitalyr@opensource.cirrus.com> References: <20220427150720.9194-1-vitalyr@opensource.cirrus.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Proofpoint-GUID: 7Gm9bWgJTbUUqqxjXe7okHmC8mIhZwd4 X-Proofpoint-ORIG-GUID: 7Gm9bWgJTbUUqqxjXe7okHmC8mIhZwd4 X-Proofpoint-Spam-Reason: safe X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RDNS_NONE, SPF_HELO_NONE autolearn=no 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.32.0