From patchwork Fri Jun 23 21:49:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 695763 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 83ADCEB64D7 for ; Fri, 23 Jun 2023 21:50:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231312AbjFWVuY (ORCPT ); Fri, 23 Jun 2023 17:50:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40278 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232793AbjFWVtr (ORCPT ); Fri, 23 Jun 2023 17:49:47 -0400 Received: from mail-lj1-x22a.google.com (mail-lj1-x22a.google.com [IPv6:2a00:1450:4864:20::22a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CB4642705 for ; Fri, 23 Jun 2023 14:49:45 -0700 (PDT) Received: by mail-lj1-x22a.google.com with SMTP id 38308e7fff4ca-2b44d77e56bso27285461fa.1 for ; Fri, 23 Jun 2023 14:49:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687556984; x=1690148984; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=RT+DMw9+JmEB+4blOGBEOQCCmDaLSKVa4tRJvUDZHYw=; b=lecwxWvFh2wABTwinbKbk2vXyK+vMqENR4o606JLOknjCo4R7wcHxvGUjmLWqT/pNp 6aZ/g+tzl+sRjGqw8AJ/A+09KAlA5CnoqeCh6VSOLFloP8o+/miSQhzVG8mrbivrSyA8 v0co5soOG49maSVuTMUkmwygSjbEDxl5Pe6JOQ5rKCiuNbboHHr4WiosZR73j+mXerQ4 D2BpLV1F6VNgc9eFxX4qs3UNBNPHaeOikR2B6jinv5Gwd0qurQJxmR+8vZEb+ebWM3K1 Zfw0LWBTNz5/ftSOHjrsWj8IzgdaiP6tqig9fgTtYqd2IoytDc2lNQGGfiVH+sKcU+oj UNwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687556984; x=1690148984; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RT+DMw9+JmEB+4blOGBEOQCCmDaLSKVa4tRJvUDZHYw=; b=KbppoCZ2TPs5o1cpAHdwXyQeW2aQaj+y+m0blNDWKHzi3D9qF1TSrBL3nyAddxUbK+ W7pQe88kRzsj97Js1MTJ92ps6vp9YZuZGFlh7AoFAId7X6xQ1HDqcwyW2Jrk93aNWssS ubK8xGyCXKss+n5YbULX5/dxlHMDuZrF3lX3YoK9KR7uqQDYGkFjsKN+yATAuYHY9hur OHOewij/WMglQQt8pHPV08e85rxbNLYJJIaVaVNLiWFYwkzc+17q6hXU1+ot3xx3KXr6 EqLmf0ODQ4vFa7ams4bo2AO+LAZYoUSf3GKy/09z4/J+v458D9mpyausybGwA2Mac8tH YX3Q== X-Gm-Message-State: AC+VfDypL+f1tMKxqFIPmXIEDHb0SCRr7O5HtTXoZl8yF4XmkaRWfBIT A/1MnKTgOduYCHDQghYUuu3nD8zfite7SLYt+Ro= X-Google-Smtp-Source: ACHHUZ4Qsgh5BpEcXr0ex6p/I1xXp8oHnlGAZZ0gCcG1oLYqyghfqdPIB9b1i6aAsUWJGzKfw1KOiA== X-Received: by 2002:a2e:9d48:0:b0:2b4:50b8:5d3b with SMTP id y8-20020a2e9d48000000b002b450b85d3bmr7576901ljj.0.1687556983889; Fri, 23 Jun 2023 14:49:43 -0700 (PDT) Received: from [192.168.1.101] (abyk30.neoplus.adsl.tpnet.pl. [83.9.30.30]) by smtp.gmail.com with ESMTPSA id x20-20020a2e9c94000000b002b48437dcaasm1840919lji.103.2023.06.23.14.49.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 14:49:43 -0700 (PDT) From: Konrad Dybcio Date: Fri, 23 Jun 2023 23:49:42 +0200 Subject: [PATCH 1/3] firmware: qcom_scm: Always try to consume all three clocks MIME-Version: 1.0 Message-Id: <20230623-topic-scm_cleanup-v1-1-383089eae98d@linaro.org> References: <20230623-topic-scm_cleanup-v1-0-383089eae98d@linaro.org> In-Reply-To: <20230623-topic-scm_cleanup-v1-0-383089eae98d@linaro.org> To: Andy Gross , Bjorn Andersson Cc: Marijn Suijten , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1687556981; l=4598; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=20MGaxR8SA/gitewjqJ05iW6t2qyGVNzk/M4vihgecc=; b=U+OJNRvlUVPfRdWvMndA3yI0+ew1J+eFh+Hvmxc5NRWEkkc7Hsdgqx5xIwmZmGGqlQmYtXvJ7 vCWfFMjPASBBOXevpw72vOUYRfsus9HEu+cBPvcoYYJFozf8XrBn6Ry X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The code for handling more than 1 clock is a bit messy and requires one to add new, SoC-specific compatibles if one wants to attach a clock. Switch devm_clk_get to devm_clk_get_optional to prevent throwing it from throwing errors when the clock is absent and defer checking the clock requirements to dt schema. This lets us get rid of compatibles that aren't necessary for backwards compatibility *and* will hopefully prevent the addition of meaningless new compatibles. Signed-off-by: Konrad Dybcio --- drivers/firmware/qcom_scm.c | 70 +++++++++------------------------------------ 1 file changed, 13 insertions(+), 57 deletions(-) diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c index fde33acd46b7..dfa298347041 100644 --- a/drivers/firmware/qcom_scm.c +++ b/drivers/firmware/qcom_scm.c @@ -26,10 +26,6 @@ static bool download_mode = IS_ENABLED(CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT); module_param(download_mode, bool, 0); -#define SCM_HAS_CORE_CLK BIT(0) -#define SCM_HAS_IFACE_CLK BIT(1) -#define SCM_HAS_BUS_CLK BIT(2) - struct qcom_scm { struct device *dev; struct clk *core_clk; @@ -1425,43 +1421,22 @@ static int qcom_scm_probe(struct platform_device *pdev) return dev_err_probe(&pdev->dev, PTR_ERR(scm->path), "failed to acquire interconnect path\n"); - scm->core_clk = devm_clk_get(&pdev->dev, "core"); + scm->core_clk = devm_clk_get_optional(&pdev->dev, "core"); if (IS_ERR(scm->core_clk)) { if (PTR_ERR(scm->core_clk) == -EPROBE_DEFER) return PTR_ERR(scm->core_clk); - - if (clks & SCM_HAS_CORE_CLK) { - dev_err(&pdev->dev, "failed to acquire core clk\n"); - return PTR_ERR(scm->core_clk); - } - - scm->core_clk = NULL; } - scm->iface_clk = devm_clk_get(&pdev->dev, "iface"); + scm->iface_clk = devm_clk_get_optional(&pdev->dev, "iface"); if (IS_ERR(scm->iface_clk)) { if (PTR_ERR(scm->iface_clk) == -EPROBE_DEFER) return PTR_ERR(scm->iface_clk); - - if (clks & SCM_HAS_IFACE_CLK) { - dev_err(&pdev->dev, "failed to acquire iface clk\n"); - return PTR_ERR(scm->iface_clk); - } - - scm->iface_clk = NULL; } - scm->bus_clk = devm_clk_get(&pdev->dev, "bus"); + scm->bus_clk = devm_clk_get_optional(&pdev->dev, "bus"); if (IS_ERR(scm->bus_clk)) { if (PTR_ERR(scm->bus_clk) == -EPROBE_DEFER) return PTR_ERR(scm->bus_clk); - - if (clks & SCM_HAS_BUS_CLK) { - dev_err(&pdev->dev, "failed to acquire bus clk\n"); - return PTR_ERR(scm->bus_clk); - } - - scm->bus_clk = NULL; } scm->reset.ops = &qcom_scm_pas_reset_ops; @@ -1512,38 +1487,19 @@ static void qcom_scm_shutdown(struct platform_device *pdev) } static const struct of_device_id qcom_scm_dt_match[] = { - { .compatible = "qcom,scm-apq8064", - /* FIXME: This should have .data = (void *) SCM_HAS_CORE_CLK */ - }, - { .compatible = "qcom,scm-apq8084", .data = (void *)(SCM_HAS_CORE_CLK | - SCM_HAS_IFACE_CLK | - SCM_HAS_BUS_CLK) - }, + { .compatible = "qcom,scm-apq8064" }, + { .compatible = "qcom,scm-apq8084" }, { .compatible = "qcom,scm-ipq4019" }, - { .compatible = "qcom,scm-mdm9607", .data = (void *)(SCM_HAS_CORE_CLK | - SCM_HAS_IFACE_CLK | - SCM_HAS_BUS_CLK) }, - { .compatible = "qcom,scm-msm8660", .data = (void *) SCM_HAS_CORE_CLK }, - { .compatible = "qcom,scm-msm8960", .data = (void *) SCM_HAS_CORE_CLK }, - { .compatible = "qcom,scm-msm8916", .data = (void *)(SCM_HAS_CORE_CLK | - SCM_HAS_IFACE_CLK | - SCM_HAS_BUS_CLK) - }, - { .compatible = "qcom,scm-msm8953", .data = (void *)(SCM_HAS_CORE_CLK | - SCM_HAS_IFACE_CLK | - SCM_HAS_BUS_CLK) - }, - { .compatible = "qcom,scm-msm8974", .data = (void *)(SCM_HAS_CORE_CLK | - SCM_HAS_IFACE_CLK | - SCM_HAS_BUS_CLK) - }, - { .compatible = "qcom,scm-msm8976", .data = (void *)(SCM_HAS_CORE_CLK | - SCM_HAS_IFACE_CLK | - SCM_HAS_BUS_CLK) - }, + { .compatible = "qcom,scm-mdm9607" }, + { .compatible = "qcom,scm-msm8660" }, + { .compatible = "qcom,scm-msm8960" }, + { .compatible = "qcom,scm-msm8916" }, + { .compatible = "qcom,scm-msm8953" }, + { .compatible = "qcom,scm-msm8974" }, + { .compatible = "qcom,scm-msm8976" }, { .compatible = "qcom,scm-msm8994" }, { .compatible = "qcom,scm-msm8996" }, - { .compatible = "qcom,scm-sm6375", .data = (void *)SCM_HAS_CORE_CLK }, + { .compatible = "qcom,scm-sm6375" }, { .compatible = "qcom,scm" }, {} }; From patchwork Fri Jun 23 21:49:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 695318 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 1B16AEB64DD for ; Fri, 23 Jun 2023 21:50:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231483AbjFWVuZ (ORCPT ); Fri, 23 Jun 2023 17:50:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40276 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232810AbjFWVtr (ORCPT ); Fri, 23 Jun 2023 17:49:47 -0400 Received: from mail-lf1-x134.google.com (mail-lf1-x134.google.com [IPv6:2a00:1450:4864:20::134]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BD30B2709 for ; Fri, 23 Jun 2023 14:49:46 -0700 (PDT) Received: by mail-lf1-x134.google.com with SMTP id 2adb3069b0e04-4f871c93a5fso1503583e87.2 for ; Fri, 23 Jun 2023 14:49:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687556985; x=1690148985; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=5DBVmcbPM6O4YzyX5TBk3hTNZ7EUrOs7o/4qOremoNA=; b=DLTVi3Ko6yVpZslF+BPqKOP0yiJUwxq4mfFrffeByYiurppR0iv8Pwj9rR+Es5MgkR 44er5a2wZohpMA5HoiEVmEhLqWdlTC6wKk0YQPdzimLPeV2brVMgFqaa4zGJ167odeuk LCqrxyhKuHvZ0RyxLdqqJhJ7vTTloIe/lTJoXFGxYGAbE9QGBgJLquMbFpvmGJJIwi4F ZJjkmQyfH9LuBHRFr6XXwd9V6ryr57hVuFPku3arzNnkJXBKofaNdsrcyVVwnRp1QKT9 v8qObWZs/Jk2iRhMEAYkagEpLKzTmL2zvS4WKenl0DO9/FbXHm/RQ4yM53u4/h4p2epQ QFYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687556985; x=1690148985; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5DBVmcbPM6O4YzyX5TBk3hTNZ7EUrOs7o/4qOremoNA=; b=kaiUrc500oJX637RcQjxNpqXT3f+shtnGUfLYTtZScK4UqDH4hMPlMo1W07hM0+kgG zIuUthJhOVnYrQ+DicASGHTvYxL1Wqfi8yqqnLMUHzUuIU2QCgd3t4iVi8JK1aTGCNCv bv97A5sxXzJ0LId6FXe6FDt1ybjbhFUeCutEg0pCQl1QUYS8vl05/HNrC9EaXUfRFZH4 v+eme0SfHWUs0o5bA7AWY5ezA/+3o72KbT1omwbmpIG6YgOkkUiU8OuDh7hfrmC0tXKk RNm5rnaarDnKGJ7lFZv8HLm+FYk9h8poBafllv3BHzMnxrKfX5D7EnVk81yrYbm1NUOE Mn7g== X-Gm-Message-State: AC+VfDymNM9ukTLZmh2Ela2pxZUsoMiQ6IQz0pLDBxvkWAIOGR7eYAbN Ibzw9FPqyNOYbpD0iOPXpLjkHUs+Gd0C1aNFHf8= X-Google-Smtp-Source: ACHHUZ7D7cOzbDYTujj5NSHsAVJZW3RnYMXWjzODK+/JexenXMCikUfaGFpHbg0lCpRpKgvfka7xVw== X-Received: by 2002:a2e:900a:0:b0:2b4:6195:bb26 with SMTP id h10-20020a2e900a000000b002b46195bb26mr13985888ljg.25.1687556984775; Fri, 23 Jun 2023 14:49:44 -0700 (PDT) Received: from [192.168.1.101] (abyk30.neoplus.adsl.tpnet.pl. [83.9.30.30]) by smtp.gmail.com with ESMTPSA id x20-20020a2e9c94000000b002b48437dcaasm1840919lji.103.2023.06.23.14.49.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 14:49:44 -0700 (PDT) From: Konrad Dybcio Date: Fri, 23 Jun 2023 23:49:43 +0200 Subject: [PATCH 2/3] firmware: qcom_scm: Always return devm_clk_get_optional errors MIME-Version: 1.0 Message-Id: <20230623-topic-scm_cleanup-v1-2-383089eae98d@linaro.org> References: <20230623-topic-scm_cleanup-v1-0-383089eae98d@linaro.org> In-Reply-To: <20230623-topic-scm_cleanup-v1-0-383089eae98d@linaro.org> To: Andy Gross , Bjorn Andersson Cc: Marijn Suijten , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1687556981; l=1572; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=pHysGjB4oZJ+5xN5W/FUx19qYCDxjkWrQHiYcbKX6uQ=; b=F9TfQwe9lA2sfHfajdi4PRDRwx/kETtoE4+UfIsGvDLi7W2Ey/0Aj1XfKriTsLSO9cvh0+L5l Aiesih+NUnqC8nf3K7HoDCSDZhyNQmUFCUg0jMBQKusn2IFa34idJ0v X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org If devm_clk_get_optional throws an error, something is really wrong. It may be a probe deferral, or it may be a problem with the clock provider. Regardless of what it may be, it should definitely not be ignored. Stop doing that. Signed-off-by: Konrad Dybcio --- drivers/firmware/qcom_scm.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c index dfa298347041..d7fc972b20ab 100644 --- a/drivers/firmware/qcom_scm.c +++ b/drivers/firmware/qcom_scm.c @@ -1422,22 +1422,16 @@ static int qcom_scm_probe(struct platform_device *pdev) "failed to acquire interconnect path\n"); scm->core_clk = devm_clk_get_optional(&pdev->dev, "core"); - if (IS_ERR(scm->core_clk)) { - if (PTR_ERR(scm->core_clk) == -EPROBE_DEFER) - return PTR_ERR(scm->core_clk); - } + if (IS_ERR(scm->core_clk)) + return PTR_ERR(scm->core_clk); scm->iface_clk = devm_clk_get_optional(&pdev->dev, "iface"); - if (IS_ERR(scm->iface_clk)) { - if (PTR_ERR(scm->iface_clk) == -EPROBE_DEFER) - return PTR_ERR(scm->iface_clk); - } + if (IS_ERR(scm->iface_clk)) + return PTR_ERR(scm->iface_clk); scm->bus_clk = devm_clk_get_optional(&pdev->dev, "bus"); - if (IS_ERR(scm->bus_clk)) { - if (PTR_ERR(scm->bus_clk) == -EPROBE_DEFER) - return PTR_ERR(scm->bus_clk); - } + if (IS_ERR(scm->bus_clk)) + return PTR_ERR(scm->bus_clk); scm->reset.ops = &qcom_scm_pas_reset_ops; scm->reset.nr_resets = 1; From patchwork Fri Jun 23 21:49:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 695764 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 A71D0C001DF for ; Fri, 23 Jun 2023 21:50:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229972AbjFWVuV (ORCPT ); Fri, 23 Jun 2023 17:50:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40428 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232827AbjFWVtt (ORCPT ); Fri, 23 Jun 2023 17:49:49 -0400 Received: from mail-lf1-x12b.google.com (mail-lf1-x12b.google.com [IPv6:2a00:1450:4864:20::12b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 85B852718 for ; Fri, 23 Jun 2023 14:49:47 -0700 (PDT) Received: by mail-lf1-x12b.google.com with SMTP id 2adb3069b0e04-4f87592ecaeso1577421e87.0 for ; Fri, 23 Jun 2023 14:49:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687556985; x=1690148985; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=SlONZ8TKyqT3PdFqD54Nj2aaobJzFqkktvSArbuqu70=; b=d14/Sqwli0wZo1aDlP1ix49NXOgH7Az2yJI2ZTAVgrTdZSAY7laI7V8/5jk5KRaB17 AkfudzVs4F6WQpi4MMr9O9Q9KJfSbkDlfrEjzJOZN6gcso065RCdVNJSLcgbgbP7Dl9n IvQw3hiDFbkZmIliWWNSV0d5wk+8/wOWjWBO2B14YUSvteqaWZuZKpEZXUo8k8f4R0Iv OqashMtNr449Lv4lT1EJkhZTe5gFcnXfivHmOWY/AOdYwFern7SpF6nTxcDMCVUmSJnJ J3SdsSxKBvwxgmKCINkEGS2BE+CkRW6QYSjjQTV6Ktf16AKbB14BZ7T8zoBkFAGJjhkG WCgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687556985; x=1690148985; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SlONZ8TKyqT3PdFqD54Nj2aaobJzFqkktvSArbuqu70=; b=JlmHce35wlRM5Eikb9wg13LPiJaC3Jg0rLCC/uQIsQ2Oec0iqzzqrY2aO6ndcs3yAx 2avmVr93iMK9ze1s5aYDWYL162hBgiFGGn7tlPzMAQM7d7ajK5yvXmg66jCeiPUiQQFR T5FbC4ndlTwciqlEfVkKleoHhzR8ui3RszCe8bkkRjxlh3VttYg0HvrGNgISUDtZThb4 n+6cdD5aRxa6V2tfBQFZCtYtOps4VAeY4dWJL4a7EqsyjtYd0GCC4RdYi/3jIMO/Iqbx yKBhehLG3PJGBJwZ0l6gFnTHX/O6C1qYwe623aSfCfRcnLV4efdQl2a+Ih/pixw1Bxzz yIJA== X-Gm-Message-State: AC+VfDxQ6G+kJUJXfH/Q/3YWFPyIqf51cSpoaXAIaaCWCKlLCVkL7vgt ly/zIS6tX7+Uqx6nJ59bOvHwhTtD/Ibu0p35gXY= X-Google-Smtp-Source: ACHHUZ4tA49jt4MntzmSZCt35XsZBv0Q4GrQYvthIP75Bx6oK9QUCwzfeEzGH+ZZRCY1jlN33JTxUg== X-Received: by 2002:a2e:9854:0:b0:2b4:756b:8e71 with SMTP id e20-20020a2e9854000000b002b4756b8e71mr12630714ljj.44.1687556985660; Fri, 23 Jun 2023 14:49:45 -0700 (PDT) Received: from [192.168.1.101] (abyk30.neoplus.adsl.tpnet.pl. [83.9.30.30]) by smtp.gmail.com with ESMTPSA id x20-20020a2e9c94000000b002b48437dcaasm1840919lji.103.2023.06.23.14.49.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 14:49:45 -0700 (PDT) From: Konrad Dybcio Date: Fri, 23 Jun 2023 23:49:44 +0200 Subject: [PATCH 3/3] firmware: qcom_scm: Drop useless compatibles MIME-Version: 1.0 Message-Id: <20230623-topic-scm_cleanup-v1-3-383089eae98d@linaro.org> References: <20230623-topic-scm_cleanup-v1-0-383089eae98d@linaro.org> In-Reply-To: <20230623-topic-scm_cleanup-v1-0-383089eae98d@linaro.org> To: Andy Gross , Bjorn Andersson Cc: Marijn Suijten , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1687556981; l=1502; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=YeauYl4ZQZY5xFS1G6VWl/VwUEAHSGaL4eh3BOpBnEE=; b=sxaKygGpuvRJhsRXCw9CfYWD83iHXn9UfSEtVsNIFx5potBlUyoyY1D2CYYobi0D7yey7a337 E0RwUnUXfZ8AGyqZCKQAgdFaZSKTNauXyrqi4F2T0Z3LFUmHT+N4uKo X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org There are three categories of compatibles within the driver: 1. Ones which were introduced without a qcom,scm fallback 2. Ones which were introduced with a qcom,scm fallback 3. Ones which were defined but never used Keep 1 for backwards compatibility and axe 2 & 3. Signed-off-by: Konrad Dybcio --- drivers/firmware/qcom_scm.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c index d7fc972b20ab..ff0e8911499c 100644 --- a/drivers/firmware/qcom_scm.c +++ b/drivers/firmware/qcom_scm.c @@ -1481,20 +1481,15 @@ static void qcom_scm_shutdown(struct platform_device *pdev) } static const struct of_device_id qcom_scm_dt_match[] = { + { .compatible = "qcom,scm" }, + + /* Legacy entries kept for backwards compatibility */ { .compatible = "qcom,scm-apq8064" }, { .compatible = "qcom,scm-apq8084" }, { .compatible = "qcom,scm-ipq4019" }, - { .compatible = "qcom,scm-mdm9607" }, - { .compatible = "qcom,scm-msm8660" }, - { .compatible = "qcom,scm-msm8960" }, - { .compatible = "qcom,scm-msm8916" }, { .compatible = "qcom,scm-msm8953" }, { .compatible = "qcom,scm-msm8974" }, - { .compatible = "qcom,scm-msm8976" }, - { .compatible = "qcom,scm-msm8994" }, { .compatible = "qcom,scm-msm8996" }, - { .compatible = "qcom,scm-sm6375" }, - { .compatible = "qcom,scm" }, {} }; MODULE_DEVICE_TABLE(of, qcom_scm_dt_match);