power: reset: brcmstb: Use normal driver register function
PATCH 1/5 power: reset: brcmstb: Use normal driver register function
The platform_driver_probe() helper is useful when the probe function is in the _init section, that is not the case here. Use the normal platform_driver_register() function.
--- drivers/power/reset/brcmstb-reboot.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/power/reset/brcmstb-reboot.c +1 -2
@@ -140,7 +140,6 @@ static struct platform_driver brcmstb_reboot_driver = {static int __init brcmstb_reboot_init (void ) { -return platform_driver_probe (&brcmstb_reboot_driver, - brcmstb_reboot_probe); +return platform_driver_register (&brcmstb_reboot_driver); }subsys_initcall (brcmstb_reboot_init);
Signature · 1 line
2.39.2
PATCH 2/5 power: reset: brcmstb: Use device_get_match_data() for matching
Use device_get_match_data() for finding the matching node and fetching the match data all in one.
--- drivers/power/reset/brcmstb-reboot.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-)
drivers/power/reset/brcmstb-reboot.c +9 -11
@@ -83,24 +83,16 @@ static const struct reset_reg_mask reset_bits_65nm = { .sw_mstr_rst_mask = BIT(31), }; -static const struct of_device_id of_match[] = { - { .compatible ="brcm,brcmstb-reboot" , .data = &reset_bits_40nm }, - { .compatible ="brcm,bcm7038-reboot" , .data = &reset_bits_65nm }, - {}, -}; -static int brcmstb_reboot_probe (struct platform_device *pdev) {int rc;struct device_node *np = pdev->dev.of_node; -const struct of_device_id *of_id; - of_id =of_match_node (of_match, np); -if (!of_id) { -pr_err ("failed to look up compatible string\n" ); + reset_masks =device_get_match_data (&pdev->dev); +if (!reset_masks) { +pr_err ("failed to get match data\n" );return -EINVAL ; } - reset_masks = of_id->data; regmap =syscon_regmap_lookup_by_phandle (np,"syscon" );if (IS_ERR (regmap)) {
@@ -130,6 +122,12 @@ static int brcmstb_reboot_probe(struct platform_device *pdev)return rc; } +static const struct of_device_id of_match[] = { + { .compatible ="brcm,brcmstb-reboot" , .data = &reset_bits_40nm }, + { .compatible ="brcm,bcm7038-reboot" , .data = &reset_bits_65nm }, + {}, +}; +static struct platform_driver brcmstb_reboot_driver = { .probe = brcmstb_reboot_probe, .driver = {
Signature · 1 line
2.39.2
Re: [PATCH 2/5] power: reset: brcmstb: Use device_get_match_data() for matching
Quoted 4 lines · Andrew Davis
Use
device_get_match_data()for finding the matching node and fetching the match data all in one.Signed-off-by Andrew Davis <[email protected]>
Signature · 1 line
Florian
PATCH 3/5 power: reset: brcmstb: Use syscon_regmap_lookup_by_phandle_args() helper
In reply to Andrew DavisSimplify probe by fetching the regmap and its arguments in one call.
--- drivers/power/reset/brcmstb-reboot.c | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-)
drivers/power/reset/brcmstb-reboot.c +4 -18
@@ -18,9 +18,6 @@#include <linux/smp.h> #include <linux/mfd/syscon.h> -#define RESET_SOURCE_ENABLE_REG 1 -#define SW_MASTER_RESET_REG 2 -static struct regmap *regmap;static u32 rst_src_en;static u32 sw_mstr_rst;
@@ -87,6 +84,7 @@ static int brcmstb_reboot_probe(struct platform_device *pdev) {int rc;struct device_node *np = pdev->dev.of_node; +unsigned int args[2 ]; reset_masks =device_get_match_data (&pdev->dev);if (!reset_masks) {
@@ -94,25 +92,13 @@ static int brcmstb_reboot_probe(struct platform_device *pdev)return -EINVAL ; } - regmap =syscon_regmap_lookup_by_phandle (np,"syscon" ); + regmap =syscon_regmap_lookup_by_phandle_args (np,"syscon" ,2 , args);if (IS_ERR (regmap)) {pr_err ("failed to get syscon phandle\n" );return -EINVAL ; } - - rc =of_property_read_u32_index (np,"syscon" ,RESET_SOURCE_ENABLE_REG , - &rst_src_en); -if (rc) { -pr_err ("can't get rst_src_en offset (%d)\n" , rc); -return -EINVAL ; - } - - rc =of_property_read_u32_index (np,"syscon" ,SW_MASTER_RESET_REG , - &sw_mstr_rst); -if (rc) { -pr_err ("can't get sw_mstr_rst offset (%d)\n" , rc); -return -EINVAL ; - } + rst_src_en = args[0 ]; + sw_mstr_rst = args[1 ]; rc =register_restart_handler (&brcmstb_restart_nb);if (rc)
Signature · 1 line
2.39.2
Re: [PATCH 3/5] power: reset: brcmstb: Use syscon_regmap_lookup_by_phandle_args() helper
Hi,
Quoted 22 lines · Andrew Davis
Simplify probe by fetching the regmap and its arguments in one call.
Signed-off-by Andrew Davis <[email protected]>--- drivers/power/reset/brcmstb-reboot.c | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-)drivers/power/reset/brcmstb-reboot.c +0
-3@@ -18,9 +18,6 @@#include <linux/smp.h> #include <linux/mfd/syscon.h> -#define RESET_SOURCE_ENABLE_REG 1 -#define SW_MASTER_RESET_REG 2 -static struct regmap *regmap;static u32 rst_src_en;static u32 sw_mstr_rst;
drivers/power/reset/brcmstb-reboot.c static int brcmstb_reboot_probe(struct platform_device *pdev) · line 87
Quoted 4 lines
drivers/power/reset/brcmstb-reboot.c +1
-0@@ -87,6 +84,7 @@ static int brcmstb_reboot_probe(struct platform_device *pdev) {int rc;struct device_node *np = pdev->dev.of_node; +unsigned int args[2 ];
You can also call it syscon_args, but I'm fine either way.
Quoted 19 lines
drivers/power/reset/brcmstb-reboot.c +1
-7reset_masks =device_get_match_data (&pdev->dev);if (!reset_masks) {@@ -94,25 +92,13 @@ static int brcmstb_reboot_probe(struct platform_device *pdev)return -EINVAL ; } - regmap =syscon_regmap_lookup_by_phandle (np,"syscon" ); + regmap =syscon_regmap_lookup_by_phandle_args (np,"syscon" ,2 , args);if (IS_ERR (regmap)) {pr_err ("failed to get syscon phandle\n" );return -EINVAL ; } - - rc =of_property_read_u32_index (np,"syscon" ,RESET_SOURCE_ENABLE_REG , - &rst_src_en); -if (rc) { -pr_err ("can't get rst_src_en offset (%d)\n" , rc); -return -EINVAL ;
drivers/power/reset/brcmstb-reboot.c static int brcmstb_reboot_probe(struct platform_device *pdev) · line 101
Quoted 10 lines
drivers/power/reset/brcmstb-reboot.c +2
-8- } - - rc =of_property_read_u32_index (np,"syscon" ,SW_MASTER_RESET_REG , - &sw_mstr_rst); -if (rc) { -pr_err ("can't get sw_mstr_rst offset (%d)\n" , rc); -return -EINVAL ; - } + rst_src_en = args[0 ]; + sw_mstr_rst = args[1 ];
Signature · 2 lines
Best regards, Dhruva
Re: [PATCH 3/5] power: reset: brcmstb: Use syscon_regmap_lookup_by_phandle_args() helper
In reply to Andrew DavisQuoted 30 lines · Andrew Davis
Simplify probe by fetching the regmap and its arguments in one call.
Signed-off-by Andrew Davis <[email protected]>--- drivers/power/reset/brcmstb-reboot.c | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-)drivers/power/reset/brcmstb-reboot.c +1
-3@@ -18,9 +18,6 @@#include <linux/smp.h> #include <linux/mfd/syscon.h> -#define RESET_SOURCE_ENABLE_REG 1 -#define SW_MASTER_RESET_REG 2 -static struct regmap *regmap;static u32 rst_src_en;static u32 sw_mstr_rst;@@ -87,6 +84,7 @@ static int brcmstb_reboot_probe(struct platform_device *pdev) {int rc;struct device_node *np = pdev->dev.of_node; +unsigned int args[2 ]; reset_masks =device_get_match_data (&pdev->dev);if (!reset_masks) {
drivers/power/reset/brcmstb-reboot.c static int brcmstb_reboot_probe(struct platform_device *pdev) · line 95
Quoted 5 lines
drivers/power/reset/brcmstb-reboot.c +1
-1@@ -94,25 +92,13 @@ static int brcmstb_reboot_probe(struct platform_device *pdev)return -EINVAL ; } - regmap =syscon_regmap_lookup_by_phandle (np,"syscon" ); + regmap =syscon_regmap_lookup_by_phandle_args (np,"syscon" ,2 , args);
Not that this is likely to change, but I would use ARRAY_SIZE(args) here. With that:
Signature · 1 line
Florian
PATCH 4/5 power: reset: brcmstb: Use devm_register_sys_off_handler()
In reply to Andrew DavisFunction register_restart_handler() is deprecated. Using this new API removes our need to keep and manage a struct notifier_block.
--- drivers/power/reset/brcmstb-reboot.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
drivers/power/reset/brcmstb-reboot.c +3 -8
@@ -29,8 +29,7 @@ struct reset_reg_mask {static const struct reset_reg_mask *reset_masks; -static int brcmstb_restart_handler (struct notifier_block *this, -unsigned long mode,void *cmd) +static int brcmstb_restart_handler (struct sys_off_data *data) {int rc;u32 tmp;
@@ -65,11 +64,6 @@ static int brcmstb_restart_handler(struct notifier_block *this,return NOTIFY_DONE ; } -static struct notifier_block brcmstb_restart_nb = { - .notifier_call = brcmstb_restart_handler, - .priority =128 , -}; -static const struct reset_reg_mask reset_bits_40nm = { .rst_src_en_mask =BIT (0 ), .sw_mstr_rst_mask =BIT (0 ),
@@ -100,7 +94,8 @@ static int brcmstb_reboot_probe(struct platform_device *pdev) rst_src_en = args[0 ]; sw_mstr_rst = args[1 ]; - rc =register_restart_handler (&brcmstb_restart_nb); + rc =devm_register_sys_off_handler (&pdev->dev,SYS_OFF_MODE_RESTART , +128 , brcmstb_restart_handler,NULL );if (rc)dev_err (&pdev->dev,"cannot register restart handler (err=%d)\n" , rc);
Signature · 1 line
2.39.2
Re: [PATCH 4/5] power: reset: brcmstb: Use devm_register_sys_off_handler()
Quoted 35 lines · Andrew Davis
Function
register_restart_handler()is deprecated. Using this new API removes our need to keep and manage a structnotifier_block.Signed-off-by Andrew Davis <[email protected]>--- drivers/power/reset/brcmstb-reboot.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)drivers/power/reset/brcmstb-reboot.c +1
-7@@ -29,8 +29,7 @@ struct reset_reg_mask {static const struct reset_reg_mask *reset_masks; -static int brcmstb_restart_handler (struct notifier_block *this, -unsigned long mode,void *cmd) +static int brcmstb_restart_handler (struct sys_off_data *data) {int rc;u32 tmp;@@ -65,11 +64,6 @@ static int brcmstb_restart_handler(struct notifier_block *this,return NOTIFY_DONE ; } -static struct notifier_block brcmstb_restart_nb = { - .notifier_call = brcmstb_restart_handler, - .priority =128 , -}; -static const struct reset_reg_mask reset_bits_40nm = { .rst_src_en_mask =BIT (0 ), .sw_mstr_rst_mask =BIT (0 ),
drivers/power/reset/brcmstb-reboot.c static int brcmstb_reboot_probe(struct platform_device *pdev) · line 98
Quoted 6 lines
drivers/power/reset/brcmstb-reboot.c +2
-1@@ -100,7 +94,8 @@ static int brcmstb_reboot_probe(struct platform_device *pdev) rst_src_en = args[0 ]; sw_mstr_rst = args[1 ]; - rc =register_restart_handler (&brcmstb_restart_nb); + rc =devm_register_sys_off_handler (&pdev->dev,SYS_OFF_MODE_RESTART , +128 , brcmstb_restart_handler,NULL );
Signature · 2 lines
Best regards, Dhruva
Re: [PATCH 4/5] power: reset: brcmstb: Use devm_register_sys_off_handler()
In reply to Andrew DavisQuoted 4 lines · Andrew Davis
Function
register_restart_handler()is deprecated. Using this new API removes our need to keep and manage a structnotifier_block.Signed-off-by Andrew Davis <[email protected]>
Signature · 1 line
Florian
PATCH 5/5 power: reset: brcmstb: Do not go into infinite loop if reset fails
In reply to Andrew DavisThere may be other backup reset methods available, do not halt here so that other reset methods can be tried.
--- drivers/power/reset/brcmstb-reboot.c | 3 --- 1 file changed, 3 deletions(-)
drivers/power/reset/brcmstb-reboot.c +0 -3
@@ -58,9 +58,6 @@ static int brcmstb_restart_handler(struct sys_off_data *data)return NOTIFY_DONE ; } -while (1 ) - ; -return NOTIFY_DONE ; }
Signature · 1 line
2.39.2
Re: [PATCH 5/5] power: reset: brcmstb: Do not go into infinite loop if reset fails
Quoted 13 lines · Andrew Davis
There may be other backup reset methods available, do not halt here so that other reset methods can be tried.
Signed-off-by Andrew Davis <[email protected]>--- drivers/power/reset/brcmstb-reboot.c | 3 --- 1 file changed, 3 deletions(-)drivers/power/reset/brcmstb-reboot.c +0
-0
drivers/power/reset/brcmstb-reboot.c static int brcmstb_restart_handler(struct sys_off_data *data) · line 63
Quoted 6 lines
drivers/power/reset/brcmstb-reboot.c +0
-3@@ -58,9 +58,6 @@ static int brcmstb_restart_handler(struct sys_off_data *data)return NOTIFY_DONE ; } -while (1 ) - ; -
I agree, while (1) may not be the best thing to do here.
Signature · 2 lines
Best regards, Dhruva
Re: [PATCH 5/5] power: reset: brcmstb: Do not go into infinite loop if reset fails
In reply to Andrew DavisQuoted 4 lines · Andrew Davis
There may be other backup reset methods available, do not halt here so that other reset methods can be tried.
Signed-off-by Andrew Davis <[email protected]>
Signature · 1 line
Florian
Hi,
Quoted 14 lines · Andrew Davis
The
platform_driver_probe()helper is useful when the probe function is in the_initsection, that is not the case here. Use the normalplatform_driver_register()function.Signed-off-by Andrew Davis <[email protected]>--- drivers/power/reset/brcmstb-reboot.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)drivers/power/reset/brcmstb-reboot.c +0
-0
drivers/power/reset/brcmstb-reboot.c static struct platform_driver brcmstb_reboot_driver = { · line 143
Quoted 6 lines
drivers/power/reset/brcmstb-reboot.c +1
-2@@ -140,7 +140,6 @@ static struct platform_driver brcmstb_reboot_driver = {static int __init brcmstb_reboot_init (void ) { -return platform_driver_probe (&brcmstb_reboot_driver, - brcmstb_reboot_probe); +return platform_driver_register (&brcmstb_reboot_driver);
Signature · 2 lines
Best regards, Dhruva
Quoted 5 lines · Andrew Davis
The
platform_driver_probe()helper is useful when the probe function is in the_initsection, that is not the case here. Use the normalplatform_driver_register()function.Signed-off-by Andrew Davis <[email protected]>
Signature · 1 line
Florian
Sebastian Reichel
AppliedQuoted 5 lines · Andrew Davis
The
platform_driver_probe()helper is useful when the probe function is in the_initsection, that is not the case here. Use the normalplatform_driver_register()function.
Applied, thanks!
[1/5] power: reset: brcmstb: Use normal driver register function
commit: 0174d12f9b7ebc83f1f2b6c25f05304104de5a91
[2/5] power: reset: brcmstb: Use device_get_match_data() for matching
commit: cf37f16a60f332fad21fe0a45893ac4c6a825d9d
[3/5] power: reset: brcmstb: Use syscon_regmap_lookup_by_phandle_args() helper
commit: a4ceaab660cabdc9ac2d2514a809174443209b3b
[4/5] power: reset: brcmstb: Use devm_register_sys_off_handler()
commit: ad87aee5cba821066be99c76efd818368ff5bb4a
[5/5] power: reset: brcmstb: Do not go into infinite loop if reset fails
commit: cf8c39b00e982fa506b16f9d76657838c09150cbBest regards,
Signature · 1 line
Sebastian Reichel <[email protected]>