Merge branch 'for_2.6.35' of git://git.pwsan.com/linux-2.6 into omap-for-linus (4fa73a1b) · Commits · e / devices / android_kernel_xiaomi_nabu

arch/arm/mach-omap1/clock.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -578,7 +578,7 @@ int omap1_clk_set_rate(struct clk *clk, unsigned long rate)

	#ifdef CONFIG_OMAP_RESET_CLOCKS		#ifdef CONFIG_OMAP_RESET_CLOCKS

	void __init omap1_clk_disable_unused(struct clk *clk)		void omap1_clk_disable_unused(struct clk *clk)
	{		{
	__u32 regval32;		__u32 regval32;

arch/arm/mach-omap1/clock.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -39,7 +39,7 @@ extern long omap1_clk_round_rate_ckctl_arm(struct clk *clk, unsigned long rate);
	extern unsigned long omap1_watchdog_recalc(struct clk *clk);		extern unsigned long omap1_watchdog_recalc(struct clk *clk);

	#ifdef CONFIG_OMAP_RESET_CLOCKS		#ifdef CONFIG_OMAP_RESET_CLOCKS
	extern void __init omap1_clk_disable_unused(struct clk *clk);		extern void omap1_clk_disable_unused(struct clk *clk);
	#else		#else
	#define omap1_clk_disable_unused NULL		#define omap1_clk_disable_unused NULL
	#endif		#endif

arch/arm/mach-omap2/clkt2xxx_apll.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -70,12 +70,12 @@ static int omap2_clk_apll_enable(struct clk *clk, u32 status_mask)

	static int omap2_clk_apll96_enable(struct clk *clk)		static int omap2_clk_apll96_enable(struct clk *clk)
	{		{
	return omap2_clk_apll_enable(clk, OMAP24XX_ST_96M_APLL);		return omap2_clk_apll_enable(clk, OMAP24XX_ST_96M_APLL_MASK);
	}		}

	static int omap2_clk_apll54_enable(struct clk *clk)		static int omap2_clk_apll54_enable(struct clk *clk)
	{		{
	return omap2_clk_apll_enable(clk, OMAP24XX_ST_54M_APLL);		return omap2_clk_apll_enable(clk, OMAP24XX_ST_54M_APLL_MASK);
	}		}

	/* Stop APLL */		/* Stop APLL */

arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c

+4 −13

Original line number	Original line	Diff line number	Diff line
	@@ -68,16 +68,13 @@ long omap2_round_to_table_rate(struct clk *clk, unsigned long rate)
	{		{
	const struct prcm_config *ptr;		const struct prcm_config *ptr;
	long highest_rate;		long highest_rate;
	long sys_ck_rate;

	sys_ck_rate = clk_get_rate(sclk);

	highest_rate = -EINVAL;		highest_rate = -EINVAL;

	for (ptr = rate_table; ptr->mpu_speed; ptr++) {		for (ptr = rate_table; ptr->mpu_speed; ptr++) {
	if (!(ptr->flags & cpu_mask))		if (!(ptr->flags & cpu_mask))
	continue;		continue;
	if (ptr->xtal_speed != sys_ck_rate)		if (ptr->xtal_speed != sclk->rate)
	continue;		continue;

	highest_rate = ptr->mpu_speed;		highest_rate = ptr->mpu_speed;
	@@ -96,15 +93,12 @@ int omap2_select_table_rate(struct clk *clk, unsigned long rate)
	const struct prcm_config *prcm;		const struct prcm_config *prcm;
	unsigned long found_speed = 0;		unsigned long found_speed = 0;
	unsigned long flags;		unsigned long flags;
	long sys_ck_rate;

	sys_ck_rate = clk_get_rate(sclk);

	for (prcm = rate_table; prcm->mpu_speed; prcm++) {		for (prcm = rate_table; prcm->mpu_speed; prcm++) {
	if (!(prcm->flags & cpu_mask))		if (!(prcm->flags & cpu_mask))
	continue;		continue;

	if (prcm->xtal_speed != sys_ck_rate)		if (prcm->xtal_speed != sclk->rate)
	continue;		continue;

	if (prcm->mpu_speed <= rate) {		if (prcm->mpu_speed <= rate) {
	@@ -181,19 +175,16 @@ static struct cpufreq_frequency_table *freq_table;
	void omap2_clk_init_cpufreq_table(struct cpufreq_frequency_table **table)		void omap2_clk_init_cpufreq_table(struct cpufreq_frequency_table **table)
	{		{
	const struct prcm_config *prcm;		const struct prcm_config *prcm;
	long sys_ck_rate;
	int i = 0;		int i = 0;
	int tbl_sz = 0;		int tbl_sz = 0;

	if (!cpu_is_omap24xx())		if (!cpu_is_omap24xx())
	return;		return;

	sys_ck_rate = clk_get_rate(sclk);

	for (prcm = rate_table; prcm->mpu_speed; prcm++) {		for (prcm = rate_table; prcm->mpu_speed; prcm++) {
	if (!(prcm->flags & cpu_mask))		if (!(prcm->flags & cpu_mask))
	continue;		continue;
	if (prcm->xtal_speed != sys_ck_rate)		if (prcm->xtal_speed != sclk->rate)
	continue;		continue;

	/* don't put bypass rates in table */		/* don't put bypass rates in table */
	@@ -226,7 +217,7 @@ void omap2_clk_init_cpufreq_table(struct cpufreq_frequency_table **table)
	for (prcm = rate_table; prcm->mpu_speed; prcm++) {		for (prcm = rate_table; prcm->mpu_speed; prcm++) {
	if (!(prcm->flags & cpu_mask))		if (!(prcm->flags & cpu_mask))
	continue;		continue;
	if (prcm->xtal_speed != sys_ck_rate)		if (prcm->xtal_speed != sclk->rate)
	continue;		continue;

	/* don't put bypass rates in table */		/* don't put bypass rates in table */

arch/arm/mach-omap2/clkt_clksel.c

+286 −186

File changed.

Preview size limit exceeded, changes collapsed.