Merge branch 'for_3.6/cleanup/pm' of... (4348be7a) · Commits · e / devices / android_kernel_sony_msm8994

arch/arm/mach-omap2/Kconfig

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -35,6 +35,7 @@ config ARCH_OMAP3
	select CPU_V7		select CPU_V7
	select USB_ARCH_HAS_EHCI if USB_SUPPORT		select USB_ARCH_HAS_EHCI if USB_SUPPORT
	select ARCH_HAS_OPP		select ARCH_HAS_OPP
			select PM if CPU_IDLE
	select PM_OPP if PM		select PM_OPP if PM
	select ARM_CPU_SUSPEND if PM		select ARM_CPU_SUSPEND if PM
	select MULTI_IRQ_HANDLER		select MULTI_IRQ_HANDLER
	@@ -52,6 +53,7 @@ config ARCH_OMAP4
	select PL310_ERRATA_727915		select PL310_ERRATA_727915
	select ARM_ERRATA_720789		select ARM_ERRATA_720789
	select ARCH_HAS_OPP		select ARCH_HAS_OPP
			select PM if CPU_IDLE
	select PM_OPP if PM		select PM_OPP if PM
	select USB_ARCH_HAS_EHCI if USB_SUPPORT		select USB_ARCH_HAS_EHCI if USB_SUPPORT
	select ARM_CPU_SUSPEND if PM		select ARM_CPU_SUSPEND if PM

+5 −2

Original line number	Original line	Diff line number	Diff line
	@@ -66,9 +66,7 @@ ifeq ($(CONFIG_PM),y)
	obj-$(CONFIG_ARCH_OMAP2) += pm24xx.o		obj-$(CONFIG_ARCH_OMAP2) += pm24xx.o
	obj-$(CONFIG_ARCH_OMAP2) += sleep24xx.o		obj-$(CONFIG_ARCH_OMAP2) += sleep24xx.o
	obj-$(CONFIG_ARCH_OMAP3) += pm34xx.o sleep34xx.o		obj-$(CONFIG_ARCH_OMAP3) += pm34xx.o sleep34xx.o
	obj-$(CONFIG_ARCH_OMAP3) += cpuidle34xx.o
	obj-$(CONFIG_ARCH_OMAP4) += pm44xx.o omap-mpuss-lowpower.o		obj-$(CONFIG_ARCH_OMAP4) += pm44xx.o omap-mpuss-lowpower.o
	obj-$(CONFIG_ARCH_OMAP4) += cpuidle44xx.o
	obj-$(CONFIG_PM_DEBUG) += pm-debug.o		obj-$(CONFIG_PM_DEBUG) += pm-debug.o
	obj-$(CONFIG_OMAP_SMARTREFLEX) += sr_device.o smartreflex.o		obj-$(CONFIG_OMAP_SMARTREFLEX) += sr_device.o smartreflex.o
	obj-$(CONFIG_OMAP_SMARTREFLEX_CLASS3) += smartreflex-class3.o		obj-$(CONFIG_OMAP_SMARTREFLEX_CLASS3) += smartreflex-class3.o
	@@ -82,6 +80,11 @@ endif

	endif		endif

			ifeq ($(CONFIG_CPU_IDLE),y)
			obj-$(CONFIG_ARCH_OMAP3) += cpuidle34xx.o
			obj-$(CONFIG_ARCH_OMAP4) += cpuidle44xx.o
			endif

	# PRCM		# PRCM
	obj-y += prm_common.o		obj-y += prm_common.o
	obj-$(CONFIG_ARCH_OMAP2) += prcm.o cm2xxx_3xxx.o prm2xxx_3xxx.o		obj-$(CONFIG_ARCH_OMAP2) += prcm.o cm2xxx_3xxx.o prm2xxx_3xxx.o

+0 −8

Original line number	Original line	Diff line number	Diff line
	@@ -36,8 +36,6 @@
	#include "control.h"		#include "control.h"
	#include "common.h"		#include "common.h"

	#ifdef CONFIG_CPU_IDLE

	/* Mach specific information to be recorded in the C-state driver_data */		/* Mach specific information to be recorded in the C-state driver_data */
	struct omap3_idle_statedata {		struct omap3_idle_statedata {
	u32 mpu_state;		u32 mpu_state;
	@@ -379,9 +377,3 @@ int __init omap3_idle_init(void)

	return 0;		return 0;
	}		}
	#else
	int __init omap3_idle_init(void)
	{
	return 0;
	}
	#endif /* CONFIG_CPU_IDLE */

+0 −8

Original line number	Original line	Diff line number	Diff line
	@@ -22,8 +22,6 @@
	#include "pm.h"		#include "pm.h"
	#include "prm.h"		#include "prm.h"

	#ifdef CONFIG_CPU_IDLE

	/* Machine specific information */		/* Machine specific information */
	struct omap4_idle_statedata {		struct omap4_idle_statedata {
	u32 cpu_state;		u32 cpu_state;
	@@ -199,9 +197,3 @@ int __init omap4_idle_init(void)

	return 0;		return 0;
	}		}
	#else
	int __init omap4_idle_init(void)
	{
	return 0;
	}
	#endif /* CONFIG_CPU_IDLE */

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -53,7 +53,7 @@ int __init omap_init_opp_table(struct omap_opp_def *opp_def,
	omap_table_init = 1;		omap_table_init = 1;

	/* Lets now register with OPP library */		/* Lets now register with OPP library */
	for (i = 0; i < opp_def_size; i++) {		for (i = 0; i < opp_def_size; i++, opp_def++) {
	struct omap_hwmod *oh;		struct omap_hwmod *oh;
	struct device *dev;		struct device *dev;

	@@ -86,7 +86,6 @@ int __init omap_init_opp_table(struct omap_opp_def *opp_def,
	__func__, opp_def->freq,		__func__, opp_def->freq,
	opp_def->hwmod_name, i, r);		opp_def->hwmod_name, i, r);
	}		}
	opp_def++;
	}		}

	return 0;		return 0;