From patchwork Tue Jun 28 00:28:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 585838 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 98350C433EF for ; Tue, 28 Jun 2022 00:30:33 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id AC1C41657; Tue, 28 Jun 2022 02:29:41 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz AC1C41657 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1656376231; bh=nEWsLGmF8325vJZpm07WbegkyjvD8bhloxc2S0eAn6c=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=NdegEAuVcYA3PbQA8WofueM0x2n5gz+1MM4NX4hZyz74RocF6g9PCdTJL4hVD4t2t 69oE3pwte5z0rYG5Q9ehcfpIrXFsoAalyI6H9D99iQOOG82cVXonLv3EQ8sy4VUeop m2/S7jnbebxaP/vc//6sUBlJDl47NkNx+rAbl/Ls= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id BB0B3F8012F; Tue, 28 Jun 2022 02:29:15 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 30CC3F8012F; Tue, 28 Jun 2022 02:29:12 +0200 (CEST) Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 81CBFF8012F for ; Tue, 28 Jun 2022 02:29:05 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 81CBFF8012F Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="aQqKlx2n" Received: by mail-wm1-x334.google.com with SMTP id c130-20020a1c3588000000b0039c6fd897b4so8438517wma.4 for ; Mon, 27 Jun 2022 17:29:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JhHo/c96RqUx3d1BSnJliVbZrX3rYoCTCoQbgEL1koc=; b=aQqKlx2nvthEI5iO+lZtBomWQE46C7nR5V8+E0UX9CBiYyfEPrxs1FIWpkUD1uTrrJ oDLPBcA4VNXrv/luMpXIUX2bsV/B0IxqbOXHcFdg1g6HdjWV+InlQrbQZPf/zd2KYxw4 xbkgSd9Mc1wAKEuAQLX6N+iqgnmX63Yre6PwwPudj0haEg7bs25bdRgSpCcRfbZm/t7c +FDjRqmIh7XOedj/+n8RgCvDYwUWLBar7lL/Xb+lPFEEs8g6Fzz0MgnbMVDhuHoMqQd/ pCGZajqqPtOCi4jMzLjcpDEnCzJCh/4NID3+aPaqFogjkBu/G2rJlgEqTrUqRSdxrihc viEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JhHo/c96RqUx3d1BSnJliVbZrX3rYoCTCoQbgEL1koc=; b=ED7HmyUZK44Sy6t+Qu3nQv/UZ+3xCxNz/6fXwd1LmagN6xdqfshgdNX4BByZ1SHtuD hO8oZpSTGHEalMUEk9ygBGhSlIIlxnrIzN+6IOtPn4B5/w6Mv8Ch9YvaLGQe1xcqczCg pDaPdzeH28KpvloPN/UlfM6yPjW0jhutHGP+GwPftvM/H5FKXvGlofaFnJOFcvUACCJu b0ZUiwvSfeTAiBCnjLXonhyL7E3VMSJZjIFxaEwSMD5JhdmrOWXXERbGzl6lXnYrFTFs IrAtA/FUG2LNq9Aq4/htvxdS+G9lu48YCKKFNh5a/TI7MiSZFGX071vcqXH9HKo+gi70 lJig== X-Gm-Message-State: AJIora8dhrSYIl07mJMwNpZrOZkhbs4JOMT9QuvkCenAde1vvfP/1N2z bez+LCSlQLzatiCAevnNNXkDZA== X-Google-Smtp-Source: AGRyM1sNO9bsuFeQ5fHsF8c8Qskqwu0+/VCb/SKdTn8IG3y/OOaVd5SNGjQXVdS7iZrotMfL+w1x8g== X-Received: by 2002:a05:600c:1906:b0:39c:7f82:3090 with SMTP id j6-20020a05600c190600b0039c7f823090mr22930876wmq.152.1656376143620; Mon, 27 Jun 2022 17:29:03 -0700 (PDT) Received: from sagittarius-a.chello.ie (188-141-3-169.dynamic.upc.ie. [188.141.3.169]) by smtp.gmail.com with ESMTPSA id o42-20020a05600c512a00b0039c5cecf206sm15863560wms.4.2022.06.27.17.29.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jun 2022 17:29:03 -0700 (PDT) From: Bryan O'Donoghue To: lgirdwood@gmail.com, broonie@kernel.org, bjorn.andersson@linaro.org Subject: [PATCH v4 1/2] ASoC: qcom: lpass: Fix apq8016 compat string to match yaml Date: Tue, 28 Jun 2022 01:28:57 +0100 Message-Id: <20220628002858.2638442-2-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220628002858.2638442-1-bryan.odonoghue@linaro.org> References: <20220628002858.2638442-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 Cc: devicetree@vger.kernel.org, alsa-devel@alsa-project.org, linux-arm-msm@vger.kernel.org, tiwai@suse.com, robh+dt@kernel.org, srinivas.kandagatla@linaro.org, bryan.odonoghue@linaro.org, krzk+dt@kernel.org X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" The documented yaml compat string for the apq8016 is "qcom,apq8016-lpass-cpu" not "qcom,lpass-cpu-apq8016". Looking at the other lpass compat strings the general form is "qcom,socnum-lpass-cpu". We need to fix both the driver and dts to match. Fixes: dc1ebd1811e9 ("ASoC: qcom: Add apq8016 lpass driver support") Reviewed-by: Srinivas Kandagatla Reviewed-by: Bjorn Andersson Signed-off-by: Bryan O'Donoghue --- sound/soc/qcom/lpass-apq8016.c | 1 + sound/soc/qcom/lpass-cpu.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/sound/soc/qcom/lpass-apq8016.c b/sound/soc/qcom/lpass-apq8016.c index 3efa133d1c641..abaf694ee9a3a 100644 --- a/sound/soc/qcom/lpass-apq8016.c +++ b/sound/soc/qcom/lpass-apq8016.c @@ -293,6 +293,7 @@ static struct lpass_variant apq8016_data = { static const struct of_device_id apq8016_lpass_cpu_device_id[] __maybe_unused = { { .compatible = "qcom,lpass-cpu-apq8016", .data = &apq8016_data }, + { .compatible = "qcom,apq8016-lpass-cpu", .data = &apq8016_data }, {} }; MODULE_DEVICE_TABLE(of, apq8016_lpass_cpu_device_id); diff --git a/sound/soc/qcom/lpass-cpu.c b/sound/soc/qcom/lpass-cpu.c index e6846ad2b5fa4..53f9bf6581d33 100644 --- a/sound/soc/qcom/lpass-cpu.c +++ b/sound/soc/qcom/lpass-cpu.c @@ -1102,6 +1102,11 @@ int asoc_qcom_lpass_cpu_platform_probe(struct platform_device *pdev) if (!match || !match->data) return -EINVAL; + if (of_device_is_compatible(dev->of_node, "qcom,lpass-cpu-apq8016")) { + dev_warn(dev, "%s compatible is deprecated\n", + match->compatible); + } + drvdata->variant = (struct lpass_variant *)match->data; variant = drvdata->variant; From patchwork Tue Jun 28 00:28:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 585594 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 04E77C43334 for ; Tue, 28 Jun 2022 00:30:54 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 383FB1672; Tue, 28 Jun 2022 02:30:02 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 383FB1672 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1656376252; bh=63SQ21f+Y8cAjcbc+0Hs++NtB+99gYL4fWWYWAI7o0g=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=HovMDoKi18GrDznmK9yW5IpoSmYFdVVCIIvDY4YntCU64MEBqh97qZ66QUL8vHPom SclA35ohpBGzAL1cZSp/gupV8jijes7Hld9A3OM75sTuk6qAasI3eCa6MgxS/7xgs0 VzqAbFIouaJgABT/cfUT+TkGYcLe1jM0J5Z61p/I= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 7057CF804FD; Tue, 28 Jun 2022 02:29:16 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 37539F804F1; Tue, 28 Jun 2022 02:29:13 +0200 (CEST) Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id B7EC2F80107 for ; Tue, 28 Jun 2022 02:29:06 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz B7EC2F80107 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="jUicXQ60" Received: by mail-wm1-x32f.google.com with SMTP id v193-20020a1cacca000000b003a051f41541so231565wme.5 for ; Mon, 27 Jun 2022 17:29:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fOncqFOL4cD/VqA7SHbK/ZWzLlcJK+/jxUQrf4ImoVY=; b=jUicXQ60nek8n1EEGGxuKrtitiKBRfagX/FCmNl3UYrk3zH+/ILkjVYOAXX5iqkkc8 eSVppRQOId2GpSFDlsJs6XLTU+w1mOeJvLJWldL6PWaK1oMwQ1WjfwEOSV4NueK31e/Q RXOQ+h+6Xf9cxcNOjx+PbpLybB03ItEhYSiY8FufoiW5sTNUe1fm2xXoiC9uAoN46pFa Kn0pEevsQZ3HucUWv6aCu7p1KR4xUMKQbslflginRbIWB0nEvohd45YRCLJnlrTOu7Zp RwOSL0gaK3jpk+Dn+WAcKoeopnD1gvy/9qBY/oYfaROsjnM4JIRg6h/bxE+2VjmPipy3 iEfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fOncqFOL4cD/VqA7SHbK/ZWzLlcJK+/jxUQrf4ImoVY=; b=hwcGGKv7meIlMP7h6cXNHUxuNusBWyl0xwm4ps/LVGFRk+5sElqANvXZFTrtt+RWZ7 8e+H44d/NgrTN633NwCYHqE7z3E1aQrdpdY5ce3bRKkIHmyd5FEmOboObTuWBU/6w2M+ Z4LrJvF2oqbi6d+iQH1mlkgSkSo8Sm+DfD6qTIxdP3/yi2oHR3LxRRTiLf+6JVyhrMJs 4xkfXj4JCO1y92Jppul+NPTWYQIi1jfB9S32OgLLLKxKV7W5m5kQFl37p2wGcjJb943B 5czGYWJpfpNuYbf9a6n727B7wYPLe1d2iK71gu++wrx53mcCw9YEQLVFHEPiffq4ddkP KCzA== X-Gm-Message-State: AJIora+OzK5ONCFy/wc3vA2mr8en/TG7D+Y1mtn2lWKWv8BoWJxmsFPZ ue3560yxrY1Lo/NfyLPAgXbIAw== X-Google-Smtp-Source: AGRyM1tShn9JTmkar8VZPVp7ofhESWrbGuYNgwiUOu6137frSg1MIFQb5WD7Mc8deWfRoNsYXJ8/Og== X-Received: by 2002:a7b:c24c:0:b0:3a0:4d4c:dc96 with SMTP id b12-20020a7bc24c000000b003a04d4cdc96mr5633580wmj.111.1656376144796; Mon, 27 Jun 2022 17:29:04 -0700 (PDT) Received: from sagittarius-a.chello.ie (188-141-3-169.dynamic.upc.ie. [188.141.3.169]) by smtp.gmail.com with ESMTPSA id o42-20020a05600c512a00b0039c5cecf206sm15863560wms.4.2022.06.27.17.29.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jun 2022 17:29:04 -0700 (PDT) From: Bryan O'Donoghue To: lgirdwood@gmail.com, broonie@kernel.org, bjorn.andersson@linaro.org Subject: [PATCH v4 2/2] arm64: dts: qcom: Fix apq8016 compat string to match yaml Date: Tue, 28 Jun 2022 01:28:58 +0100 Message-Id: <20220628002858.2638442-3-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220628002858.2638442-1-bryan.odonoghue@linaro.org> References: <20220628002858.2638442-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 Cc: devicetree@vger.kernel.org, alsa-devel@alsa-project.org, linux-arm-msm@vger.kernel.org, tiwai@suse.com, robh+dt@kernel.org, srinivas.kandagatla@linaro.org, bryan.odonoghue@linaro.org, krzk+dt@kernel.org X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" The documented yaml compat string for the apq8016 is "qcom,apq8016-lpass-cpu" not "qcom,lpass-cpu-apq8016". Looking at the other lpass compat strings the general form is "qcom,socnum-lpass-cpu". We need to fix both the driver and dts to match. Fixes: 3761a3618f55 ("arm64: dts: qcom: add lpass node") Signed-off-by: Bryan O'Donoghue --- arch/arm64/boot/dts/qcom/msm8916.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi index 05472510e29d5..a101b2871d5f7 100644 --- a/arch/arm64/boot/dts/qcom/msm8916.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi @@ -1422,7 +1422,7 @@ sound: sound@7702000 { lpass: audio-controller@7708000 { status = "disabled"; - compatible = "qcom,lpass-cpu-apq8016"; + compatible = "qcom,apq8016-lpass-cpu"; /* * Note: Unlike the name would suggest, the SEC_I2S_CLK