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

Commit b981f980 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

parents e3a36c41 6560ee07

arch/arm/configs/omap1_defconfig

+0 −5
Original line number Original line Diff line number Diff line
@@ -48,12 +48,7 @@ CONFIG_MACH_SX1=y 
CONFIG_MACH_NOKIA770=y

CONFIG_MACH_NOKIA770=y

CONFIG_MACH_AMS_DELTA=y

CONFIG_MACH_AMS_DELTA=y

CONFIG_MACH_OMAP_GENERIC=y

CONFIG_MACH_OMAP_GENERIC=y

CONFIG_OMAP_ARM_216MHZ=y

CONFIG_OMAP_ARM_195MHZ=y

CONFIG_OMAP_ARM_192MHZ=y

CONFIG_OMAP_ARM_182MHZ=y

CONFIG_OMAP_ARM_182MHZ=y

CONFIG_OMAP_ARM_168MHZ=y

# CONFIG_OMAP_ARM_60MHZ is not set

# CONFIG_ARM_THUMB is not set

# CONFIG_ARM_THUMB is not set

CONFIG_PCCARD=y

CONFIG_PCCARD=y

CONFIG_OMAP_CF=y

CONFIG_OMAP_CF=y

arch/arm/mach-omap1/clock_data.c

+10 −2
Original line number Original line Diff line number Diff line
@@ -16,6 +16,8 @@ 




#include <linux/kernel.h>

#include <linux/kernel.h>

#include <linux/clk.h>

#include <linux/clk.h>

#include <linux/cpufreq.h>

#include <linux/delay.h>

#include <linux/io.h>

#include <linux/io.h>





#include <asm/mach-types.h>  /* for machine_is_* */

#include <asm/mach-types.h>  /* for machine_is_* */
@@ -927,16 +929,22 @@ int __init omap1_clk_init(void) 




void __init omap1_clk_late_init(void)

void __init omap1_clk_late_init(void)

{

{

	if (ck_dpll1.rate >= OMAP1_DPLL1_SANE_VALUE)

	unsigned long rate = ck_dpll1.rate;



	if (rate >= OMAP1_DPLL1_SANE_VALUE)

		return;

		return;





	/* System booting at unusable rate, force reprogramming of DPLL1 */

	ck_dpll1_p->rate = 0;



	/* Find the highest supported frequency and enable it */

	/* Find the highest supported frequency and enable it */

	if (omap1_select_table_rate(&virtual_ck_mpu, ~0)) {

	if (omap1_select_table_rate(&virtual_ck_mpu, ~0)) {

		pr_err("System frequencies not set, using default. Check your config.\n");

		pr_err("System frequencies not set, using default. Check your config.\n");

		omap_writew(0x2290, DPLL_CTL);

		omap_writew(0x2290, DPLL_CTL);

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

		omap_writew(cpu_is_omap7xx() ? 0x2005 : 0x0005, ARM_CKCTL);

		ck_dpll1.rate = OMAP1_DPLL1_SANE_VALUE;

		ck_dpll1.rate = OMAP1_DPLL1_SANE_VALUE;

	}

	}

	propagate_rate(&ck_dpll1);

	propagate_rate(&ck_dpll1);

	omap1_show_rates();

	omap1_show_rates();

	loops_per_jiffy = cpufreq_scale(loops_per_jiffy, rate, ck_dpll1.rate);

}
 
}