Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae521d4d authored by Tero Kristo's avatar Tero Kristo
Browse files

ARM: OMAP2+: PRM: determine PRM base address from device tree 



There is no need to provide the PRM base address through a low-level API
from the low-level IO init, as this information is available through DT.
Re-routed the parsing function to be called from the PRM drivers also to
simplify the implementation under io.c.

Signed-off-by: default avatarTero Kristo <t-kristo@ti.com>
parent 5970ca2d

arch/arm/mach-omap2/io.c

+1 −11
Original line number Diff line number Diff line
@@ -386,7 +386,6 @@ void __init omap2420_init_early(void) 
			       OMAP2_L3_IO_ADDRESS(OMAP2420_SMS_BASE));

	omap2_set_globals_control(OMAP2_L4_IO_ADDRESS(OMAP242X_CTRL_BASE),

				  NULL);

	omap2_set_globals_prm(OMAP2_L4_IO_ADDRESS(OMAP2420_PRM_BASE));

	omap2xxx_check_revision();

	omap2xxx_prm_init();

	omap2xxx_cm_init();
@@ -415,7 +414,6 @@ void __init omap2430_init_early(void) 
			       OMAP2_L3_IO_ADDRESS(OMAP243X_SMS_BASE));

	omap2_set_globals_control(OMAP2_L4_IO_ADDRESS(OMAP243X_CTRL_BASE),

				  NULL);

	omap2_set_globals_prm(OMAP2_L4_IO_ADDRESS(OMAP2430_PRM_BASE));

	omap2xxx_check_revision();

	omap2xxx_prm_init();

	omap2xxx_cm_init();
@@ -448,9 +446,8 @@ void __init omap3_init_early(void) 
			       OMAP2_L3_IO_ADDRESS(OMAP343X_SMS_BASE));

	omap2_set_globals_control(OMAP2_L4_IO_ADDRESS(OMAP343X_CTRL_BASE),

				  NULL);

	/* XXX: remove these two once OMAP3 is DT only */

	omap2_set_globals_prm(OMAP2_L4_IO_ADDRESS(OMAP3430_PRM_BASE));



	/* XXX: remove this once OMAP3 is DT only */

	omap2_set_globals_cm(OMAP2_L4_IO_ADDRESS(OMAP3430_CM_BASE), NULL);

	omap3xxx_check_revision();

	omap3xxx_check_features();
@@ -551,7 +548,6 @@ void __init ti814x_init_early(void) 
			      OMAP2_L4_IO_ADDRESS(TI81XX_TAP_BASE));

	omap2_set_globals_control(OMAP2_L4_IO_ADDRESS(TI81XX_CTRL_BASE),

				  NULL);

	omap2_set_globals_prm(OMAP2_L4_IO_ADDRESS(TI81XX_PRCM_BASE));

	omap3xxx_check_revision();

	ti81xx_check_features();

	am33xx_prm_init();
@@ -571,7 +567,6 @@ void __init ti816x_init_early(void) 
			      OMAP2_L4_IO_ADDRESS(TI81XX_TAP_BASE));

	omap2_set_globals_control(OMAP2_L4_IO_ADDRESS(TI81XX_CTRL_BASE),

				  NULL);

	omap2_set_globals_prm(OMAP2_L4_IO_ADDRESS(TI81XX_PRCM_BASE));

	omap3xxx_check_revision();

	ti81xx_check_features();

	am33xx_prm_init();
@@ -593,7 +588,6 @@ void __init am33xx_init_early(void) 
			      AM33XX_L4_WK_IO_ADDRESS(AM33XX_TAP_BASE));

	omap2_set_globals_control(AM33XX_L4_WK_IO_ADDRESS(AM33XX_CTRL_BASE),

				  NULL);

	omap2_set_globals_prm(AM33XX_L4_WK_IO_ADDRESS(AM33XX_PRCM_BASE));

	omap3xxx_check_revision();

	am33xx_check_features();

	am33xx_prm_init();
@@ -618,7 +612,6 @@ void __init am43xx_init_early(void) 
			      AM33XX_L4_WK_IO_ADDRESS(AM33XX_TAP_BASE));

	omap2_set_globals_control(AM33XX_L4_WK_IO_ADDRESS(AM33XX_CTRL_BASE),

				  NULL);

	omap2_set_globals_prm(AM33XX_L4_WK_IO_ADDRESS(AM43XX_PRCM_BASE));

	omap3xxx_check_revision();

	am33xx_check_features();

	omap44xx_prm_init();
