soc: mx-socinfo: only build for arm
Kevin Hilman
maintainerPATCH 1/2 soc: mx-socinfo: only build for arm
This driver only supports 32-bit ARM SoCs. Only build it for those.
--- drivers/soc/amlogic/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/soc/amlogic/Kconfig +1 -1
@@ -63,7 +63,7 @@ config MESON_SECURE_PM_DOMAINS config MESON_MX_SOCINFO bool "Amlogic Meson MX SoC Information driver" - depends on ARCH_MESON || COMPILE_TEST + depends on (ARM && ARCH_MESON) || COMPILE_TEST default ARCH_MESON select SOC_BUS help
Signature · 7 lines
2.28.0 _______________________________________________ linux-amlogic mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-amlogic
Kevin Hilman
maintainerPATCH 2/2 soc: meson: enable building drivers as modules
Enable SoC drivers for 64-bit Amlogic SoCs to be built as modules.
--- drivers/soc/amlogic/Kconfig | 8 ++++---- drivers/soc/amlogic/meson-clk-measure.c | 5 ++++- drivers/soc/amlogic/meson-ee-pwrc.c | 5 ++++- drivers/soc/amlogic/meson-gx-pwrc-vpu.c | 5 ++++- drivers/soc/amlogic/meson-secure-pwrc.c | 5 ++++- 5 files changed, 20 insertions(+), 8 deletions(-)
drivers/soc/amlogic/Kconfig +4 -4
@@ -9,7 +9,7 @@ config MESON_CANVAS Say yes to support the canvas IP for Amlogic SoCs. config MESON_CLK_MEASURE - bool "Amlogic Meson SoC Clock Measure driver" + tristate "Amlogic Meson SoC Clock Measure driver" depends on ARCH_MESON || COMPILE_TEST default ARCH_MESON select REGMAP_MMIO
@@ -27,7 +27,7 @@ config MESON_GX_SOCINFO information about the type, package and version. config MESON_GX_PM_DOMAINS - bool "Amlogic Meson GX Power Domains driver" + tristate "Amlogic Meson GX Power Domains driver" depends on ARCH_MESON || COMPILE_TEST depends on PM && OF default ARCH_MESON
@@ -38,7 +38,7 @@ config MESON_GX_PM_DOMAINS Generic Power Domains. config MESON_EE_PM_DOMAINS - bool "Amlogic Meson Everything-Else Power Domains driver" + tristate "Amlogic Meson Everything-Else Power Domains driver" depends on ARCH_MESON || COMPILE_TEST depends on PM && OF default ARCH_MESON
@@ -49,7 +49,7 @@ config MESON_EE_PM_DOMAINS Generic Power Domains. config MESON_SECURE_PM_DOMAINS - bool "Amlogic Meson Secure Power Domains driver" + tristate "Amlogic Meson Secure Power Domains driver" depends on (ARCH_MESON || COMPILE_TEST) && MESON_SM depends on PM && OF depends on HAVE_ARM_SMCCC
drivers/soc/amlogic/meson-clk-measure.c +4 -1
@@ -10,6 +10,7 @@#include <linux/seq_file.h> #include <linux/debugfs.h> #include <linux/regmap.h> +#include <linux/module.h> static DEFINE_MUTEX (measure_lock);
@@ -681,6 +682,7 @@ static const struct of_device_id meson_msr_match_table[] = { }, {/* sentinel */ } }; +MODULE_DEVICE_TABLE (of, meson_msr_match_table);static struct platform_driver meson_msr_driver = { .probe = meson_msr_probe,
@@ -689,4 +691,5 @@ static struct platform_driver meson_msr_driver = { .of_match_table = meson_msr_match_table, }, }; -builtin_platform_driver (meson_msr_driver); +module_platform_driver (meson_msr_driver); +MODULE_LICENSE ("GPL v2" );
drivers/soc/amlogic/meson-ee-pwrc.c +4 -1
@@ -14,6 +14,7 @@#include <linux/reset-controller.h> #include <linux/reset.h> #include <linux/clk.h> +#include <linux/module.h> #include <dt-bindings/power/meson8-power.h> #include <dt-bindings/power/meson-axg-power.h> #include <dt-bindings/power/meson-g12a-power.h>
@@ -602,6 +603,7 @@ static const struct of_device_id meson_ee_pwrc_match_table[] = { }, {/* sentinel */ } }; +MODULE_DEVICE_TABLE (of, meson_ee_pwrc_match_table);static struct platform_driver meson_ee_pwrc_driver = { .probe = meson_ee_pwrc_probe,
@@ -611,4 +613,5 @@ static struct platform_driver meson_ee_pwrc_driver = { .of_match_table = meson_ee_pwrc_match_table, }, }; -builtin_platform_driver (meson_ee_pwrc_driver); +module_platform_driver (meson_ee_pwrc_driver); +MODULE_LICENSE ("GPL v2" );
drivers/soc/amlogic/meson-gx-pwrc-vpu.c +4 -1
@@ -14,6 +14,7 @@#include <linux/of_device.h> #include <linux/reset.h> #include <linux/clk.h> +#include <linux/module.h> /* AO Offsets */
@@ -364,6 +365,7 @@ static const struct of_device_id meson_gx_pwrc_vpu_match_table[] = { }, {/* sentinel */ } }; +MODULE_DEVICE_TABLE (of, meson_gx_pwrc_vpu_match_table);static struct platform_driver meson_gx_pwrc_vpu_driver = { .probe = meson_gx_pwrc_vpu_probe,
@@ -373,4 +375,5 @@ static struct platform_driver meson_gx_pwrc_vpu_driver = { .of_match_table = meson_gx_pwrc_vpu_match_table, }, }; -builtin_platform_driver (meson_gx_pwrc_vpu_driver); +module_platform_driver (meson_gx_pwrc_vpu_driver); +MODULE_LICENSE ("GPL v2" );
drivers/soc/amlogic/meson-secure-pwrc.c +4 -1
@@ -13,6 +13,7 @@#include <dt-bindings/power/meson-a1-power.h> #include <linux/arm-smccc.h> #include <linux/firmware/meson/meson_sm.h> +#include <linux/module.h> #define PWRC_ON 1#define PWRC_OFF 0
@@ -193,6 +194,7 @@ static const struct of_device_id meson_secure_pwrc_match_table[] = { }, {/* sentinel */ } }; +MODULE_DEVICE_TABLE (of, meson_secure_pwrc_match_table);static struct platform_driver meson_secure_pwrc_driver = { .probe = meson_secure_pwrc_probe,
@@ -201,4 +203,5 @@ static struct platform_driver meson_secure_pwrc_driver = { .of_match_table = meson_secure_pwrc_match_table, }, }; -builtin_platform_driver (meson_secure_pwrc_driver); +module_platform_driver (meson_secure_pwrc_driver); +MODULE_LICENSE ("Dual BSD/GPL" );
Signature · 7 lines
2.28.0 _______________________________________________ linux-amlogic mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-amlogic
Martin Blumenstingl
reviewerRe: [PATCH 2/2] soc: meson: enable building drivers as modules
Hi Kevin,
On Tue, Oct 20, 2020 at 12:47 AM Kevin Hilman <[email protected]> wrote:
[...]
Quoted 21 lines
drivers/soc/amlogic/meson-secure-pwrc.c +2
-0@@ -13,6 +13,7 @@#include <dt-bindings/power/meson-a1-power.h> #include <linux/arm-smccc.h> #include <linux/firmware/meson/meson_sm.h> +#include <linux/module.h> #define PWRC_ON 1#define PWRC_OFF 0@@ -193,6 +194,7 @@ static const struct of_device_id meson_secure_pwrc_match_table[] = { }, {/* sentinel */ } }; +MODULE_DEVICE_TABLE (of, meson_secure_pwrc_match_table);static struct platform_driver meson_secure_pwrc_driver = { .probe = meson_secure_pwrc_probe,
drivers/soc/amlogic/meson-secure-pwrc.c static struct platform_driver meson_secure_pwrc_driver = { · line 207
Quoted 6 lines
drivers/soc/amlogic/meson-secure-pwrc.c +2
-1@@ -201,4 +203,5 @@ static struct platform_driver meson_secure_pwrc_driver = { .of_match_table = meson_secure_pwrc_match_table, }, }; -builtin_platform_driver (meson_secure_pwrc_driver); +module_platform_driver (meson_secure_pwrc_driver); +MODULE_LICENSE ("Dual BSD/GPL" );
This file uses SPDX-License-Identifier: (GPL-2.0+ OR MIT) do we need to use MODULE_LICENSE("Dual MIT/GPL v2"); in this case?
Best regards,
Martin
_______________________________________________
linux-amlogic mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-amlogic
Kevin Hilman
maintainerRe: [PATCH 2/2] soc: meson: enable building drivers as modules
Quoted 22 lines · Martin Blumenstingl
Hi Kevin,
On Tue, Oct 20, 2020 at 12:47 AM Kevin Hilman <[email protected]> wrote:
[...]Quoted 18 lines
drivers/soc/amlogic/meson-secure-pwrc.c +2
-0@@ -13,6 +13,7 @@#include <dt-bindings/power/meson-a1-power.h> #include <linux/arm-smccc.h> #include <linux/firmware/meson/meson_sm.h> +#include <linux/module.h> #define PWRC_ON 1#define PWRC_OFF 0@@ -193,6 +194,7 @@ static const struct of_device_id meson_secure_pwrc_match_table[] = { }, {/* sentinel */ } }; +MODULE_DEVICE_TABLE (of, meson_secure_pwrc_match_table);
Quoted 11 lines
drivers/soc/amlogic/meson-secure-pwrc.c static struct platform_driver meson_secure_pwrc_driver = { · line 207
Quoted 9 lines
drivers/soc/amlogic/meson-secure-pwrc.c +2
-1static struct platform_driver meson_secure_pwrc_driver = { .probe = meson_secure_pwrc_probe,@@ -201,4 +203,5 @@ static struct platform_driver meson_secure_pwrc_driver = { .of_match_table = meson_secure_pwrc_match_table, }, }; -builtin_platform_driver (meson_secure_pwrc_driver); +module_platform_driver (meson_secure_pwrc_driver); +MODULE_LICENSE ("Dual BSD/GPL" );This file uses SPDX-License-Identifier: (GPL-2.0+ OR MIT) do we need to use
MODULE_LICENSE("Dual MIT/GPL v2"); in this case?
Since the SPDX header says GPL2+, I'll change this to:MODULE_LICENSE("Dual MIT/GPL");
Good catch, thanks!
Kevin
_______________________________________________
linux-amlogic mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-amlogic
Quoted 12 lines · Kevin Hilman
This driver only supports 32-bit ARM SoCs. Only build it for those.
Signed-off-by Kevin Hilman <[email protected]>--- drivers/soc/amlogic/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/soc/amlogic/Kconfig +0
-0
drivers/soc/amlogic/Kconfig config MESON_SECURE_PM_DOMAINS · line 66
Quoted 5 lines
drivers/soc/amlogic/Kconfig +1
-1@@ -63,7 +63,7 @@ config MESON_SECURE_PM_DOMAINS config MESON_MX_SOCINFO bool "Amlogic Meson MX SoC Information driver" - depends on ARCH_MESON || COMPILE_TEST + depends on (ARM && ARCH_MESON) || COMPILE_TEST
Would to it make sense to apply the same to the GX soc info ? depends on ARM64 ?
drivers/soc/amlogic/Kconfig config MESON_SECURE_PM_DOMAINS · line 69
Quoted 3 lines
drivers/soc/amlogic/Kconfig +0
-0default ARCH_MESON select SOC_BUS help
_______________________________________________
linux-amlogic mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-amlogic
Kevin Hilman
maintainerQuoted 15 lines · Jerome Brunet
Quoted 13 lines · Kevin Hilman
This driver only supports 32-bit ARM SoCs. Only build it for those.
Signed-off-by Kevin Hilman <[email protected]>--- drivers/soc/amlogic/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/soc/amlogic/Kconfig +0
-0@@ -63,7 +63,7 @@ config MESON_SECURE_PM_DOMAINS
Quoted 7 lines
drivers/soc/amlogic/Kconfig config MESON_SECURE_PM_DOMAINS · line 66
Quoted 4 lines
drivers/soc/amlogic/Kconfig +1
-1config MESON_MX_SOCINFO bool "Amlogic Meson MX SoC Information driver" - depends on ARCH_MESON || COMPILE_TEST + depends on (ARM && ARCH_MESON) || COMPILE_TESTWould to it make sense to apply the same to the GX soc info ? depends on ARM64 ?
Yes, good point. I'll update that.
Quoted 5 lines
drivers/soc/amlogic/Kconfig config MESON_SECURE_PM_DOMAINS · line 69
Quoted 3 lines
drivers/soc/amlogic/Kconfig +0
-0default ARCH_MESON select SOC_BUS helpReviewed-by Jerome Brunet <[email protected]>
Thanks for the review,
Kevin
_______________________________________________
linux-amlogic mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-amlogic
Quoted 4 lines · Kevin Hilman
This driver only supports 32-bit ARM SoCs. Only build it for those.
Signed-off-by Kevin Hilman <[email protected]>
_______________________________________________
linux-amlogic mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-amlogic