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

Commit 4e3870f3 authored by Tero Kristo's avatar Tero Kristo
Browse files

ARM: OMAP4+: PRM: move omap_prm_base_init under OMAP4 PRM driver 



There is no need to call this separately from io.c, rather this can be
done commonly under the PRM driver.

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

arch/arm/mach-omap2/io.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -623,7 +623,6 @@ void __init am43xx_init_early(void) 
				  NULL);

				  NULL);

	omap2_set_globals_prm(AM33XX_L4_WK_IO_ADDRESS(AM43XX_PRCM_BASE));

	omap2_set_globals_prm(AM33XX_L4_WK_IO_ADDRESS(AM43XX_PRCM_BASE));

	omap2_set_globals_cm(AM33XX_L4_WK_IO_ADDRESS(AM43XX_PRCM_BASE), NULL);

	omap2_set_globals_cm(AM33XX_L4_WK_IO_ADDRESS(AM43XX_PRCM_BASE), NULL);

	omap_prm_base_init();

	omap_cm_base_init();

	omap_cm_base_init();

	omap3xxx_check_revision();

	omap3xxx_check_revision();

	am33xx_check_features();

	am33xx_check_features();
@@ -654,7 +653,6 @@ void __init omap4430_init_early(void) 
	omap2_set_globals_cm(OMAP2_L4_IO_ADDRESS(OMAP4430_CM_BASE),

	omap2_set_globals_cm(OMAP2_L4_IO_ADDRESS(OMAP4430_CM_BASE),

			     OMAP2_L4_IO_ADDRESS(OMAP4430_CM2_BASE));

			     OMAP2_L4_IO_ADDRESS(OMAP4430_CM2_BASE));

	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));

	omap_prm_base_init();

	omap_cm_base_init();

	omap_cm_base_init();

	omap4xxx_check_revision();

	omap4xxx_check_revision();

	omap4xxx_check_features();

	omap4xxx_check_features();
@@ -690,7 +688,6 @@ void __init omap5_init_early(void) 
			     OMAP2_L4_IO_ADDRESS(OMAP54XX_CM_CORE_BASE));

			     OMAP2_L4_IO_ADDRESS(OMAP54XX_CM_CORE_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();

	omap_prm_base_init();

	omap_cm_base_init();

	omap_cm_base_init();

	omap44xx_prm_init();

	omap44xx_prm_init();

	omap5xxx_check_revision();

	omap5xxx_check_revision();
@@ -722,7 +719,6 @@ void __init dra7xx_init_early(void) 
			     OMAP2_L4_IO_ADDRESS(OMAP54XX_CM_CORE_BASE));

			     OMAP2_L4_IO_ADDRESS(OMAP54XX_CM_CORE_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();

	omap_prm_base_init();

	omap_cm_base_init();

	omap_cm_base_init();

	omap44xx_prm_init();

	omap44xx_prm_init();

	dra7xxx_check_revision();

	dra7xxx_check_revision();

arch/arm/mach-omap2/prm44xx.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -705,6 +705,8 @@ static struct prm_ll_data omap44xx_prm_ll_data = { 




int __init omap44xx_prm_init(void)

int __init omap44xx_prm_init(void)

{

{

	omap_prm_base_init();



	if (cpu_is_omap44xx() || soc_is_omap54xx() || soc_is_dra7xx())

	if (cpu_is_omap44xx() || soc_is_omap54xx() || soc_is_dra7xx())

		prm_features |= PRM_HAS_IO_WAKEUP;

		prm_features |= PRM_HAS_IO_WAKEUP;