clk: meson: enable building as modules
Kevin Hilman
maintainerPATCH v2 1/1 clk: meson: enable building as modules
Make it possible to build all clk drivers as modules, but default remains built-in.
No functional changes.
Signed-off-by Kevin Hilman <[email protected]>
Acked-by Stephen Boyd <[email protected]>
---
v2: drop G12A Kconfig fix, separated out into separate patch
drivers/clk/meson/Kconfig | 6 +++--- drivers/clk/meson/axg-aoclk.c | 5 ++++- drivers/clk/meson/axg.c | 5 ++++- drivers/clk/meson/g12a-aoclk.c | 5 ++++- drivers/clk/meson/g12a.c | 5 ++++- drivers/clk/meson/gxbb-aoclk.c | 5 ++++- drivers/clk/meson/gxbb.c | 5 ++++- drivers/clk/meson/meson-aoclk.c | 4 ++++ drivers/clk/meson/meson-eeclk.c | 3 +++ 9 files changed, 34 insertions(+), 9 deletions(-)
drivers/clk/meson/Kconfig +3 -3
@@ -58,7 +58,7 @@ config COMMON_CLK_MESON8B want peripherals and CPU frequency scaling to work. config COMMON_CLK_GXBB - bool "GXBB and GXL SoC clock controllers support" + tristate "GXBB and GXL SoC clock controllers support" depends on ARM64 default y select COMMON_CLK_MESON_REGMAP
@@ -74,7 +74,7 @@ config COMMON_CLK_GXBB Say Y if you want peripherals and CPU frequency scaling to work. config COMMON_CLK_AXG - bool "AXG SoC clock controllers support" + tristate "AXG SoC clock controllers support" depends on ARM64 default y select COMMON_CLK_MESON_REGMAP
@@ -100,7 +100,7 @@ config COMMON_CLK_AXG_AUDIO aka axg, Say Y if you want audio subsystem to work. config COMMON_CLK_G12A - bool "G12 and SM1 SoC clock controllers support" + tristate "G12 and SM1 SoC clock controllers support" depends on ARM64 default y select COMMON_CLK_MESON_REGMAP
drivers/clk/meson/axg-aoclk.c +4 -1
@@ -12,6 +12,7 @@#include <linux/platform_device.h> #include <linux/reset-controller.h> #include <linux/mfd/syscon.h> +#include <linux/module.h> #include "meson-aoclk.h" #include "axg-aoclk.h"
@@ -326,6 +327,7 @@ static const struct of_device_id axg_aoclkc_match_table[] = { }, { } }; +MODULE_DEVICE_TABLE (of, axg_aoclkc_match_table);static struct platform_driver axg_aoclkc_driver = { .probe = meson_aoclkc_probe,
@@ -335,4 +337,5 @@ static struct platform_driver axg_aoclkc_driver = { }, }; -builtin_platform_driver (axg_aoclkc_driver); +module_platform_driver (axg_aoclkc_driver); +MODULE_LICENSE ("GPL v2" );
drivers/clk/meson/axg.c +4 -1
@@ -13,6 +13,7 @@#include <linux/init.h> #include <linux/of_device.h> #include <linux/platform_device.h> +#include <linux/module.h> #include "clk-regmap.h" #include "clk-pll.h"
@@ -1354,6 +1355,7 @@ static const struct of_device_id clkc_match_table[] = { { .compatible = "amlogic,axg-clkc", .data = &axg_clkc_data }, {} }; +MODULE_DEVICE_TABLE (of, clkc_match_table);static struct platform_driver axg_driver = { .probe = meson_eeclkc_probe,
@@ -1363,4 +1365,5 @@ static struct platform_driver axg_driver = { }, }; -builtin_platform_driver (axg_driver); +module_platform_driver (axg_driver); +MODULE_LICENSE ("GPL v2" );
drivers/clk/meson/g12a-aoclk.c +4 -1
@@ -12,6 +12,7 @@#include <linux/platform_device.h> #include <linux/reset-controller.h> #include <linux/mfd/syscon.h> +#include <linux/module.h> #include "meson-aoclk.h" #include "g12a-aoclk.h"
@@ -461,6 +462,7 @@ static const struct of_device_id g12a_aoclkc_match_table[] = { }, { } }; +MODULE_DEVICE_TABLE (of, g12a_aoclkc_match_table);static struct platform_driver g12a_aoclkc_driver = { .probe = meson_aoclkc_probe,
@@ -470,4 +472,5 @@ static struct platform_driver g12a_aoclkc_driver = { }, }; -builtin_platform_driver (g12a_aoclkc_driver); +module_platform_driver (g12a_aoclkc_driver); +MODULE_LICENSE ("GPL v2" );
drivers/clk/meson/g12a.c +4 -1
@@ -15,6 +15,7 @@#include <linux/of_device.h> #include <linux/platform_device.h> #include <linux/clk.h> +#include <linux/module.h> #include "clk-mpll.h" #include "clk-pll.h"
@@ -5370,6 +5371,7 @@ static const struct of_device_id clkc_match_table[] = { }, {} }; +MODULE_DEVICE_TABLE (of, clkc_match_table);static struct platform_driver g12a_driver = { .probe = meson_g12a_probe,
@@ -5379,4 +5381,5 @@ static struct platform_driver g12a_driver = { }, }; -builtin_platform_driver (g12a_driver); +module_platform_driver (g12a_driver); +MODULE_LICENSE ("GPL v2" );
drivers/clk/meson/gxbb-aoclk.c +4 -1
@@ -5,6 +5,7 @@*/ #include <linux/platform_device.h> #include <linux/mfd/syscon.h> +#include <linux/module.h> #include "meson-aoclk.h" #include "gxbb-aoclk.h"
@@ -287,6 +288,7 @@ static const struct of_device_id gxbb_aoclkc_match_table[] = { }, { } }; +MODULE_DEVICE_TABLE (of, gxbb_aoclkc_match_table);static struct platform_driver gxbb_aoclkc_driver = { .probe = meson_aoclkc_probe,
@@ -295,4 +297,5 @@ static struct platform_driver gxbb_aoclkc_driver = { .of_match_table = gxbb_aoclkc_match_table, }, }; -builtin_platform_driver (gxbb_aoclkc_driver); +module_platform_driver (gxbb_aoclkc_driver); +MODULE_LICENSE ("GPL v2" );
drivers/clk/meson/gxbb.c +4 -1
@@ -8,6 +8,7 @@#include <linux/init.h> #include <linux/of_device.h> #include <linux/platform_device.h> +#include <linux/module.h> #include "gxbb.h" #include "clk-regmap.h"
@@ -3519,6 +3520,7 @@ static const struct of_device_id clkc_match_table[] = { { .compatible = "amlogic,gxl-clkc", .data = &gxl_clkc_data }, {}, }; +MODULE_DEVICE_TABLE (of, clkc_match_table);static struct platform_driver gxbb_driver = { .probe = meson_eeclkc_probe,
@@ -3528,4 +3530,5 @@ static struct platform_driver gxbb_driver = { }, }; -builtin_platform_driver (gxbb_driver); +module_platform_driver (gxbb_driver); +MODULE_LICENSE ("GPL v2" );
drivers/clk/meson/meson-aoclk.c +4 -0
@@ -14,6 +14,8 @@#include <linux/reset-controller.h> #include <linux/mfd/syscon.h> #include <linux/of_device.h> +#include <linux/module.h> +#include <linux/slab.h> #include "meson-aoclk.h"
@@ -84,3 +86,5 @@ int meson_aoclkc_probe(struct platform_device *pdev)return devm_of_clk_add_hw_provider (dev, of_clk_hw_onecell_get, (void *) data->hw_data); } +EXPORT_SYMBOL_GPL (meson_aoclkc_probe); +MODULE_LICENSE ("GPL v2" );
drivers/clk/meson/meson-eeclk.c +3 -0
@@ -9,6 +9,7 @@#include <linux/platform_device.h> #include <linux/mfd/syscon.h> #include <linux/regmap.h> +#include <linux/module.h> #include "clk-regmap.h" #include "meson-eeclk.h"
@@ -54,3 +55,5 @@ int meson_eeclkc_probe(struct platform_device *pdev)return devm_of_clk_add_hw_provider (dev, of_clk_hw_onecell_get, data->hw_onecell_data); } +EXPORT_SYMBOL_GPL (meson_eeclkc_probe); +MODULE_LICENSE ("GPL v2" );
Signature · 7 lines
2.28.0 _______________________________________________ linux-amlogic mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-amlogic
Quoted 7 lines · Kevin Hilman
Make it possible to build all clk drivers as modules, but default remains built-in.
No functional changes.
Signed-off-by Kevin Hilman <[email protected]>Acked-by Stephen Boyd <[email protected]>
Applied
Quoted 244 lines
---
v2: drop G12AKconfigfix, separated out into separate patchdrivers/clk/meson/Kconfig | 6 +++--- drivers/clk/meson/axg-aoclk.c | 5 ++++- drivers/clk/meson/axg.c | 5 ++++- drivers/clk/meson/g12a-aoclk.c | 5 ++++- drivers/clk/meson/g12a.c | 5 ++++- drivers/clk/meson/gxbb-aoclk.c | 5 ++++- drivers/clk/meson/gxbb.c | 5 ++++- drivers/clk/meson/meson-aoclk.c | 4 ++++ drivers/clk/meson/meson-eeclk.c | 3 +++ 9 files changed, 34 insertions(+), 9 deletions(-)drivers/clk/meson/Kconfig +3
-3@@ -58,7 +58,7 @@ config COMMON_CLK_MESON8B want peripherals and CPU frequency scaling to work. config COMMON_CLK_GXBB - bool "GXBB and GXL SoC clock controllers support" + tristate "GXBB and GXL SoC clock controllers support" depends on ARM64 default y select COMMON_CLK_MESON_REGMAP@@ -74,7 +74,7 @@ config COMMON_CLK_GXBB Say Y if you want peripherals and CPU frequency scaling to work. config COMMON_CLK_AXG - bool "AXG SoC clock controllers support" + tristate "AXG SoC clock controllers support" depends on ARM64 default y select COMMON_CLK_MESON_REGMAP@@ -100,7 +100,7 @@ config COMMON_CLK_AXG_AUDIO aka axg, Say Y if you want audio subsystem to work. config COMMON_CLK_G12A - bool "G12 and SM1 SoC clock controllers support" + tristate "G12 and SM1 SoC clock controllers support" depends on ARM64 default y select COMMON_CLK_MESON_REGMAPdrivers/clk/meson/axg-aoclk.c +4
-1@@ -12,6 +12,7 @@#include <linux/platform_device.h> #include <linux/reset-controller.h> #include <linux/mfd/syscon.h> +#include <linux/module.h> #include "meson-aoclk.h" #include "axg-aoclk.h" @@ -326,6 +327,7 @@ static const struct of_device_id axg_aoclkc_match_table[] = { }, { } }; +MODULE_DEVICE_TABLE (of, axg_aoclkc_match_table);static struct platform_driver axg_aoclkc_driver = { .probe = meson_aoclkc_probe,@@ -335,4 +337,5 @@ static struct platform_driver axg_aoclkc_driver = { }, }; -builtin_platform_driver (axg_aoclkc_driver); +module_platform_driver (axg_aoclkc_driver); +MODULE_LICENSE ("GPL v2" );drivers/clk/meson/axg.c +4
-1@@ -13,6 +13,7 @@#include <linux/init.h> #include <linux/of_device.h> #include <linux/platform_device.h> +#include <linux/module.h> #include "clk-regmap.h" #include "clk-pll.h" @@ -1354,6 +1355,7 @@ static const struct of_device_id clkc_match_table[] = { { .compatible = "amlogic,axg-clkc", .data = &axg_clkc_data }, {} }; +MODULE_DEVICE_TABLE (of, clkc_match_table);static struct platform_driver axg_driver = { .probe = meson_eeclkc_probe,@@ -1363,4 +1365,5 @@ static struct platform_driver axg_driver = { }, }; -builtin_platform_driver (axg_driver); +module_platform_driver (axg_driver); +MODULE_LICENSE ("GPL v2" );drivers/clk/meson/g12a-aoclk.c +4
-1@@ -12,6 +12,7 @@#include <linux/platform_device.h> #include <linux/reset-controller.h> #include <linux/mfd/syscon.h> +#include <linux/module.h> #include "meson-aoclk.h" #include "g12a-aoclk.h" @@ -461,6 +462,7 @@ static const struct of_device_id g12a_aoclkc_match_table[] = { }, { } }; +MODULE_DEVICE_TABLE (of, g12a_aoclkc_match_table);static struct platform_driver g12a_aoclkc_driver = { .probe = meson_aoclkc_probe,@@ -470,4 +472,5 @@ static struct platform_driver g12a_aoclkc_driver = { }, }; -builtin_platform_driver (g12a_aoclkc_driver); +module_platform_driver (g12a_aoclkc_driver); +MODULE_LICENSE ("GPL v2" );drivers/clk/meson/g12a.c +4
-1@@ -15,6 +15,7 @@#include <linux/of_device.h> #include <linux/platform_device.h> #include <linux/clk.h> +#include <linux/module.h> #include "clk-mpll.h" #include "clk-pll.h" @@ -5370,6 +5371,7 @@ static const struct of_device_id clkc_match_table[] = { }, {} }; +MODULE_DEVICE_TABLE (of, clkc_match_table);static struct platform_driver g12a_driver = { .probe = meson_g12a_probe,@@ -5379,4 +5381,5 @@ static struct platform_driver g12a_driver = { }, }; -builtin_platform_driver (g12a_driver); +module_platform_driver (g12a_driver); +MODULE_LICENSE ("GPL v2" );drivers/clk/meson/gxbb-aoclk.c +4
-1@@ -5,6 +5,7 @@*/ #include <linux/platform_device.h> #include <linux/mfd/syscon.h> +#include <linux/module.h> #include "meson-aoclk.h" #include "gxbb-aoclk.h" @@ -287,6 +288,7 @@ static const struct of_device_id gxbb_aoclkc_match_table[] = { }, { } }; +MODULE_DEVICE_TABLE (of, gxbb_aoclkc_match_table);static struct platform_driver gxbb_aoclkc_driver = { .probe = meson_aoclkc_probe,@@ -295,4 +297,5 @@ static struct platform_driver gxbb_aoclkc_driver = { .of_match_table = gxbb_aoclkc_match_table, }, }; -builtin_platform_driver (gxbb_aoclkc_driver); +module_platform_driver (gxbb_aoclkc_driver); +MODULE_LICENSE ("GPL v2" );drivers/clk/meson/gxbb.c +4
-1@@ -8,6 +8,7 @@#include <linux/init.h> #include <linux/of_device.h> #include <linux/platform_device.h> +#include <linux/module.h> #include "gxbb.h" #include "clk-regmap.h" @@ -3519,6 +3520,7 @@ static const struct of_device_id clkc_match_table[] = { { .compatible = "amlogic,gxl-clkc", .data = &gxl_clkc_data }, {}, }; +MODULE_DEVICE_TABLE (of, clkc_match_table);static struct platform_driver gxbb_driver = { .probe = meson_eeclkc_probe,@@ -3528,4 +3530,5 @@ static struct platform_driver gxbb_driver = { }, }; -builtin_platform_driver (gxbb_driver); +module_platform_driver (gxbb_driver); +MODULE_LICENSE ("GPL v2" );drivers/clk/meson/meson-aoclk.c +4
-0@@ -14,6 +14,8 @@#include <linux/reset-controller.h> #include <linux/mfd/syscon.h> #include <linux/of_device.h> +#include <linux/module.h> +#include <linux/slab.h> #include "meson-aoclk.h" @@ -84,3 +86,5 @@ int meson_aoclkc_probe(struct platform_device *pdev)return devm_of_clk_add_hw_provider (dev, of_clk_hw_onecell_get, (void *) data->hw_data); } +EXPORT_SYMBOL_GPL (meson_aoclkc_probe); +MODULE_LICENSE ("GPL v2" );drivers/clk/meson/meson-eeclk.c +3
-0@@ -9,6 +9,7 @@#include <linux/platform_device.h> #include <linux/mfd/syscon.h> #include <linux/regmap.h> +#include <linux/module.h> #include "clk-regmap.h" #include "meson-eeclk.h" @@ -54,3 +55,5 @@ int meson_eeclkc_probe(struct platform_device *pdev)return devm_of_clk_add_hw_provider (dev, of_clk_hw_onecell_get, data->hw_onecell_data); } +EXPORT_SYMBOL_GPL (meson_eeclkc_probe); +MODULE_LICENSE ("GPL v2" );