From patchwork Mon Mar 27 14:07:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 75484 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1551323vqo; Mon, 27 Mar 2023 07:24:13 -0700 (PDT) X-Google-Smtp-Source: AKy350aaif4LxJCPec71i/qzxmpa+GiZxaurmy53UuTzWoum/wsk4SGmBSKm7qABF/0tmCUf2y5z X-Received: by 2002:a05:6402:c4:b0:502:4875:721 with SMTP id i4-20020a05640200c400b0050248750721mr1698905edu.15.1679927053229; Mon, 27 Mar 2023 07:24:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679927053; cv=none; d=google.com; s=arc-20160816; b=NiauNdo8XSeso4Cdgb76Ftf8nJNzz5sT3GxbgQDqwmMDILf2rfA4IbDIHWg0hJaA+7 jQ2QIkquqRFiTyioa6DSu16SlbpKjMwYcbmhjg2I+qgyKCMuGdtpUIe1U2cUaa5B8+FP j5OJKBmaxCsK2MRkUBhYMhBa2L1bywoqd07SxfroEado4lbxDKTTfInfVpqljHA2+DW5 WcVzHOuC3LaXWGYaHZDr8+EQSCt/e6MVB2IIIHJuAT5fj9thJmKaEzq+VNm5sNS+JD6E Rdji7hIPLzhhDosy5vA0WX8vQIazLt0McoijNlkZvjlTlJdI3D2srWElxlVDf9sZRqU6 0dbw== 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=Ypp3NNcegTahHFAJNE8cAdEswtLOr/02h21RPqRbA94=; b=cPOuuKg0Ak8Am3OzG/t6KiGYROycSAjq4GeKPR5Pfp4/fyFxD7pqbcGy9yeM2b6vhV 2sgRd1PRdiCo58LWhW6lGTJdfoxXREJ8uUwrGBMowBh/Znl5ANs4MkCPQDFM5FMweXBE wgSV17CIXcqHaElVsITR9F6b3Gj4xcMKC+P3XFJwr5jdZ3SOCwokKqgp5gx8D9B8XZ2h JYGVx/CchW+mCEdsn7y8FV+prreqLuN3NV3VNO5zYJejyoy9bvhfDtPNRBTSazIzmc6z rgEbmM/tju12bcMPFyr1S8/PffpqDS5CMuP7EKEmVjksCQWgVPNHKnpSoeciLHwO0sBK ov6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=OPSWVcDd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i18-20020aa7c712000000b004accb68cc93si28054558edq.387.2023.03.27.07.23.48; Mon, 27 Mar 2023 07:24:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=OPSWVcDd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232827AbjC0ORI (ORCPT + 99 others); Mon, 27 Mar 2023 10:17:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55888 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232724AbjC0OQv (ORCPT ); Mon, 27 Mar 2023 10:16:51 -0400 Received: from mail-ed1-x52b.google.com (mail-ed1-x52b.google.com [IPv6:2a00:1450:4864:20::52b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 63BEF5BBE for ; Mon, 27 Mar 2023 07:15:20 -0700 (PDT) Received: by mail-ed1-x52b.google.com with SMTP id x3so36741143edb.10 for ; Mon, 27 Mar 2023 07:15:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1679926470; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Ypp3NNcegTahHFAJNE8cAdEswtLOr/02h21RPqRbA94=; b=OPSWVcDdoVEuWN3Zw9tIjO3jwrBx/Orrb0Pigm+CooSKbjqiVGMTC32LXGXhBmWuJx quK4glIZrWL05bS2bxUQg4DEYNLVQ4ESRpi6ni3ubXCRVFFrBJp+Yu/rJNq55J4oaz5q 43wbF2EL/EFQGq/Q6D8EQFFZjCDehZ0DHfutCYmikHeoMOr66QUxNUsGFF/U7MwTCe5o Doqxpprx0GYl31NIA2rZLzfeWfmLQ8gwQ9a5z9BnHERl6lfkNnEf+Hh7mwLNUtvcvnqo fH4Fk1o6M15aPhgX87omLyz3uFZCpV/S8cJQP5W7NifvfDVIsUGV1t+7+RGG8H7sSKvy 72lA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679926470; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ypp3NNcegTahHFAJNE8cAdEswtLOr/02h21RPqRbA94=; b=msxA1lh5WJ7l7q+/4nxDcSlEr+cH52SQD364BdGcsV/m3U8h4hAoZRANdXyCMzeX9B 8O+c5WSyfoNVfu3hjmQMlMTgJuNJYWY33oRD7v19AoettTdM6/MrW8Bfq76NhyNXUZT9 QDDUV0xYGxb8Hk40/9L2WI+Po2ZTphZXf8/cop4I+Esnp5DiV+tTw4OLSag1nrW/pado HDTW7qM/MGcFmz7GiQRNfBTq4MK+7ghLI5seRYxEdeshdmY7XdBgDtDN6BTWi5+5x1wv VDym0R3XwcmQxupNN4bDEGnGWUy8YXiVPyUmVn2z8GGT5DTJp96S9AizPmgmKoL4/BT9 kTzQ== X-Gm-Message-State: AAQBX9fLdwFDANosu7E146DqPFFJc+bV/RRi1HvTBsLn7Nchfqovvgon i9Kv/FhBTb/pD1EkSqE3KTtr1Q== X-Received: by 2002:a17:907:1707:b0:922:ae30:3c23 with SMTP id le7-20020a170907170700b00922ae303c23mr12428458ejc.18.1679926470538; Mon, 27 Mar 2023 07:14:30 -0700 (PDT) Received: from krzk-bin.. ([2a02:810d:15c0:828:581e:789c:7616:5ee]) by smtp.gmail.com with ESMTPSA id ha25-20020a170906a89900b00934212e973esm11273339ejb.198.2023.03.27.07.14.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Mar 2023 07:14:30 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Jassi Brar , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH v4 2/5] mailbox: qcom-apcs-ipc: do not grow the of_device_id Date: Mon, 27 Mar 2023 16:07:49 +0200 Message-Id: <20230327140752.163009-3-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230327140752.163009-1-krzysztof.kozlowski@linaro.org> References: <20230327140752.163009-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761531189607390621?= X-GMAIL-MSGID: =?utf-8?q?1761531189607390621?= Re-organize the compatible devices and add a comment to avoid unneeded of_device_id growth with every new SoC. These devices have quite a lot of similarities and they can use only one compatible fallback for driver binding. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Dmitry Baryshkov --- drivers/mailbox/qcom-apcs-ipc-mailbox.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/mailbox/qcom-apcs-ipc-mailbox.c b/drivers/mailbox/qcom-apcs-ipc-mailbox.c index 6bbf87c6d60b..002a135ee868 100644 --- a/drivers/mailbox/qcom-apcs-ipc-mailbox.c +++ b/drivers/mailbox/qcom-apcs-ipc-mailbox.c @@ -141,9 +141,7 @@ static int qcom_apcs_ipc_remove(struct platform_device *pdev) /* .data is the offset of the ipc register within the global block */ static const struct of_device_id qcom_apcs_ipc_of_match[] = { - { .compatible = "qcom,ipq5332-apcs-apps-global", .data = &ipq6018_apcs_data }, { .compatible = "qcom,ipq6018-apcs-apps-global", .data = &ipq6018_apcs_data }, - { .compatible = "qcom,ipq8074-apcs-apps-global", .data = &ipq6018_apcs_data }, { .compatible = "qcom,msm8916-apcs-kpss-global", .data = &msm8916_apcs_data }, { .compatible = "qcom,msm8939-apcs-kpss-global", .data = &msm8916_apcs_data }, { .compatible = "qcom,msm8953-apcs-kpss-global", .data = &msm8994_apcs_data }, @@ -153,15 +151,18 @@ static const struct of_device_id qcom_apcs_ipc_of_match[] = { { .compatible = "qcom,msm8998-apcs-hmss-global", .data = &msm8994_apcs_data }, { .compatible = "qcom,qcm2290-apcs-hmss-global", .data = &msm8994_apcs_data }, { .compatible = "qcom,qcs404-apcs-apps-global", .data = &msm8916_apcs_data }, - { .compatible = "qcom,sc7180-apss-shared", .data = &apps_shared_apcs_data }, - { .compatible = "qcom,sc8180x-apss-shared", .data = &apps_shared_apcs_data }, { .compatible = "qcom,sdm660-apcs-hmss-global", .data = &msm8994_apcs_data }, { .compatible = "qcom,sdm845-apss-shared", .data = &apps_shared_apcs_data }, { .compatible = "qcom,sm4250-apcs-hmss-global", .data = &msm8994_apcs_data }, { .compatible = "qcom,sm6125-apcs-hmss-global", .data = &msm8994_apcs_data }, - { .compatible = "qcom,sm8150-apss-shared", .data = &apps_shared_apcs_data }, { .compatible = "qcom,sm6115-apcs-hmss-global", .data = &msm8994_apcs_data }, { .compatible = "qcom,sdx55-apcs-gcc", .data = &sdx55_apcs_data }, + /* Do not add any more entries using existing driver data */ + { .compatible = "qcom,ipq5332-apcs-apps-global", .data = &ipq6018_apcs_data }, + { .compatible = "qcom,ipq8074-apcs-apps-global", .data = &ipq6018_apcs_data }, + { .compatible = "qcom,sc7180-apss-shared", .data = &apps_shared_apcs_data }, + { .compatible = "qcom,sc8180x-apss-shared", .data = &apps_shared_apcs_data }, + { .compatible = "qcom,sm8150-apss-shared", .data = &apps_shared_apcs_data }, {} }; MODULE_DEVICE_TABLE(of, qcom_apcs_ipc_of_match);