Commit 20425f63 authored by Kevin Hilman's avatar Kevin Hilman Committed by Jerome Brunet
Browse files

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: default avatarKevin Hilman <khilman@baylibre.com>
Signed-off-by: default avatarJerome Brunet <jbrunet@baylibre.com>
Acked-by: default avatarStephen Boyd <sboyd@kernel.org>
Link: https://lore.kernel.org/r/20201118191405.36798-1-khilman@baylibre.com
parent bae69bfa

drivers/clk/meson/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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"
@@ -2173,6 +2174,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,
@@ -2182,4 +2184,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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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"
@@ -5372,6 +5373,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,
@@ -5381,4 +5383,5 @@ static struct platform_driver g12a_driver = { 
	},

};



builtin_platform_driver(g12a_driver);
 
module_platform_driver(g12a_driver);

MODULE_LICENSE("GPL v2");

CRA Git | Maintained and supported by SUSTech CRA and CCSE