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: 12898162 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 59D04C43334 for ; Tue, 28 Jun 2022 12:06:31 +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 A3C43165D; Tue, 28 Jun 2022 14:05:39 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz A3C43165D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1656417989; bh=1sNbI/dwlklA2M4/Ud9PxRI+qWyCtHcvwBKMIeTIZVo=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=g4tsKBGmFd/y+1kWZGdk9zgtNqOD6PsOoL3UJkIWswQi8FXhbhRc7c9V7fNJFdNh7 Q4gleGUfwumIkScr3UgRAU4AKxNc/Qrp4HPb1VbFbxX6XVqWzTDPWfl0QUTi30gldx Yw0BxPvD9xDKKKJEXrxWDtnZF/t0MgM/qS9jqd2o= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id B34A3F8052D; Tue, 28 Jun 2022 14:04:55 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 8304FF80107; Tue, 28 Jun 2022 14:04:54 +0200 (CEST) Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) (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 CA3FEF80107 for ; Tue, 28 Jun 2022 14:04:41 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz CA3FEF80107 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="s3A+Tjnt" Received: by mail-wr1-x429.google.com with SMTP id o16so17391429wra.4 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=vE1Xo6TtQldy+HKKk8slVSStJi7zSPVrUebk2io6w/bJWlJVnwhZnhhAshTx79g6ra BXdCvI3m/9vzIjf5vUs4/8ZNv3wQgOUlkELa9kuZrhZslAMxWr/DAqmLHV5K+WJAFJT6 hP+wtCaASSoNekVzq1FDnThFUTsmzY06k14XVrt531Htr9e8FXfUnOL2YRAZhm37k66n wl43Y1GGuEOo4ScapzlTrJ6sj4CeAjPTqRByqSL5ANL9FZ5ARijsfllCJ3OIxJeZvium 2IGHNJpG5z8KrBMWZ0J80LWcMrDx9zIQ4lYz2uEeA/XjLJcQRcODcjp2MLyt254zDYlH hlSg== X-Gm-Message-State: AJIora8t2Ob604hJv6X/PBuMUui/yFJ5zOrTE9BHku8jT/EmVjFn2cVW Am88dF66PPLqyP5KIFex30NhRw== 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 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 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. 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: 12898161 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 F00C0C43334 for ; Tue, 28 Jun 2022 12:06:10 +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 0ED121650; Tue, 28 Jun 2022 14:05:19 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 0ED121650 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1656417969; bh=A+LyKANzIxnDJ/JSpUl/mkENtm6E9fF26Gte9GpwP6g=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=QAiXVVuLiAkqoNsCyPgLj/vSYtzLLv94bkgNApQTm2Y/RnSxPVHc1Or2hTHdl9VtP FxTpzls944n41eAfAf9y0gcBaeXn5ghh7rEegGRP3S65dHLJEsn9tY4aVj65s/nPkZ yk6roi2Oxb3NY+471JgcB2pO5xhUiIbaEl2XaEUc= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 2FF0EF80166; Tue, 28 Jun 2022 14:04:53 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id D9BF7F804CF; Tue, 28 Jun 2022 14:04:51 +0200 (CEST) Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) (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 20EE2F80167 for ; Tue, 28 Jun 2022 14:04:42 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 20EE2F80167 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="m3vTwS/d" Received: by mail-wr1-x436.google.com with SMTP id q9so17362986wrd.8 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=Q6dH24KLZEfxVKBlUC5/VN3WbAg51br5IRqB1gxyRXLoTclkQ7TAEu0r3QXyiGRyV/ Mq8id/LW64zZs2TCQrNl2c6u54+pubWqDpvDN41Sl9jBMLYkENcvNqmfxGQXOw4jVdQw 0LkuzqDRZOTQNCgQ7Zd3TwY0kdL4hdsjXnWjL77L1ZV3k5xbm3SsU90FpBG2gBBJLbMy 5caSb+sUjUAKi1nAGWXQYmOswSO5M8bQMLmwjePzk68zyaGo9gAvCi4n2iR+BLeTk1Cb Gij4nOfs/u1KYWVcw1sek9e2KrK2gC2UxJy29fMeZPWTkK15Zk5J2srDDv/O2uPqqqry pv9Q== X-Gm-Message-State: AJIora9gr4coAtdFVgKz5a8J2tKhMjegwhtktWRtjXQ+FojPma4MLUFa WO0Fng4HhNzcKrssliN7EMc46g== 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 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 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. 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