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

Commit 4680c29f authored by Paul Walmsley's avatar Paul Walmsley
Browse files

OMAP2/3 clock: clean up omap*_clk_arch_init() 



In the OMAP3xxx clock code, remove the #ifdef CONFIG_ARCH_OMAP3 in
clock34xx.c, since this file is only compiled for OMAP3xxx builds.  Also,
rename omap2_clk_arch_init in this file to omap3xxx_clk_arch_init() to
pave the way for multi-OMAP kernels.  Ensure that it is not executed
on non-OMAP3xxx systems.

In the OMAP2xxx clock code, rename omap2_clk_arch_init in this file to
omap2xxx_clk_arch_init() to pave the way for multi-OMAP kernels.
Ensure that it is not executed on non-OMAP2xxx systems.

Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent 35e424e2

arch/arm/mach-omap2/clock2xxx.c

+5 −2
Original line number Diff line number Diff line
@@ -101,11 +101,14 @@ void omap2_clk_prepare_for_reboot(void) 
 * Switch the MPU rate if specified on cmdline.

 * We cannot do this early until cmdline is parsed.

 */

static int __init omap2_clk_arch_init(void)

static int __init omap2xxx_clk_arch_init(void)

{

	struct clk *virt_prcm_set, *sys_ck, *dpll_ck, *mpu_ck;

	unsigned long sys_ck_rate;



	if (!cpu_is_omap24xx())

		return 0;



	if (!mpurate)

		return -EINVAL;
@@ -129,6 +132,6 @@ static int __init omap2_clk_arch_init(void) 


	return 0;

}

arch_initcall(omap2_clk_arch_init);

arch_initcall(omap2xxx_clk_arch_init);

arch/arm/mach-omap2/clock34xx.c

+5 −11
Original line number Diff line number Diff line
@@ -162,12 +162,6 @@ int omap3_dpll4_set_rate(struct clk *clk, unsigned long rate) 


/* Common clock code */



/*

 * As it is structured now, this will prevent an OMAP2/3 multiboot

 * kernel from compiling.  This will need further attention.

 */

#if defined(CONFIG_ARCH_OMAP3)



/*

 * Set clocks for bypass mode for reboot to work.

 */
@@ -213,11 +207,14 @@ void omap3_clk_lock_dpll5(void) 
 * Switch the MPU rate if specified on cmdline.

 * We cannot do this early until cmdline is parsed.

 */

static int __init omap2_clk_arch_init(void)

static int __init omap3xxx_clk_arch_init(void)

{

	struct clk *osc_sys_ck, *dpll1_ck, *arm_fck, *core_ck;

	unsigned long osc_sys_rate;



	if (!cpu_is_omap34xx())

		return 0;



	if (!mpurate)

		return -EINVAL;
@@ -246,9 +243,6 @@ static int __init omap2_clk_arch_init(void) 


	return 0;

}

arch_initcall(omap2_clk_arch_init);





#endif

arch_initcall(omap3xxx_clk_arch_init);