Commit fe767560 authored by Michael Turquette's avatar Michael Turquette
Browse files

Merge branch 'clk-omap-legacy' into clk-next 

Conflicts:
	arch/arm/mach-omap2/cclock3xxx_data.c
parents 035a61c3 d6540b19

arch/arm/mach-omap2/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ obj-$(CONFIG_SOC_OMAP2430) += clock2430.o 
obj-$(CONFIG_ARCH_OMAP3)		+= $(clock-common) clock3xxx.o

obj-$(CONFIG_ARCH_OMAP3)		+= clock34xx.o clkt34xx_dpll3m2.o

obj-$(CONFIG_ARCH_OMAP3)		+= clock3517.o clock36xx.o

obj-$(CONFIG_ARCH_OMAP3)		+= dpll3xxx.o cclock3xxx_data.o

obj-$(CONFIG_ARCH_OMAP3)		+= dpll3xxx.o

obj-$(CONFIG_ARCH_OMAP3)		+= clkt_iclk.o

obj-$(CONFIG_ARCH_OMAP4)		+= $(clock-common)

obj-$(CONFIG_ARCH_OMAP4)		+= dpll3xxx.o dpll44xx.o

arch/arm/mach-omap2/cclock3xxx_data.c

deleted100644 → 0
+0 −3727

File deleted.

Preview size limit exceeded, changes collapsed.

arch/arm/mach-omap2/io.c

+19 −9
Original line number Diff line number Diff line
@@ -461,7 +461,17 @@ void __init omap3_init_early(void) 
	omap3xxx_clockdomains_init();

	omap3xxx_hwmod_init();

	omap_hwmod_init_postsetup();

	omap_clk_soc_init = omap3xxx_clk_init;

	if (!of_have_populated_dt()) {

		omap3_prcm_legacy_iomaps_init();

		if (soc_is_am35xx())

			omap_clk_soc_init = am35xx_clk_legacy_init;

		else if (cpu_is_omap3630())

			omap_clk_soc_init = omap36xx_clk_legacy_init;

		else if (omap_rev() == OMAP3430_REV_ES1_0)

			omap_clk_soc_init = omap3430es1_clk_legacy_init;

		else

			omap_clk_soc_init = omap3430_clk_legacy_init;

	}

}



void __init omap3430_init_early(void)
@@ -509,8 +519,6 @@ void __init ti81xx_init_early(void) 
	omap_hwmod_init_postsetup();

	if (of_have_populated_dt())

		omap_clk_soc_init = ti81xx_dt_clk_init;

	else

		omap_clk_soc_init = omap3xxx_clk_init;

}



void __init omap3_init_late(void)
@@ -731,6 +739,7 @@ int __init omap_clk_init(void) 


	ti_clk_init_features();



	if (of_have_populated_dt()) {

		ret = of_prcm_init();

		if (ret)

			return ret;
@@ -740,6 +749,7 @@ int __init omap_clk_init(void) 
		ti_dt_clk_init_retry_clks();



		ti_dt_clockdomains_setup();

	}



	ret = omap_clk_soc_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 of_prcm_init(void);

void omap3_prcm_legacy_iomaps_init(void);

# endif



/*

arch/arm/mach-omap2/prm_common.c

+11 −0
Original line number Diff line number Diff line
@@ -35,6 +35,8 @@ 
#include "prm44xx.h"

#include "common.h"

#include "clock.h"

#include "cm.h"

#include "control.h"



/*

 * OMAP_PRCM_MAX_NR_PENDING_REG: maximum number of PRM_IRQ*_MPU regs
@@ -627,6 +629,15 @@ int __init of_prcm_init(void) 
	return 0;

}



void __init omap3_prcm_legacy_iomaps_init(void)

{

	ti_clk_ll_ops = &omap_clk_ll_ops;



	clk_memmaps[TI_CLKM_CM] = cm_base + OMAP3430_IVA2_MOD;

	clk_memmaps[TI_CLKM_PRM] = prm_base + OMAP3430_IVA2_MOD;

	clk_memmaps[TI_CLKM_SCRM] = omap_ctrl_base_get();

}



static int __init prm_late_init(void)

{

	if (prm_ll_data->late_init)