Commit eded36fe authored by Tero Kristo's avatar Tero Kristo Committed by Michael Turquette
Browse files

ARM: OMAP3: use clock data from TI clock driver for legacy boot 



As the clock data is now available for the legacy boot also from the
clock driver, use this rather than the data under the mach folder.
This allows us to get rid of the old clock data completely.

Signed-off-by: default avatarTero Kristo <t-kristo@ti.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarMichael Turquette <mturquette@linaro.org>
parent 3dbb048b

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE