vexpress: Allow vexpress-sysreg to self-initialise
Subsystems (2)
PATCH 1/1 vexpress: Allow vexpress-sysreg to self-initialise
The vexpress_sysreg_init() is a core_initcall() already and it can trigger the early initialisation if a matching node is found. This patch allows the SoC code to avoid calling vexpress_sysreg_of_early_init() explicitly.
---
Samuel, could you please merge this patch for 3.9 (based on 3.8-rc6)? It is needed for arm64 support (which shares the same mfd files with the 32-bit arm port). Thanks.
drivers/mfd/vexpress-sysreg.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/mfd/vexpress-sysreg.c +6 -4
@@ -336,14 +336,15 @@ void __init vexpress_sysreg_early_init(void __iomem *base)void __init vexpress_sysreg_of_early_init (void ) { -struct device_node *node =of_find_compatible_node (NULL ,NULL , -"arm,vexpress-sysreg" ); +struct device_node *node; +if (vexpress_sysreg_base) +return ; + + node =of_find_compatible_node (NULL ,NULL ,"arm,vexpress-sysreg" );if (node) { vexpress_sysreg_base =of_iomap (node,0 );vexpress_sysreg_setup (node); - }else { -pr_info ("vexpress-sysreg: No Device Tree node found." ); } }
@@ -478,6 +479,7 @@ static struct platform_driver vexpress_sysreg_driver = {static int __init vexpress_sysreg_init (void ) { +vexpress_sysreg_of_early_init ();return platform_driver_register (&vexpress_sysreg_driver); }core_initcall (vexpress_sysreg_init);
Samuel Ortiz
AppliedPATCH 1/1 vexpress: Allow vexpress-sysreg to self-initialise
Hi Catalin,
Quoted 5 lines · Catalin Marinas
The
vexpress_sysreg_init()is acore_initcall()already and it can trigger the early initialisation if a matching node is found. This patch allows the SoC code to avoid callingvexpress_sysreg_of_early_init()explicitly.
Quoted 8 lines
Signed-off-by Catalin Marinas <[email protected]>Acked-by Arnd Bergmann <[email protected]>Acked-by Pawel Moll <[email protected]>---
Samuel, could you please merge this patch for 3.9 (based on 3.8-rc6)? It is needed for arm64 support (which shares the same mfd files with the 32-bit arm port). Thanks.
Applied to my for-next branch, thanks.
Cheers,
Samuel.
Signature · 2 lines
Intel Open Source Technology Centre http://oss.intel.com/