From patchwork Tue Apr 4 04:56:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 78849 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2782594vqo; Mon, 3 Apr 2023 22:12:49 -0700 (PDT) X-Google-Smtp-Source: AKy350bPN9FE82uOHXe1KZN/OYXSBdT6iWphJvtcjM39sw4G1xTPbW3YSrunbNGToGOXAc1l+1Hd X-Received: by 2002:a17:907:6d9f:b0:931:de76:c2e8 with SMTP id sb31-20020a1709076d9f00b00931de76c2e8mr1365641ejc.9.1680585168839; Mon, 03 Apr 2023 22:12:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680585168; cv=none; d=google.com; s=arc-20160816; b=nWzT5IE2fDlEAg7BEXGHnQwaY3bLhnjCDlxGi9eVz0oAOCad1JN/dpkl20QOaPCGX8 fSiUBVsVorzI4vO90omo7Ey6Vu2tJvxclMWLwEavQDDJr6dLYO5HfJwwsAUnXyUUFjLw Jj/4x2F+LunstIYL3uM4UCQRd6QEtkgL4hmOav1zr6tfbx5cwKgBABK4+2vHRlTppq2u nVAkQoKeMgKp5jei4IuJEXiE2B73uGBpc6aFoqA4GgH0G2wGre0A/DwdW49q0XyskMEc z3f/Bo5R2QV5OUzZ9frxmCkRJC0fVX1i+ZV/1lxjlkusv7buBfmpEkIBZ+LUqkcIXifi /vGg== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=QKZWZ6qe5WY9qFxCE5MU962KpHv/yHGk9SM8f97LrNI=; b=siD2/vIv6W48Lh/UlmtbsocKyKZ4mHaoUaFKxViGY1nSZgoUZT04gmj09O5ScchQMg FIF24H7pPEeTkrvUXMdxtEW8PJCpVQvSu3QIzfXhgjqGpi7IWzatKhcvxoia/T/R2mFQ 58rLm9zXdEdZjQ1Uuy6EWulGzT8VSbDhOvJyxFsy9VUXSkxea1R7mGcqsd9J0+jkTUuP 6+p5ehkF9CmOYh8zDHuFUq5I7Tc+0tMtC2A2uz2we58AepgJ8L5Zc4SIVFXOsXBjq9/6 9sMbz0jrxeUcDQCLHFjhyWNLv+d5UZZSVTE6yRFmjeA5525TbGftVNhyiNhvLE+ARxv3 Ddbg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=jsIPPz2U; 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=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z19-20020a170906715300b009318f826868si7913800ejj.640.2023.04.03.22.12.25; Mon, 03 Apr 2023 22:12:48 -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=@kernel.org header.s=k20201202 header.b=jsIPPz2U; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233184AbjDDE4m (ORCPT + 99 others); Tue, 4 Apr 2023 00:56:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44184 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233169AbjDDE4k (ORCPT ); Tue, 4 Apr 2023 00:56:40 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9BD131BE1; Mon, 3 Apr 2023 21:56:38 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 2AF3462772; Tue, 4 Apr 2023 04:56:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3A8F8C433EF; Tue, 4 Apr 2023 04:56:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1680584197; bh=DEj7fP4yjaJYRm0hK8YbMkOV78W9FUtbKMsN0uDAz4Q=; h=From:To:Cc:Subject:Date:From; b=jsIPPz2U4XtabVsmSKvsFRyZNqWTmmtZnTtO9J4sNtkztz51JGfaiKxbX/TaNOBuU fGdbIrMUQIuT29BDoTnmA4nen1n8MQyf9DtBq8coohhLPVIeHHxf3KZmiIxNtC+pz1 MRjh/4fID5Zimdum/pVMkX9cqCwkEuiXkuE0txlnR6zsfIdBAShAqNF2OKWttQPuVS VVG7yKFr5/VFKT28MfXCLQTY9fw6+njKgXSqvyOivk4LZk7J1xy1R3kUJ87ShjPSsW zezg11hu1DSVrS+AM5AwGx465qyX6lQGE5aTiFx8MIFEwhtGhqRh5sHVZcUpwMLOOM BMsComMRqpm1g== From: Stephen Boyd To: Michael Turquette , Stephen Boyd Cc: linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, patches@lists.linux.dev, "Garmin . Chang" , Chen-Yu Tsai , AngeloGioacchino Del Regno , kernel test robot Subject: [PATCH v2] clk: mediatek: Use right match table, include mod_devicetable Date: Mon, 3 Apr 2023 21:56:36 -0700 Message-Id: <20230404045636.1114141-1-sboyd@kernel.org> X-Mailer: git-send-email 2.40.0.348.gf938b09366-goog MIME-Version: 1.0 X-Spam-Status: No, score=-2.5 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,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?1762221273604658060?= X-GMAIL-MSGID: =?utf-8?q?1762221273604658060?= This is copy/pasta that breaks modular builds. Fix the match table to use the right pointer, or the right device table type. And while we're including the header, fix the order to be linux, dt-bindings, and finally local. Cc: Garmin.Chang Cc: Chen-Yu Tsai Cc: AngeloGioacchino Del Regno Fixes: f42b9e9a43e3 ("clk: mediatek: Add MT8188 wpesys clock support") Fixes: 0d2f2cefba64 ("clk: mediatek: Add MT8188 adsp clock support") Fixes: e4aaa60eae16 ("clk: mediatek: Add MT8188 vdosys0 clock support") Fixes: cfa4609f9bbe ("clk: mediatek: Add MT8188 vdosys1 clock support") Fixes: bb87c1109ce2 ("clk: mediatek: Add MT8188 vencsys clock support") Fixes: f42b9e9a43e3 ("clk: mediatek: Add MT8188 wpesys clock support") Reported-by: kernel test robot Link: https://lore.kernel.org/oe-kbuild-all/202304011039.UBDX1UOT-lkp@intel.com/ Link: https://lore.kernel.org/oe-kbuild-all/202304020649.QO2HlpD5-lkp@intel.com/ Link: https://lore.kernel.org/oe-kbuild-all/202304021055.WDhQPcoS-lkp@intel.com/ Signed-off-by: Stephen Boyd Reviewed-by: AngeloGioacchino Del Regno --- drivers/clk/mediatek/clk-mt8188-adsp_audio26m.c | 6 ++++-- drivers/clk/mediatek/clk-mt8188-imp_iic_wrap.c | 6 ++++-- drivers/clk/mediatek/clk-mt8188-vdo0.c | 4 +++- drivers/clk/mediatek/clk-mt8188-vdo1.c | 4 +++- drivers/clk/mediatek/clk-mt8188-venc.c | 6 ++++-- drivers/clk/mediatek/clk-mt8188-wpe.c | 2 +- 6 files changed, 19 insertions(+), 9 deletions(-) diff --git a/drivers/clk/mediatek/clk-mt8188-adsp_audio26m.c b/drivers/clk/mediatek/clk-mt8188-adsp_audio26m.c index b3c31ffff931..808f2ad3b7ee 100644 --- a/drivers/clk/mediatek/clk-mt8188-adsp_audio26m.c +++ b/drivers/clk/mediatek/clk-mt8188-adsp_audio26m.c @@ -4,10 +4,12 @@ * Author: Garmin Chang */ -#include #include +#include #include +#include + #include "clk-gate.h" #include "clk-mtk.h" @@ -34,7 +36,7 @@ static const struct of_device_id of_match_clk_mt8188_adsp_audio26m[] = { { .compatible = "mediatek,mt8188-adsp-audio26m", .data = &adsp_audio26m_desc }, { /* sentinel */ } }; -MODULE_DEVICE_TABLE(platform, of_match_clk_mt8188_adsp_audio26m); +MODULE_DEVICE_TABLE(of, of_match_clk_mt8188_adsp_audio26m); static struct platform_driver clk_mt8188_adsp_audio26m_drv = { .probe = mtk_clk_simple_probe, diff --git a/drivers/clk/mediatek/clk-mt8188-imp_iic_wrap.c b/drivers/clk/mediatek/clk-mt8188-imp_iic_wrap.c index 2238d2984320..da41a3c59919 100644 --- a/drivers/clk/mediatek/clk-mt8188-imp_iic_wrap.c +++ b/drivers/clk/mediatek/clk-mt8188-imp_iic_wrap.c @@ -4,10 +4,12 @@ * Author: Garmin Chang */ -#include #include +#include #include +#include + #include "clk-gate.h" #include "clk-mtk.h" @@ -65,7 +67,7 @@ static const struct of_device_id of_match_clk_mt8188_imp_iic_wrap[] = { { .compatible = "mediatek,mt8188-imp-iic-wrap-en", .data = &imp_iic_wrap_en_desc }, { /* sentinel */ } }; -MODULE_DEVICE_TABLE(platform, of_match_clk_mt8188_imp_iic_wrap); +MODULE_DEVICE_TABLE(of, of_match_clk_mt8188_imp_iic_wrap); static struct platform_driver clk_mt8188_imp_iic_wrap_drv = { .probe = mtk_clk_simple_probe, diff --git a/drivers/clk/mediatek/clk-mt8188-vdo0.c b/drivers/clk/mediatek/clk-mt8188-vdo0.c index 0c61c2dc4337..d2be44c2f3f5 100644 --- a/drivers/clk/mediatek/clk-mt8188-vdo0.c +++ b/drivers/clk/mediatek/clk-mt8188-vdo0.c @@ -4,10 +4,12 @@ * Author: Garmin Chang */ -#include #include +#include #include +#include + #include "clk-gate.h" #include "clk-mtk.h" diff --git a/drivers/clk/mediatek/clk-mt8188-vdo1.c b/drivers/clk/mediatek/clk-mt8188-vdo1.c index 99fcf6d7b1ab..2ef8cae2e16e 100644 --- a/drivers/clk/mediatek/clk-mt8188-vdo1.c +++ b/drivers/clk/mediatek/clk-mt8188-vdo1.c @@ -4,10 +4,12 @@ * Author: Garmin Chang */ -#include #include +#include #include +#include + #include "clk-gate.h" #include "clk-mtk.h" diff --git a/drivers/clk/mediatek/clk-mt8188-venc.c b/drivers/clk/mediatek/clk-mt8188-venc.c index 6f6589ccd5a0..245367f33fa5 100644 --- a/drivers/clk/mediatek/clk-mt8188-venc.c +++ b/drivers/clk/mediatek/clk-mt8188-venc.c @@ -4,10 +4,12 @@ * Author: Garmin Chang */ -#include #include +#include #include +#include + #include "clk-gate.h" #include "clk-mtk.h" @@ -39,7 +41,7 @@ static const struct of_device_id of_match_clk_mt8188_venc1[] = { { .compatible = "mediatek,mt8188-vencsys", .data = &venc1_desc }, { /* sentinel */ } }; -MODULE_DEVICE_TABLE(platform, of_match_clk_mt8188_venc1); +MODULE_DEVICE_TABLE(of, of_match_clk_mt8188_venc1); static struct platform_driver clk_mt8188_venc1_drv = { .probe = mtk_clk_simple_probe, diff --git a/drivers/clk/mediatek/clk-mt8188-wpe.c b/drivers/clk/mediatek/clk-mt8188-wpe.c index 5abded13cece..c372ff703f9c 100644 --- a/drivers/clk/mediatek/clk-mt8188-wpe.c +++ b/drivers/clk/mediatek/clk-mt8188-wpe.c @@ -88,7 +88,7 @@ static const struct of_device_id of_match_clk_mt8188_wpe[] = { { .compatible = "mediatek,mt8188-wpesys-vpp0", .data = &wpe_vpp0_desc }, { /* sentinel */ } }; -MODULE_DEVICE_TABLE(platform, clk_mt8188_vpp1_id_table); +MODULE_DEVICE_TABLE(platform, of_match_clk_mt8188_wpe); static struct platform_driver clk_mt8188_wpe_drv = { .probe = mtk_clk_simple_probe,