clk: mediatek: Use right match table, include mod_devicetable
Subsystems (2)
Stephen Boyd
maintainerPATCH v2 1/1 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 <[email protected]>
Cc Chen-Yu Tsai <[email protected]>
Cc AngeloGioacchino Del Regno <[email protected]>
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 <[email protected]>
Signed-off-by Stephen Boyd <[email protected]>
--- 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(-)
drivers/clk/mediatek/clk-mt8188-adsp_audio26m.c +4 -2
@@ -4,10 +4,12 @@* Author: Garmin Chang <[email protected]> */ -#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
@@ -4,10 +4,12 @@* Author: Garmin Chang <[email protected]> */ -#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
@@ -4,10 +4,12 @@* Author: Garmin Chang <[email protected]> */ -#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
@@ -4,10 +4,12 @@* Author: Garmin Chang <[email protected]> */ -#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
@@ -4,10 +4,12 @@* Author: Garmin Chang <[email protected]> */ -#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,
drivers/clk/mediatek/clk-mt8188-wpe.c +1 -1
@@ -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,
Signature · 2 lines
https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git/ https://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git
Il 04/04/23 06:56, Stephen Boyd ha scritto:
Quoted 5 lines
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.
Quoted 14 lines
Cc Garmin.Chang <[email protected]>Cc Chen-Yu Tsai <[email protected]>Cc AngeloGioacchino Del Regno <[email protected]>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 <[email protected]>Signed-off-by Stephen Boyd <[email protected]>
Reviewed-by AngeloGioacchino Del Regno <[email protected]>
Stephen Boyd
maintainerQuoting Stephen Boyd (2023-04-03 21:56:36)
drivers/clk/mediatek/clk-mt8188-wpe.c static const struct of_device_id of_match_clk_mt8188_wpe[] = { · line 91
Quoted 10 lines
drivers/clk/mediatek/clk-mt8188-wpe.c +1
-1@@ -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);
This one is still wrong. v3 coming up.