@@ -644,7 +637,6 @@ void __init omap4430_init_early(void) 
			      OMAP2_L4_IO_ADDRESS(OMAP443X_SCM_BASE));

	omap2_set_globals_control(OMAP2_L4_IO_ADDRESS(OMAP443X_SCM_BASE),

				  OMAP2_L4_IO_ADDRESS(OMAP443X_CTRL_BASE));

	omap2_set_globals_prm(OMAP2_L4_IO_ADDRESS(OMAP4430_PRM_BASE));

	omap2_set_globals_prcm_mpu(OMAP2_L4_IO_ADDRESS(OMAP4430_PRCM_MPU_BASE));

	omap4xxx_check_revision();

	omap4xxx_check_features();
@@ -675,7 +667,6 @@ void __init omap5_init_early(void) 
			      OMAP2_L4_IO_ADDRESS(OMAP54XX_SCM_BASE));

	omap2_set_globals_control(OMAP2_L4_IO_ADDRESS(OMAP54XX_SCM_BASE),

				  OMAP2_L4_IO_ADDRESS(OMAP54XX_CTRL_BASE));

	omap2_set_globals_prm(OMAP2_L4_IO_ADDRESS(OMAP54XX_PRM_BASE));

	omap2_set_globals_prcm_mpu(OMAP2_L4_IO_ADDRESS(OMAP54XX_PRCM_MPU_BASE));

	omap4_pm_init_early();

	omap44xx_prm_init();
@@ -703,7 +694,6 @@ void __init dra7xx_init_early(void) 
	omap2_set_globals_tap(-1, OMAP2_L4_IO_ADDRESS(DRA7XX_TAP_BASE));

	omap2_set_globals_control(OMAP2_L4_IO_ADDRESS(OMAP54XX_SCM_BASE),

				  OMAP2_L4_IO_ADDRESS(DRA7XX_CTRL_BASE));

	omap2_set_globals_prm(OMAP2_L4_IO_ADDRESS(OMAP54XX_PRM_BASE));

	omap2_set_globals_prcm_mpu(OMAP2_L4_IO_ADDRESS(OMAP54XX_PRCM_MPU_BASE));

	omap4_pm_init_early();

	omap44xx_prm_init();

arch/arm/mach-omap2/prm.h

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ extern void __iomem *prm_base; 
extern u16 prm_features;

extern void omap2_set_globals_prm(void __iomem *prm);

int omap_prcm_init(void);

int omap2_prm_base_init(void);

void omap3_prcm_legacy_iomaps_init(void);

# endif

arch/arm/mach-omap2/prm2xxx.c

+1 −0
Original line number Diff line number Diff line
@@ -222,6 +222,7 @@ static struct prm_ll_data omap2xxx_prm_ll_data = { 


int __init omap2xxx_prm_init(void)

{

	omap2_prm_base_init();

	return prm_register(&omap2xxx_prm_ll_data);

}

arch/arm/mach-omap2/prm33xx.c

+1 −0
Original line number Diff line number Diff line
@@ -380,6 +380,7 @@ static struct prm_ll_data am33xx_prm_ll_data = { 


int __init am33xx_prm_init(void)

{

	omap2_prm_base_init();

	return prm_register(&am33xx_prm_ll_data);

}

arch/arm/mach-omap2/prm3xxx.c

+5 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include "prm-regbits-34xx.h"

#include "cm3xxx.h"

#include "cm-regbits-34xx.h"

#include "clock.h"



static void omap3xxx_prm_read_pending_irqs(unsigned long *events);

static void omap3xxx_prm_ocp_barrier(void);
@@ -671,6 +672,10 @@ static struct prm_ll_data omap3xxx_prm_ll_data = { 


int __init omap3xxx_prm_init(void)

{

	omap2_clk_legacy_provider_init(TI_CLKM_PRM,

				       prm_base + OMAP3430_IVA2_MOD);

	omap2_prm_base_init();



	if (omap3_has_io_wakeup())

		prm_features |= PRM_HAS_IO_WAKEUP;