Skip to content

L
linux
Commit ab7b2ffc authored by Tero Kristo's avatar Tero Kristo
Browse files
Options

ARM: OMAP2+: PRM: move SoC specific init calls within a generic API 

This gets rid of need for some exported driver APIs, and simplifies the
initialization of the PRM driver. Done in preparation to make PRM a
separate driver. The init data is now also passed to the SoC specific
implementations, allowing future expansion to add feature flags etc.
Signed-off-by: default avatarTero Kristo <t-kristo@ti.com>
parent 2208bf11
Show whitespace changes
Inline Side-by-side
Showing with 90 additions and 39 deletions
arch/arm/mach-omap2/io.c
View file @ ab7b2ffc
...@@ -386,7 +386,7 @@ void __init omap2420_init_early(void) ...@@ -386,7 +386,7 @@ void __init omap2420_init_early(void)
OMAP2_L3_IO_ADDRESS(OMAP2420_SMS_BASE)); OMAP2_L3_IO_ADDRESS(OMAP2420_SMS_BASE));
omap2_control_base_init(); omap2_control_base_init();
omap2xxx_check_revision(); omap2xxx_check_revision();
omap2xxx_prm_init(); omap2_prcm_base_init();
omap2xxx_cm_init(); omap2xxx_cm_init();
omap2xxx_voltagedomains_init(); omap2xxx_voltagedomains_init();
omap242x_powerdomains_init(); omap242x_powerdomains_init();
...@@ -413,7 +413,7 @@ void __init omap2430_init_early(void) ...@@ -413,7 +413,7 @@ void __init omap2430_init_early(void)
OMAP2_L3_IO_ADDRESS(OMAP243X_SMS_BASE)); OMAP2_L3_IO_ADDRESS(OMAP243X_SMS_BASE));
omap2_control_base_init(); omap2_control_base_init();
omap2xxx_check_revision(); omap2xxx_check_revision();
omap2xxx_prm_init(); omap2_prcm_base_init();
omap2xxx_cm_init(); omap2xxx_cm_init();
omap2xxx_voltagedomains_init(); omap2xxx_voltagedomains_init();
omap243x_powerdomains_init(); omap243x_powerdomains_init();
...@@ -453,7 +453,8 @@ void __init omap3_init_early(void) ...@@ -453,7 +453,8 @@ void __init omap3_init_early(void)
omap2_control_base_init(); omap2_control_base_init();
omap3xxx_check_revision(); omap3xxx_check_revision();
omap3xxx_check_features(); omap3xxx_check_features();
omap3xxx_prm_init(); omap2_prcm_base_init();
omap3xxx_prm_init(NULL);
omap3xxx_cm_init(); omap3xxx_cm_init();
omap3xxx_voltagedomains_init(); omap3xxx_voltagedomains_init();
omap3xxx_powerdomains_init(); omap3xxx_powerdomains_init();
...@@ -551,7 +552,7 @@ void __init ti814x_init_early(void) ...@@ -551,7 +552,7 @@ void __init ti814x_init_early(void)
omap2_control_base_init(); omap2_control_base_init();
omap3xxx_check_revision(); omap3xxx_check_revision();
ti81xx_check_features(); ti81xx_check_features();
am33xx_prm_init(); omap2_prcm_base_init();
am33xx_cm_init(); am33xx_cm_init();
omap3xxx_voltagedomains_init(); omap3xxx_voltagedomains_init();
omap3xxx_powerdomains_init(); omap3xxx_powerdomains_init();
...@@ -569,7 +570,7 @@ void __init ti816x_init_early(void) ...@@ -569,7 +570,7 @@ void __init ti816x_init_early(void)
omap2_control_base_init(); omap2_control_base_init();
omap3xxx_check_revision(); omap3xxx_check_revision();
ti81xx_check_features(); ti81xx_check_features();
am33xx_prm_init(); omap2_prcm_base_init();
am33xx_cm_init(); am33xx_cm_init();
omap3xxx_voltagedomains_init(); omap3xxx_voltagedomains_init();
omap3xxx_powerdomains_init(); omap3xxx_powerdomains_init();
...@@ -589,7 +590,7 @@ void __init am33xx_init_early(void) ...@@ -589,7 +590,7 @@ void __init am33xx_init_early(void)
omap2_control_base_init(); omap2_control_base_init();
omap3xxx_check_revision(); omap3xxx_check_revision();
am33xx_check_features(); am33xx_check_features();
am33xx_prm_init(); omap2_prcm_base_init();
am33xx_cm_init(); am33xx_cm_init();
am33xx_powerdomains_init(); am33xx_powerdomains_init();
am33xx_clockdomains_init(); am33xx_clockdomains_init();
...@@ -612,7 +613,7 @@ void __init am43xx_init_early(void) ...@@ -612,7 +613,7 @@ void __init am43xx_init_early(void)
omap2_control_base_init(); omap2_control_base_init();
omap3xxx_check_revision(); omap3xxx_check_revision();
am33xx_check_features(); am33xx_check_features();
omap44xx_prm_init(); omap2_prcm_base_init();
omap4_cm_init(); omap4_cm_init();
am43xx_powerdomains_init(); am43xx_powerdomains_init();
am43xx_clockdomains_init(); am43xx_clockdomains_init();
...@@ -638,7 +639,7 @@ void __init omap4430_init_early(void) ...@@ -638,7 +639,7 @@ void __init omap4430_init_early(void)
omap2_set_globals_prcm_mpu(OMAP2_L4_IO_ADDRESS(OMAP4430_PRCM_MPU_BASE)); omap2_set_globals_prcm_mpu(OMAP2_L4_IO_ADDRESS(OMAP4430_PRCM_MPU_BASE));
omap4xxx_check_revision(); omap4xxx_check_revision();
omap4xxx_check_features(); omap4xxx_check_features();
omap44xx_prm_init(); omap2_prcm_base_init();
omap4_cm_init(); omap4_cm_init();
omap4_pm_init_early(); omap4_pm_init_early();
omap44xx_voltagedomains_init(); omap44xx_voltagedomains_init();
...@@ -667,7 +668,7 @@ void __init omap5_init_early(void) ...@@ -667,7 +668,7 @@ void __init omap5_init_early(void)
OMAP2_L4_IO_ADDRESS(OMAP54XX_CTRL_BASE)); OMAP2_L4_IO_ADDRESS(OMAP54XX_CTRL_BASE));
omap2_set_globals_prcm_mpu(OMAP2_L4_IO_ADDRESS(OMAP54XX_PRCM_MPU_BASE)); omap2_set_globals_prcm_mpu(OMAP2_L4_IO_ADDRESS(OMAP54XX_PRCM_MPU_BASE));
omap4_pm_init_early(); omap4_pm_init_early();
omap44xx_prm_init(); omap2_prcm_base_init();
omap5xxx_check_revision(); omap5xxx_check_revision();
omap4_cm_init(); omap4_cm_init();
omap54xx_voltagedomains_init(); omap54xx_voltagedomains_init();
...@@ -694,7 +695,7 @@ void __init dra7xx_init_early(void) ...@@ -694,7 +695,7 @@ void __init dra7xx_init_early(void)
OMAP2_L4_IO_ADDRESS(DRA7XX_CTRL_BASE)); OMAP2_L4_IO_ADDRESS(DRA7XX_CTRL_BASE));
omap2_set_globals_prcm_mpu(OMAP2_L4_IO_ADDRESS(OMAP54XX_PRCM_MPU_BASE)); omap2_set_globals_prcm_mpu(OMAP2_L4_IO_ADDRESS(OMAP54XX_PRCM_MPU_BASE));
omap4_pm_init_early(); omap4_pm_init_early();
omap44xx_prm_init(); omap2_prcm_base_init();
dra7xxx_check_revision(); dra7xxx_check_revision();
omap4_cm_init(); omap4_cm_init();
dra7xx_powerdomains_init(); dra7xx_powerdomains_init();
......
arch/arm/mach-omap2/prcm-common.h
View file @ ab7b2ffc
...@@ -524,12 +524,16 @@ struct omap_prcm_irq_setup { ...@@ -524,12 +524,16 @@ struct omap_prcm_irq_setup {
* @mem: IO mem pointer for this module * @mem: IO mem pointer for this module
* @offset: module base address offset from the IO base * @offset: module base address offset from the IO base
* @flags: PRCM module init flags * @flags: PRCM module init flags
* @init: low level PRCM init function for this module
* @np: device node for this PRCM module
*/ */
struct omap_prcm_init_data { struct omap_prcm_init_data {
int index; int index;
void __iomem *mem; void __iomem *mem;
s16 offset; s16 offset;
u16 flags; u16 flags;
int (*init)(const struct omap_prcm_init_data *data);
struct device_node *np;
}; };
extern void omap_prcm_irq_cleanup(void); extern void omap_prcm_irq_cleanup(void);
......
arch/arm/mach-omap2/prm.h
View file @ ab7b2ffc
...@@ -21,6 +21,7 @@ extern u16 prm_features; ...@@ -21,6 +21,7 @@ extern u16 prm_features;
extern void omap2_set_globals_prm(void __iomem *prm); extern void omap2_set_globals_prm(void __iomem *prm);
int omap_prcm_init(void); int omap_prcm_init(void);
int omap2_prm_base_init(void); int omap2_prm_base_init(void);
int omap2_prcm_base_init(void);
# endif # endif
/* /*
......
arch/arm/mach-omap2/prm2xxx.c
View file @ ab7b2ffc
...@@ -220,9 +220,8 @@ static struct prm_ll_data omap2xxx_prm_ll_data = { ...@@ -220,9 +220,8 @@ static struct prm_ll_data omap2xxx_prm_ll_data = {
.clear_mod_irqs = &omap2xxx_prm_clear_mod_irqs, .clear_mod_irqs = &omap2xxx_prm_clear_mod_irqs,
}; };
int __init omap2xxx_prm_init(void) int __init omap2xxx_prm_init(const struct omap_prcm_init_data *data)
{ {
omap2_prm_base_init();
return prm_register(&omap2xxx_prm_ll_data); return prm_register(&omap2xxx_prm_ll_data);
} }
......
arch/arm/mach-omap2/prm2xxx.h
View file @ ab7b2ffc
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
extern int omap2xxx_clkdm_sleep(struct clockdomain *clkdm); extern int omap2xxx_clkdm_sleep(struct clockdomain *clkdm);
extern int omap2xxx_clkdm_wakeup(struct clockdomain *clkdm); extern int omap2xxx_clkdm_wakeup(struct clockdomain *clkdm);
extern int __init omap2xxx_prm_init(void); int __init omap2xxx_prm_init(const struct omap_prcm_init_data *data);
#endif #endif
......
arch/arm/mach-omap2/prm33xx.c
View file @ ab7b2ffc
...@@ -378,9 +378,8 @@ static struct prm_ll_data am33xx_prm_ll_data = { ...@@ -378,9 +378,8 @@ static struct prm_ll_data am33xx_prm_ll_data = {
.reset_system = am33xx_prm_global_warm_sw_reset, .reset_system = am33xx_prm_global_warm_sw_reset,
}; };
int __init am33xx_prm_init(void) int __init am33xx_prm_init(const struct omap_prcm_init_data *data)
{ {
omap2_prm_base_init();
return prm_register(&am33xx_prm_ll_data); return prm_register(&am33xx_prm_ll_data);
} }
......
arch/arm/mach-omap2/prm33xx.h
View file @ ab7b2ffc
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
#define AM33XX_PM_CEFUSE_PWRSTST AM33XX_PRM_REGADDR(AM33XX_PRM_CEFUSE_MOD, 0x0004) #define AM33XX_PM_CEFUSE_PWRSTST AM33XX_PRM_REGADDR(AM33XX_PRM_CEFUSE_MOD, 0x0004)
#ifndef __ASSEMBLER__ #ifndef __ASSEMBLER__
int am33xx_prm_init(void); int am33xx_prm_init(const struct omap_prcm_init_data *data);
#endif /* ASSEMBLER */ #endif /* ASSEMBLER */
#endif #endif
arch/arm/mach-omap2/prm3xxx.c
View file @ ab7b2ffc
...@@ -670,12 +670,10 @@ static struct prm_ll_data omap3xxx_prm_ll_data = { ...@@ -670,12 +670,10 @@ static struct prm_ll_data omap3xxx_prm_ll_data = {
.vp_clear_txdone = &omap3_prm_vp_clear_txdone, .vp_clear_txdone = &omap3_prm_vp_clear_txdone,
}; };
int __init omap3xxx_prm_init(void) int __init omap3xxx_prm_init(const struct omap_prcm_init_data *data)
{ {
omap2_clk_legacy_provider_init(TI_CLKM_PRM, omap2_clk_legacy_provider_init(TI_CLKM_PRM,
prm_base + OMAP3430_IVA2_MOD); prm_base + OMAP3430_IVA2_MOD);
omap2_prm_base_init();
if (omap3_has_io_wakeup()) if (omap3_has_io_wakeup())
prm_features |= PRM_HAS_IO_WAKEUP; prm_features |= PRM_HAS_IO_WAKEUP;
......
arch/arm/mach-omap2/prm3xxx.h
View file @ ab7b2ffc
...@@ -140,7 +140,7 @@ extern u32 omap3_prm_vcvp_read(u8 offset); ...@@ -140,7 +140,7 @@ extern u32 omap3_prm_vcvp_read(u8 offset);
extern void omap3_prm_vcvp_write(u32 val, u8 offset); extern void omap3_prm_vcvp_write(u32 val, u8 offset);
extern u32 omap3_prm_vcvp_rmw(u32 mask, u32 bits, u8 offset); extern u32 omap3_prm_vcvp_rmw(u32 mask, u32 bits, u8 offset);
extern int __init omap3xxx_prm_init(void); int __init omap3xxx_prm_init(const struct omap_prcm_init_data *data);
void omap3xxx_prm_iva_idle(void); void omap3xxx_prm_iva_idle(void);
void omap3_prm_reset_modem(void); void omap3_prm_reset_modem(void);
int omap3xxx_prm_clear_global_cold_reset(void); int omap3xxx_prm_clear_global_cold_reset(void);
......
arch/arm/mach-omap2/prm44xx.c
View file @ ab7b2ffc
...@@ -703,9 +703,8 @@ static struct prm_ll_data omap44xx_prm_ll_data = { ...@@ -703,9 +703,8 @@ static struct prm_ll_data omap44xx_prm_ll_data = {
.vp_clear_txdone = omap4_prm_vp_clear_txdone, .vp_clear_txdone = omap4_prm_vp_clear_txdone,
}; };
int __init omap44xx_prm_init(void) int __init omap44xx_prm_init(const struct omap_prcm_init_data *data)
{ {
omap2_prm_base_init();
omap_prm_base_init(); omap_prm_base_init();
if (cpu_is_omap44xx() || soc_is_omap54xx() || soc_is_dra7xx()) if (cpu_is_omap44xx() || soc_is_omap54xx() || soc_is_dra7xx())
......
arch/arm/mach-omap2/prm44xx.h
View file @ ab7b2ffc
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
#define __ARCH_ARM_MACH_OMAP2_PRM44XX_H #define __ARCH_ARM_MACH_OMAP2_PRM44XX_H
#include "prm44xx_54xx.h" #include "prm44xx_54xx.h"
#include "prcm-common.h"
#include "prm.h" #include "prm.h"
#define OMAP4430_PRM_BASE 0x4a306000 #define OMAP4430_PRM_BASE 0x4a306000
......
arch/arm/mach-omap2/prm44xx_54xx.h
View file @ ab7b2ffc
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
#ifndef __ARCH_ARM_MACH_OMAP2_PRM44XX_54XX_H #ifndef __ARCH_ARM_MACH_OMAP2_PRM44XX_54XX_H
#define __ARCH_ARM_MACH_OMAP2_PRM44XX_54XX_H #define __ARCH_ARM_MACH_OMAP2_PRM44XX_54XX_H
#include "prcm-common.h"
/* Function prototypes */ /* Function prototypes */
#ifndef __ASSEMBLER__ #ifndef __ASSEMBLER__
...@@ -34,7 +36,7 @@ extern u32 omap4_prm_vcvp_read(u8 offset); ...@@ -34,7 +36,7 @@ extern u32 omap4_prm_vcvp_read(u8 offset);
extern void omap4_prm_vcvp_write(u32 val, u8 offset); extern void omap4_prm_vcvp_write(u32 val, u8 offset);
extern u32 omap4_prm_vcvp_rmw(u32 mask, u32 bits, u8 offset); extern u32 omap4_prm_vcvp_rmw(u32 mask, u32 bits, u8 offset);
extern int __init omap44xx_prm_init(void); int __init omap44xx_prm_init(const struct omap_prcm_init_data *data);
#endif #endif
......
arch/arm/mach-omap2/prm54xx.h
View file @ ab7b2ffc
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
#define __ARCH_ARM_MACH_OMAP2_PRM54XX_H #define __ARCH_ARM_MACH_OMAP2_PRM54XX_H
#include "prm44xx_54xx.h" #include "prm44xx_54xx.h"
#include "prcm-common.h"
#include "prm.h" #include "prm.h"
#define OMAP54XX_PRM_BASE 0x4ae06000 #define OMAP54XX_PRM_BASE 0x4ae06000
......
arch/arm/mach-omap2/prm7xx.h
View file @ ab7b2ffc
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
#ifndef __ARCH_ARM_MACH_OMAP2_PRM7XX_H #ifndef __ARCH_ARM_MACH_OMAP2_PRM7XX_H
#define __ARCH_ARM_MACH_OMAP2_PRM7XX_H #define __ARCH_ARM_MACH_OMAP2_PRM7XX_H
#include "prm44xx_54xx.h"
#include "prcm-common.h" #include "prcm-common.h"
#include "prm44xx_54xx.h"
#include "prm.h" #include "prm.h"
#define DRA7XX_PRM_BASE 0x4ae06000 #define DRA7XX_PRM_BASE 0x4ae06000
......
arch/arm/mach-omap2/prm_common.c
View file @ ab7b2ffc
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include "prm2xxx_3xxx.h" #include "prm2xxx_3xxx.h"
#include "prm2xxx.h" #include "prm2xxx.h"
#include "prm3xxx.h" #include "prm3xxx.h"
#include "prm33xx.h"
#include "prm44xx.h" #include "prm44xx.h"
#include "common.h" #include "common.h"
#include "clock.h" #include "clock.h"
...@@ -633,12 +634,17 @@ int prm_unregister(struct prm_ll_data *pld) ...@@ -633,12 +634,17 @@ int prm_unregister(struct prm_ll_data *pld)
return 0; return 0;
} }
static struct omap_prcm_init_data prm_data = { #ifdef CONFIG_ARCH_OMAP2
static struct omap_prcm_init_data omap2_prm_data __initdata = {
.index = TI_CLKM_PRM, .index = TI_CLKM_PRM,
.init = omap2xxx_prm_init,
}; };
#endif
static struct omap_prcm_init_data omap3_prm_data = { #ifdef CONFIG_ARCH_OMAP3
static struct omap_prcm_init_data omap3_prm_data __initdata = {
.index = TI_CLKM_PRM, .index = TI_CLKM_PRM,
.init = omap3xxx_prm_init,
/* /*
* IVA2 offset is a negative value, must offset the prm_base * IVA2 offset is a negative value, must offset the prm_base
...@@ -646,23 +652,57 @@ static struct omap_prcm_init_data omap3_prm_data = { ...@@ -646,23 +652,57 @@ static struct omap_prcm_init_data omap3_prm_data = {
*/ */
.offset = -OMAP3430_IVA2_MOD, .offset = -OMAP3430_IVA2_MOD,
}; };
#endif
static struct omap_prcm_init_data scrm_data = { #if defined(CONFIG_SOC_AM33XX) || defined(CONFIG_SOC_TI81XX)
.index = TI_CLKM_SCRM, static struct omap_prcm_init_data am3_prm_data __initdata = {
.index = TI_CLKM_PRM,
.init = am33xx_prm_init,
};
#endif
#if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5) || \
defined(CONFIG_SOC_DRA7XX) || defined(CONFIG_SOC_AM43XX)
static struct omap_prcm_init_data omap4_prm_data __initdata = {
.index = TI_CLKM_PRM,
.init = omap44xx_prm_init,
}; };
#endif
static const struct of_device_id omap_prcm_dt_match_table[] = { #if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5)
{ .compatible = "ti,am3-prcm", .data = &prm_data }, static struct omap_prcm_init_data scrm_data __initdata = {
{ .compatible = "ti,am4-prcm", .data = &prm_data }, .index = TI_CLKM_SCRM,
{ .compatible = "ti,dm814-prcm", .data = &prm_data }, };
{ .compatible = "ti,dm816-prcm", .data = &prm_data }, #endif
{ .compatible = "ti,omap2-prcm", .data = &prm_data },
static const struct of_device_id omap_prcm_dt_match_table[] __initconst = {
#ifdef CONFIG_SOC_AM33XX
{ .compatible = "ti,am3-prcm", .data = &am3_prm_data },
#endif
#ifdef CONFIG_SOC_AM43XX
{ .compatible = "ti,am4-prcm", .data = &omap4_prm_data },
#endif
#ifdef CONFIG_SOC_TI81XX
{ .compatible = "ti,dm814-prcm", .data = &am3_prm_data },
{ .compatible = "ti,dm816-prcm", .data = &am3_prm_data },
#endif
#ifdef CONFIG_ARCH_OMAP2
{ .compatible = "ti,omap2-prcm", .data = &omap2_prm_data },
#endif
#ifdef CONFIG_ARCH_OMAP3
{ .compatible = "ti,omap3-prm", .data = &omap3_prm_data }, { .compatible = "ti,omap3-prm", .data = &omap3_prm_data },
{ .compatible = "ti,omap4-prm", .data = &prm_data }, #endif
#ifdef CONFIG_ARCH_OMAP4
{ .compatible = "ti,omap4-prm", .data = &omap4_prm_data },
{ .compatible = "ti,omap4-scrm", .data = &scrm_data }, { .compatible = "ti,omap4-scrm", .data = &scrm_data },
{ .compatible = "ti,omap5-prm", .data = &prm_data }, #endif
#ifdef CONFIG_SOC_OMAP5
{ .compatible = "ti,omap5-prm", .data = &omap4_prm_data },
{ .compatible = "ti,omap5-scrm", .data = &scrm_data }, { .compatible = "ti,omap5-scrm", .data = &scrm_data },
{ .compatible = "ti,dra7-prm", .data = &prm_data }, #endif
#ifdef CONFIG_SOC_DRA7XX
{ .compatible = "ti,dra7-prm", .data = &omap4_prm_data },
#endif
{ } { }
}; };
...@@ -691,11 +731,21 @@ int __init omap2_prm_base_init(void) ...@@ -691,11 +731,21 @@ int __init omap2_prm_base_init(void)
prm_base = mem + data->offset; prm_base = mem + data->offset;
data->mem = mem; data->mem = mem;
data->np = np;
if (data->init)
data->init(data);
} }
return 0; return 0;
} }
int __init omap2_prcm_base_init(void)
{
return omap2_prm_base_init();
}
/** /**
* omap_prcm_init - low level init for the PRCM drivers * omap_prcm_init - low level init for the PRCM drivers
* *
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7