From patchwork Tue Jun 28 12:04:34 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: 586627 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 50047C433EF for ; Tue, 28 Jun 2022 12:05:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239654AbiF1MFH (ORCPT ); Tue, 28 Jun 2022 08:05:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34054 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239659AbiF1MFF (ORCPT ); Tue, 28 Jun 2022 08:05:05 -0400 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 712AA2496C for ; Tue, 28 Jun 2022 05:04:41 -0700 (PDT) Received: by mail-wr1-x42a.google.com with SMTP id b26so4971316wrc.2 for ; Tue, 28 Jun 2022 05:04:41 -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=HA9Ju9WiWYMyHFa1RrEaM+Jl1wBHz+W0Kvbk+W2ZI4Q=; b=s3A+Tjnt6L5ct+uXElLKqAN+RCi5Q53fO2x4+Lzy+vMSEPrAskYDKsEIbQDI7w7tI+ BkcCMWR8tlHAfFSk0Qf5L9EFZ5wJr+pMq0V0N5nR+pR4Z5v35M/HZBo6moSF2Rf0cJSF MU3va6nFgqpve/F6jHPiKzY+HlZ/EHa05HsVqDGsq5HQJ9sCpVb1oEzepj5TBDdYGZc+ aWEUJIuF5VpSwwLGimI1H/X8mYZQE0NjZBkbk/vdaj6qcvwedpmJ9bxQqqLHR9OJfkP3 yR8RfEoyctyjpiEP48XQ+jeeJO2aU4wlCJO4u+p+xN/i2iIWLGtDHLfxycSCX20my76B lipw== 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=HA9Ju9WiWYMyHFa1RrEaM+Jl1wBHz+W0Kvbk+W2ZI4Q=; b=FJwEczaCnZXd3Wcj2dVXjDj175X1UHGg8Wdd0VqeB4Wl4iJa7uGbWeV8gM883mgTRp FjDBsccO/34ndUrGGc+XWRujaS2QW/xcBQMZB1EEZDYW6+JL9PeeD5Wp0KmtVhxX0jDg l6D0hl/mIYZ8HJ1NuYPhiBNNfvwphBBIJ1gn2RB7eQPAY64bID/M0IKV9GxD8Cd3p+Mp WoEiTkV/D2lewhsNOjJpyEIdVYywxwx2UNUbaphl5aRpL5beMPLhzAvJgANK061Po5n1 j3zrX41f4G/B2mSwDbrjEhgkehXAToslTdAcBIGxPuMDVLhkSA15l4FoL83z+b5v0E4U PbWQ== X-Gm-Message-State: AJIora/60Gaz7NfPrLh/IoDsAwU5iBdahP0c7lyiZ6Oy8Ac/6X+2V4tu GsWfbLGOsfw2zPp45zwm2iRaqw== X-Google-Smtp-Source: AGRyM1sCchwbqLWnT1eNhxSqPMIG3TnWhGdLsWF7fS7Cdz6ZFQdvj+vTi0FG+ORF366s/y1KfIOaXw== X-Received: by 2002:a5d:64aa:0:b0:21b:c38b:bb81 with SMTP id m10-20020a5d64aa000000b0021bc38bbb81mr14388793wrp.666.1656417879960; Tue, 28 Jun 2022 05:04:39 -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 p20-20020a1c7414000000b003a05621dc53sm1457737wmc.29.2022.06.28.05.04.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Jun 2022 05:04:39 -0700 (PDT) From: Bryan O'Donoghue To: lgirdwood@gmail.com, broonie@kernel.org, bjorn.andersson@linaro.org Cc: perex@perex.cz, tiwai@suse.com, srinivas.kandagatla@linaro.org, robh+dt@kernel.org, krzk+dt@kernel.org, alsa-devel@alsa-project.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, bryan.odonoghue@linaro.org Subject: [PATCH v5 1/2] ASoC: qcom: lpass: Fix apq8016 compat string to match yaml Date: Tue, 28 Jun 2022 13:04:34 +0100 Message-Id: <20220628120435.3044939-2-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220628120435.3044939-1-bryan.odonoghue@linaro.org> References: <20220628120435.3044939-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org 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. 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 12:04:35 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: 585607 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DD1B2CCA479 for ; Tue, 28 Jun 2022 12:05:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345368AbiF1MFP (ORCPT ); Tue, 28 Jun 2022 08:05:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34110 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245127AbiF1MFH (ORCPT ); Tue, 28 Jun 2022 08:05:07 -0400 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CE5EC2FE75 for ; Tue, 28 Jun 2022 05:04:42 -0700 (PDT) Received: by mail-wr1-x431.google.com with SMTP id s1so17344182wra.9 for ; Tue, 28 Jun 2022 05:04:42 -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=xyE1UAgMW31jME2wx6Txhct6npxMtKTSOZN3VWFZNHw=; b=m3vTwS/dP8Fe6wpZeS/CQG9ugsk3/odZc3WP+Bfsr3fKin6P+AUs3nuxKWP+qOBk0k Ofisb+kLd0uFcPR3clSCtQwkzAFzITwoh3AgAuAEuDpvpijcRVlaf9O9j9EB7r9zW9b5 vS8/IKQr9Vgqd7dfRGp4frugIvbrnZ0Yu6BeafktCNdj92hMX7G/Vr2TK+HjuT7QuKFO Gw//2e/AfNzs2rma+RFnN5PcekzAKGkt+mmqmiKegpOa+8GtNLTSulPEcI233ZhWK6ye 81FWM0JrwlEqX0iG2s4h3lWis25+gG5YRtzfys8bLC73stUm1iBO3M8rL6WoH7/8VRix biTQ== 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=xyE1UAgMW31jME2wx6Txhct6npxMtKTSOZN3VWFZNHw=; b=aUyQpPN0Ot7I9361p/PAvnLNN5G5HFvNt2yPy/a3aEc3j1feVnrfGfHStgKB8zusos CKACi5AolMwlGw4NkLzwQgnktR+cAq07bks2p7Pb5bQHE+6cJ4gzrYhtmuDaekBH5W8n aP8C5CLonlXIQTXwFFOPKvTlr4BNFmIwVVVmX6oriA1vfkjXqCnawSqlT3uFpBfHjsmc vinuJAUWPD2Tc8lsYKnJbMMu/XgC/h9bEYeVuk03oURlrsptMIMYL67BbAVG9SMkeGat U+Ykb18hyzn7P5fEyFE2L8vkPkDqStqF4+M73RUFGrl1huEeM/TsXPvPyc7VMuTX1g60 450w== X-Gm-Message-State: AJIora+PUrho1iruDOxCQr41seB0z31uuaQiGtmPS39pt9lfk0iWN6YP sqVXzaGByP5XFmLAFYf0enKa4w== X-Google-Smtp-Source: AGRyM1sIGgkLsPSHOSBLRUUGIuQR0r+aLMYB45/sEFZDsRlArA/bkN9r0zZG2vSMYwT6ccthSxkwZA== X-Received: by 2002:a05:6000:1705:b0:21b:bcff:39d3 with SMTP id n5-20020a056000170500b0021bbcff39d3mr16525829wrc.502.1656417881302; Tue, 28 Jun 2022 05:04:41 -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 p20-20020a1c7414000000b003a05621dc53sm1457737wmc.29.2022.06.28.05.04.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Jun 2022 05:04:40 -0700 (PDT) From: Bryan O'Donoghue To: lgirdwood@gmail.com, broonie@kernel.org, bjorn.andersson@linaro.org Cc: perex@perex.cz, tiwai@suse.com, srinivas.kandagatla@linaro.org, robh+dt@kernel.org, krzk+dt@kernel.org, alsa-devel@alsa-project.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, bryan.odonoghue@linaro.org Subject: [PATCH v5 2/2] arm64: dts: qcom: Fix apq8016 compat string to match yaml Date: Tue, 28 Jun 2022 13:04:35 +0100 Message-Id: <20220628120435.3044939-3-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220628120435.3044939-1-bryan.odonoghue@linaro.org> References: <20220628120435.3044939-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org 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. 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