From patchwork Tue Mar 14 08:09:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 663071 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 3521EC6FD1C for ; Tue, 14 Mar 2023 08:11:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230165AbjCNIL0 (ORCPT ); Tue, 14 Mar 2023 04:11:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49342 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229845AbjCNIK4 (ORCPT ); Tue, 14 Mar 2023 04:10:56 -0400 Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [IPv6:2a00:1450:4864:20::52c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4532E9924E for ; Tue, 14 Mar 2023 01:09:27 -0700 (PDT) Received: by mail-ed1-x52c.google.com with SMTP id k10so58340785edk.13 for ; Tue, 14 Mar 2023 01:09:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678781363; 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=dpSUX7WridYFFvb5Xp7cUrsNqCFgLBD3FO2lvz7TpLw=; b=xhONnVNZBzNkDZcDF4u2HT+ctYxoTFnZ93Tex9vHHMXPMP5fPYTexIiCZCbpXhWZFx oiMc34e64z/RkEjsaM26XTjtrG1fZafIunMDvn63Ob3007EILXQYf4mXCtefe5tpxSD5 JpZDO/5EubmA8pV7fTK6qp0cvZlFnUyuBi/3mqP0s/lCvjkRIYCCqXO3mCgJNM/q8yaC O0VsVmnKV3ae30JUgXvUQpTaCvRo3HUvyCN2GuIC9ROeiTFTx8uugmVvEmYUbsSsBn7c vLhk7ZO1ft1M5EFfK8bRUck0s3Mbvg/OMfGkL8SXJGcagqfjEgCGpxAhutF318FA6XX8 hL4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678781363; 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=dpSUX7WridYFFvb5Xp7cUrsNqCFgLBD3FO2lvz7TpLw=; b=hPnMAZuRv9Qp3Y6myjE9S7tqu9cXjB8XKGQQ01ioRMtKqc4hTi5G7j1tlbpcyjlH3g 9arAHIRnAiOzs93xoxpkfR0+G3qxGbHr6/BTajBjuRXTt6Vg8f4L3el2nwbtSW1W61+z IhmYw7yYEmpCZGjiyBXG3pracuwnrOTDdLm5NFrvRy7VwQH2h3AXTdNJi5ClwpZ/froC VAxWCyC6H4KKSWYnXM6W8Z/u7ZVm9/haXLY3WfcpM/0RGdy6i05GjVLJclqIhlWsRvTs IuHsfMv++0jqfgFlta2qaraLd7tmEFbcU8htBv6LI4Wa1YJA++DpEzC/7ZrLEgbjHU2v l8Ag== X-Gm-Message-State: AO0yUKW8Q+rmPjkcZ1osVx90rbTcOPZJNsKGpA++qv5PcQ9NnpMpe+W7 MBLM8HWSuxWX24D6fPQZYW552QL5XCPYy3T7btE= X-Google-Smtp-Source: AK7set+oQzK0YF58etbtDT3XedATdfjVZZOCg/XVjGBoot/E8Ncg3zAWKakxktZtLLUin0yiT1J46Q== X-Received: by 2002:aa7:cf0c:0:b0:4fd:8210:58d4 with SMTP id a12-20020aa7cf0c000000b004fd821058d4mr1270463edy.15.1678781363393; Tue, 14 Mar 2023 01:09:23 -0700 (PDT) Received: from krzk-bin.. ([2a02:810d:15c0:828:6932:5570:6254:9edd]) by smtp.gmail.com with ESMTPSA id co2-20020a0564020c0200b004fce9ff4830sm584872edb.88.2023.03.14.01.09.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Mar 2023 01:09:23 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Jassi Brar , Rob Herring , Krzysztof Kozlowski , Manivannan Sadhasivam , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH v2 04/13] mailbox: qcom-apcs-ipc: do not grow the of_device_id Date: Tue, 14 Mar 2023 09:09:08 +0100 Message-Id: <20230314080917.68246-5-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230314080917.68246-1-krzysztof.kozlowski@linaro.org> References: <20230314080917.68246-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org 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 --- 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..f3ac0b035945 100644 --- a/drivers/mailbox/qcom-apcs-ipc-mailbox.c +++ b/drivers/mailbox/qcom-apcs-ipc-mailbox.c @@ -143,17 +143,19 @@ static int qcom_apcs_ipc_remove(struct platform_device *pdev) 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 }, + { .compatible = "qcom,msm8996-apcs-hmss-global", .data = &msm8996_apcs_data }, + { .compatible = "qcom,sc7180-apss-shared", .data = &apps_shared_apcs_data }, + { .compatible = "qcom,sdx55-apcs-gcc", .data = &sdx55_apcs_data }, + /* Do not add any more entries using existing driver data */ + { .compatible = "qcom,ipq8074-apcs-apps-global", .data = &ipq6018_apcs_data }, + { .compatible = "qcom,msm8939-apcs-kpss-global", .data = &msm8916_apcs_data }, { .compatible = "qcom,msm8976-apcs-kpss-global", .data = &msm8994_apcs_data }, { .compatible = "qcom,msm8994-apcs-kpss-global", .data = &msm8994_apcs_data }, - { .compatible = "qcom,msm8996-apcs-hmss-global", .data = &msm8996_apcs_data }, { .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 }, @@ -161,7 +163,6 @@ static const struct of_device_id qcom_apcs_ipc_of_match[] = { { .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 }, {} }; MODULE_DEVICE_TABLE(of, qcom_apcs_ipc_of_match);