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

Commit 39a8b086 authored by Alistair Buxton's avatar Alistair Buxton
Browse files

OMAP7XX: Clocks: Add omap850 support 



This patch is part of a series which unifies all duplicated code between
omap730 and omap850. All cpu checks are converted to cpu_is_omap7xx() and
CONFIG_ARCH_OMAP850 is added to all CONFIG_ARCH_OMAP730 checks.

This file had no omap850 specific code. Initial clock support was done in
the Linwizard tree by Zebediah C. McClure.

Signed-off-by: default avatarAlistair Buxton <a.j.buxton@gmail.com>
Reviewed-by: default avatarZebediah C. McClure <zmc@lurian.net>
parent 4b9100dd

arch/arm/mach-omap1/clock.c

+5 −5
Original line number Diff line number Diff line
@@ -398,7 +398,7 @@ static int omap1_select_table_rate(struct clk * clk, unsigned long rate) 
	 * Reprogramming the DPLL is tricky, it must be done from SRAM.

	 * (on 730, bit 13 must always be 1)

	 */

	if (cpu_is_omap730())

	if (cpu_is_omap7xx())

		omap_sram_reprogram_clock(ptr->dpllctl_val, ptr->ckctl_val | 0x2000);

	else

		omap_sram_reprogram_clock(ptr->dpllctl_val, ptr->ckctl_val);
@@ -783,7 +783,7 @@ int __init omap1_clk_init(void) 
		cpu_mask |= CK_16XX;

	if (cpu_is_omap1510())

		cpu_mask |= CK_1510;

	if (cpu_is_omap730())

	if (cpu_is_omap7xx())

		cpu_mask |= CK_730;

	if (cpu_is_omap310())

		cpu_mask |= CK_310;
@@ -800,7 +800,7 @@ int __init omap1_clk_init(void) 
			crystal_type = info->system_clock_type;

	}



#if defined(CONFIG_ARCH_OMAP730)

#if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)

	ck_ref.rate = 13000000;

#elif defined(CONFIG_ARCH_OMAP16XX)

	if (crystal_type == 2)
@@ -847,7 +847,7 @@ int __init omap1_clk_init(void) 
		printk(KERN_ERR "System frequencies not set. Check your config.\n");

		/* Guess sane values (60MHz) */

		omap_writew(0x2290, DPLL_CTL);

		omap_writew(cpu_is_omap730() ? 0x3005 : 0x1005, ARM_CKCTL);

		omap_writew(cpu_is_omap7xx() ? 0x3005 : 0x1005, ARM_CKCTL);

		ck_dpll1.rate = 60000000;

	}

#endif
@@ -873,7 +873,7 @@ int __init omap1_clk_init(void) 


	/* Turn off DSP and ARM_TIMXO. Make sure ARM_INTHCK is not divided */

	/* (on 730, bit 13 must not be cleared) */

	if (cpu_is_omap730())

	if (cpu_is_omap7xx())

		omap_writew(omap_readw(ARM_CKCTL) & 0x2fff, ARM_CKCTL);

	else

		omap_writew(omap_readw(ARM_CKCTL) & 0x0fff, ARM_CKCTL);