soc: ti: Convert K3 SoC info driver to module
Subsystems (2)
cover soc: ti: Convert K3 SoC info driver to module
In order for the TI K3 SoC info driver to be built as a module, the following 2 changes have been made:
- Convert memory allocations to devm and added the remove callback
- Added necessary code to build the driver as a module
Nicolas Frayer (2):
soc: ti: Convert allocations to devm
soc: ti: Add module build support
arch/arm64/Kconfig.platforms | 1 - drivers/soc/ti/Kconfig | 3 ++- drivers/soc/ti/k3-socinfo.c | 47 +++++++++++++++++++----------------- 3 files changed, 27 insertions(+), 24 deletions(-)
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH RESEND 1/2 soc: ti: Convert allocations to devm
Changed the memory and resource allocations in the probe function to devm. Also added a remove callback.
Signed-off-by Nicolas Frayer <[email protected]>
--- drivers/soc/ti/k3-socinfo.c | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-)
drivers/soc/ti/k3-socinfo.c +19 -17
@@ -96,21 +96,18 @@ static int k3_chipinfo_probe(struct platform_device *pdev) partno_id = (jtag_id &CTRLMMR_WKUP_JTAGID_PARTNO_MASK ) >>CTRLMMR_WKUP_JTAGID_PARTNO_SHIFT ; - soc_dev_attr =kzalloc (sizeof (*soc_dev_attr),GFP_KERNEL ); + soc_dev_attr =devm_kzalloc (&pdev->dev,sizeof (*soc_dev_attr),GFP_KERNEL );if (!soc_dev_attr)return -ENOMEM ; - soc_dev_attr->revision =kasprintf (GFP_KERNEL ,"SR%x.0" , variant); -if (!soc_dev_attr->revision) { - ret = -ENOMEM ; - goto err; - } + soc_dev_attr->revision =devm_kasprintf (&pdev->dev,GFP_KERNEL ,"SR%x.0" , variant); +if (!soc_dev_attr->revision) +return -ENOMEM ; ret =k3_chipinfo_partno_to_names (partno_id, soc_dev_attr);if (ret) {dev_err (dev,"Unknown SoC JTAGID[0x%08X]\n" , jtag_id); - ret = -ENODEV ; - goto err_free_rev; +return -ENODEV ; } node =of_find_node_by_path ("/" );
@@ -118,22 +115,26 @@ static int k3_chipinfo_probe(struct platform_device *pdev)of_node_put (node); soc_dev =soc_device_register (soc_dev_attr); -if (IS_ERR (soc_dev)) { - ret =PTR_ERR (soc_dev); - goto err_free_rev; - } +if (IS_ERR (soc_dev)) +return PTR_ERR (soc_dev); + +platform_set_drvdata (pdev, soc_dev);dev_info (dev,"Family:%s rev:%s JTAGID[0x%08x] Detected\n" , soc_dev_attr->family, soc_dev_attr->revision, jtag_id);return 0 ; +} + +static int k3_chipinfo_remove (struct platform_device *pdev) +{ +struct soc_device *soc_dev =platform_get_drvdata (pdev); -err_free_rev: -kfree (soc_dev_attr->revision); -err: -kfree (soc_dev_attr); -return ret; +if (soc_dev !=NULL ) +soc_device_unregister (soc_dev); + +return 0 ; }static const struct of_device_id k3_chipinfo_of_match[] = {
@@ -147,6 +148,7 @@ static struct platform_driver k3_chipinfo_driver = { .of_match_table = k3_chipinfo_of_match, }, .probe = k3_chipinfo_probe, + .remove = k3_chipinfo_remove, };static int __init k3_chipinfo_init (void )
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH RESEND 2/2 soc: ti: Add module build support
In reply to Nicolas FrayerAdded module build support for the TI K3 SoC info driver.
Signed-off-by Nicolas Frayer <[email protected]>
--- arch/arm64/Kconfig.platforms | 1 - drivers/soc/ti/Kconfig | 3 ++- drivers/soc/ti/k3-socinfo.c | 11 ++++++----- 3 files changed, 8 insertions(+), 7 deletions(-)
arch/arm64/Kconfig.platforms +0 -1
@@ -131,7 +131,6 @@ config ARCH_K3 select TI_SCI_PROTOCOL select TI_SCI_INTR_IRQCHIP select TI_SCI_INTA_IRQCHIP - select TI_K3_SOCINFO help This enables support for Texas Instruments' K3 multicore SoC architecture.
drivers/soc/ti/Kconfig +2 -1
@@ -74,7 +74,8 @@ config TI_K3_RINGACC If unsure, say N. config TI_K3_SOCINFO - bool + tristate "TI K3 SoC info driver" + default m depends on ARCH_K3 || COMPILE_TEST select SOC_BUS select MFD_SYSCON
drivers/soc/ti/k3-socinfo.c +6 -5
@@ -13,6 +13,7 @@#include <linux/slab.h> #include <linux/string.h> #include <linux/sys_soc.h> +#include <linux/module.h> #define CTRLMMR_WKUP_JTAGID_REG 0/*
@@ -141,6 +142,7 @@ static const struct of_device_id k3_chipinfo_of_match[] = { { .compatible = "ti,am654-chipid", }, { /* sentinel */ }, }; +MODULE_DEVICE_TABLE (of, k3_chipinfo_of_match);static struct platform_driver k3_chipinfo_driver = { .driver = {
@@ -151,8 +153,7 @@ static struct platform_driver k3_chipinfo_driver = { .remove = k3_chipinfo_remove, }; -static int __init k3_chipinfo_init (void ) -{ -return platform_driver_register (&k3_chipinfo_driver); -} -subsys_initcall (k3_chipinfo_init); +module_platform_driver (k3_chipinfo_driver); + +MODULE_DESCRIPTION ("TI K3 SoC info driver" ); +MODULE_LICENSE ("GPL v2" );
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel