From patchwork Thu Feb 2 16:18:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 650249 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 52C01C64EC5 for ; Thu, 2 Feb 2023 16:19:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232506AbjBBQT6 (ORCPT ); Thu, 2 Feb 2023 11:19:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57572 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232828AbjBBQTo (ORCPT ); Thu, 2 Feb 2023 11:19:44 -0500 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2208F62786 for ; Thu, 2 Feb 2023 08:19:41 -0800 (PST) Received: by mail-wm1-x336.google.com with SMTP id j32-20020a05600c1c2000b003dc4fd6e61dso4099303wms.5 for ; Thu, 02 Feb 2023 08:19:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=A8TFBPo8Ik7unXzigxuHt3Uqoz8brKDN9WgByPaSgg0=; b=di+DTSEME47k+eUSJH20fVKTnFF0bGKgtVJ1zywshrewXPYmEYB1GmHr+yDaq/LWX+ MPNFC6WgLl7t77OFuvUBmKvdgh/fJxHSS860AKs3w0RaUO/h7FJnV2PZYdoQ+Y3VUsaZ K4Wu1J0jbPGZPgt6X3ExY/1s9G5rvpQXqAlZrVyolR1gxTBVBiqnapcEQ5jfqf3zNu1Y rth0jYQRkV3Lr2PrQQUMp6aZyBBZqLt6UMiFy/M/Ea52Y3mDDbbf8d9hQsctvBbeJBYU kHkZD6IXqMMDi40H+4oCXooi+1aRAKZukIJSNOeKoUKKn/nY3E/IPUQoR4vyt2+27zol PNeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=A8TFBPo8Ik7unXzigxuHt3Uqoz8brKDN9WgByPaSgg0=; b=DOyYn/9Gdr5b8qfsghlqXxZ+BUs983Z0w8vWBhY5ve2Dpz8hURUdGDmQWHrV008rsk hsyjjgIbnCG972S2iqYv4etRFL7CX/6IrI44MCj+iin/vHpAVu8HgwRASoZ/Y0aasqIs ld8LQOAvliiCByzXTqrUMb7Shepoo3LxHvZ8geoq8GyFM4JExgBt2mrLInEPr3VirB3c 6kpPc+nA/w0BSnYXL+j4NUlYxYV4u/JExiFpTVVnRngGRrU0VCU9ZgZ2d1r+8/Z7B8Kk j270ojnNwroyT5EzNpIYq+utniidZDvB9jBbl4rBx2My1YB/tfwgD8sPehNdqfO7vj1i QezA== X-Gm-Message-State: AO0yUKWnwSRugmltlQ8CFK9+KdjZAeTZRHlaVcyJasAsyXRGOmmmwyYj 2qoZXEYB0bazI/b03UHHuz0Ivg== X-Google-Smtp-Source: AK7set+mwutHWqAinDWHeXsdufMWMjyvrW/Zq+XZNJUM8vbew9Gvd3OVGfZSvkvC08mv4huWkIazOg== X-Received: by 2002:a05:600c:198b:b0:3df:3bd6:63e5 with SMTP id t11-20020a05600c198b00b003df3bd663e5mr4851702wmq.12.1675354779683; Thu, 02 Feb 2023 08:19:39 -0800 (PST) Received: from krzk-bin.. ([178.197.216.144]) by smtp.gmail.com with ESMTPSA id h16-20020a05600c351000b003dc521f336esm212416wmq.14.2023.02.02.08.19.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Feb 2023 08:19:39 -0800 (PST) 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 03/13] mailbox: qcom-apcs-ipc: do not grow the of_device_id Date: Thu, 2 Feb 2023 17:18:46 +0100 Message-Id: <20230202161856.385825-4-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230202161856.385825-1-krzysztof.kozlowski@linaro.org> References: <20230202161856.385825-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 0e9f9cba8668..4143209de2c8 100644 --- a/drivers/mailbox/qcom-apcs-ipc-mailbox.c +++ b/drivers/mailbox/qcom-apcs-ipc-mailbox.c @@ -142,17 +142,19 @@ 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,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 }, @@ -160,7 +162,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);