Merge branch 'fixes_a_2.6.38rc' of git://git.pwsan.com/linux-2.6 into omap-fixes (75d0c9e1) · Commits · e / devices / android_kernel_fairphone_FP5

arch/arm/mach-omap1/time.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -244,6 +244,13 @@ static void __init omap_timer_init(void)

		omap_init_mpu_timer(rate);
		omap_init_clocksource(rate);
		/*
		* XXX Since this file seems to deal mostly with the MPU timer,
		* this doesn't seem like the correct place for the sync timer
		* clocksource init.
		*/
		if (!cpu_is_omap7xx() && !cpu_is_omap15xx())
		omap_init_clocksource_32k();
		}

		struct sys_timer omap_timer = {

arch/arm/mach-omap2/clock44xx_data.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -34,7 +34,6 @@
		#include "cm2_44xx.h"
		#include "cm-regbits-44xx.h"
		#include "prm44xx.h"
		#include "prm44xx.h"
		#include "prm-regbits-44xx.h"
		#include "control.h"
		#include "scrm44xx.h"

arch/arm/mach-omap2/clockdomain.c

+26 −4

Original line number	Diff line number	Diff line
		@@ -423,6 +423,12 @@ int clkdm_add_wkdep(struct clockdomain clkdm1, struct clockdomain clkdm2)
		{
		struct clkdm_dep *cd;

		if (!cpu_is_omap24xx() && !cpu_is_omap34xx()) {
		pr_err("clockdomain: %s/%s: %s: not yet implemented\n",
		clkdm1->name, clkdm2->name, __func__);
		return -EINVAL;
		}

		if (!clkdm1 \|\| !clkdm2)
		return -EINVAL;

		@@ -458,6 +464,12 @@ int clkdm_del_wkdep(struct clockdomain clkdm1, struct clockdomain clkdm2)
		{
		struct clkdm_dep *cd;

		if (!cpu_is_omap24xx() && !cpu_is_omap34xx()) {
		pr_err("clockdomain: %s/%s: %s: not yet implemented\n",
		clkdm1->name, clkdm2->name, __func__);
		return -EINVAL;
		}

		if (!clkdm1 \|\| !clkdm2)
		return -EINVAL;

		@@ -500,6 +512,12 @@ int clkdm_read_wkdep(struct clockdomain clkdm1, struct clockdomain clkdm2)
		if (!clkdm1 \|\| !clkdm2)
		return -EINVAL;

		if (!cpu_is_omap24xx() && !cpu_is_omap34xx()) {
		pr_err("clockdomain: %s/%s: %s: not yet implemented\n",
		clkdm1->name, clkdm2->name, __func__);
		return -EINVAL;
		}

		cd = _clkdm_deps_lookup(clkdm2, clkdm1->wkdep_srcs);
		if (IS_ERR(cd)) {
		pr_debug("clockdomain: hardware cannot set/clear wake up of "
		@@ -527,6 +545,12 @@ int clkdm_clear_all_wkdeps(struct clockdomain *clkdm)
		struct clkdm_dep *cd;
		u32 mask = 0;

		if (!cpu_is_omap24xx() && !cpu_is_omap34xx()) {
		pr_err("clockdomain: %s: %s: not yet implemented\n",
		clkdm->name, __func__);
		return -EINVAL;
		}

		if (!clkdm)
		return -EINVAL;

		@@ -830,8 +854,7 @@ void omap2_clkdm_allow_idle(struct clockdomain *clkdm)
		* dependency code and data for OMAP4.
		*/
		if (cpu_is_omap44xx()) {
		WARN_ONCE(1, "clockdomain: OMAP4 wakeup/sleep dependency "
		"support is not yet implemented\n");
		pr_err("clockdomain: %s: OMAP4 wakeup/sleep dependency support: not yet implemented\n", clkdm->name);
		} else {
		if (atomic_read(&clkdm->usecount) > 0)
		_clkdm_add_autodeps(clkdm);
		@@ -872,8 +895,7 @@ void omap2_clkdm_deny_idle(struct clockdomain *clkdm)
		* dependency code and data for OMAP4.
		*/
		if (cpu_is_omap44xx()) {
		WARN_ONCE(1, "clockdomain: OMAP4 wakeup/sleep dependency "
		"support is not yet implemented\n");
		pr_err("clockdomain: %s: OMAP4 wakeup/sleep dependency support: not yet implemented\n", clkdm->name);
		} else {
		if (atomic_read(&clkdm->usecount) > 0)
		_clkdm_del_autodeps(clkdm);

arch/arm/mach-omap2/clockdomains44xx_data.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -30,8 +30,6 @@
		#include "cm1_44xx.h"
		#include "cm2_44xx.h"

		#include "cm1_44xx.h"
		#include "cm2_44xx.h"
		#include "cm-regbits-44xx.h"
		#include "prm44xx.h"
		#include "prcm44xx.h"

arch/arm/mach-omap2/powerdomain2xxx_3xxx.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@
		#include <plat/prcm.h>

		#include "powerdomain.h"
		#include "prm-regbits-34xx.h"
		#include "prm.h"
		#include "prm-regbits-24xx.h"
		#include "prm-regbits-34xx.h"