Commit e0e3aca9 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

clk: mediatek: Use right match table, include mod_devicetable 



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 <Garmin.Chang@mediatek.com>
Cc: Chen-Yu Tsai <wenst@chromium.org>
Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Fixes: f42b9e9a ("clk: mediatek: Add MT8188 wpesys clock support")
Fixes: 0d2f2cef ("clk: mediatek: Add MT8188 adsp clock support")
Fixes: e4aaa60e ("clk: mediatek: Add MT8188 vdosys0 clock support")
Fixes: cfa4609f ("clk: mediatek: Add MT8188 vdosys1 clock support")
Fixes: bb87c110 ("clk: mediatek: Add MT8188 vencsys clock support")
Reported-by: default avatarkernel test robot <lkp@intel.com>
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: default avatarStephen Boyd <sboyd@kernel.org>
Link: https://lore.kernel.org/r/20230404204553.1256263-1-sboyd@kernel.org
parent 0d2f2cef

drivers/clk/mediatek/clk-mt8188-adsp_audio26m.c

+4 −2
Original line number Diff line number Diff line
@@ -4,10 +4,12 @@ 
 * Author: Garmin Chang <garmin.chang@mediatek.com>

 */



#include <dt-bindings/clock/mediatek,mt8188-clk.h>

#include <linux/clk-provider.h>

#include <linux/mod_devicetable.h>

#include <linux/platform_device.h>



#include <dt-bindings/clock/mediatek,mt8188-clk.h>



#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,

drivers/clk/mediatek/clk-mt8188-imp_iic_wrap.c

+4 −2
Original line number Diff line number Diff line
@@ -4,10 +4,12 @@ 
 * Author: Garmin Chang <garmin.chang@mediatek.com>

 */



#include <dt-bindings/clock/mediatek,mt8188-clk.h>

#include <linux/clk-provider.h>

#include <linux/mod_devicetable.h>

#include <linux/platform_device.h>



#include <dt-bindings/clock/mediatek,mt8188-clk.h>



#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,

drivers/clk/mediatek/clk-mt8188-vdo0.c

+3 −1
Original line number Diff line number Diff line
@@ -4,10 +4,12 @@ 
 * Author: Garmin Chang <garmin.chang@mediatek.com>

 */



#include <dt-bindings/clock/mediatek,mt8188-clk.h>

#include <linux/clk-provider.h>

#include <linux/mod_devicetable.h>

#include <linux/platform_device.h>



#include <dt-bindings/clock/mediatek,mt8188-clk.h>



#include "clk-gate.h"

#include "clk-mtk.h"

drivers/clk/mediatek/clk-mt8188-vdo1.c

+3 −1
Original line number Diff line number Diff line
@@ -4,10 +4,12 @@ 
 * Author: Garmin Chang <garmin.chang@mediatek.com>

 */



#include <dt-bindings/clock/mediatek,mt8188-clk.h>

#include <linux/clk-provider.h>

#include <linux/mod_devicetable.h>

#include <linux/platform_device.h>



#include <dt-bindings/clock/mediatek,mt8188-clk.h>



#include "clk-gate.h"

#include "clk-mtk.h"

drivers/clk/mediatek/clk-mt8188-venc.c

+4 −2
Original line number Diff line number Diff line
@@ -4,10 +4,12 @@ 
 * Author: Garmin Chang <garmin.chang@mediatek.com>

 */



#include <dt-bindings/clock/mediatek,mt8188-clk.h>

#include <linux/clk-provider.h>

#include <linux/mod_devicetable.h>

#include <linux/platform_device.h>



#include <dt-bindings/clock/mediatek,mt8188-clk.h>



#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,