Commit eff11ba9 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'for_3.2/voltage-cleanup' of... 

Merge branch 'for_3.2/voltage-cleanup' of git://gitorious.org/khilman/linux-omap-pm into omap/voltage
parents 23618f7f 2edc7ba5

arch/arm/mach-omap2/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -89,7 +89,6 @@ obj-$(CONFIG_ARCH_OMAP4) += prcm.o cm2xxx_3xxx.o cminst44xx.o \ 
					   vp44xx_data.o



# OMAP voltage domains

ifeq ($(CONFIG_PM),y)

voltagedomain-common			:= voltage.o vc.o vp.o

obj-$(CONFIG_ARCH_OMAP2)		+= $(voltagedomain-common) \

					   voltagedomains2xxx_data.o
@@ -97,7 +96,6 @@ obj-$(CONFIG_ARCH_OMAP3) += $(voltagedomain-common) \ 
					   voltagedomains3xxx_data.o

obj-$(CONFIG_ARCH_OMAP4)		+= $(voltagedomain-common) \

					   voltagedomains44xx_data.o

endif



# OMAP powerdomain framework

powerdomain-common			+= powerdomain.o powerdomain-common.o

arch/arm/mach-omap2/voltage.h

+0 −14
Original line number Diff line number Diff line
@@ -148,25 +148,11 @@ void omap_voltage_get_volttable(struct voltagedomain *voltdm, 
		struct omap_volt_data **volt_data);

struct omap_volt_data *omap_voltage_get_voltdata(struct voltagedomain *voltdm,

		unsigned long volt);

#ifdef CONFIG_PM

int omap_voltage_register_pmic(struct voltagedomain *voltdm,

			       struct omap_voltdm_pmic *pmic);

void omap_change_voltscale_method(struct voltagedomain *voltdm,

		int voltscale_method);

int omap_voltage_late_init(void);

#else

static inline int omap_voltage_register_pmic(struct voltagedomain *voltdm,

					     struct omap_voltdm_pmic *pmic)

{

	return -EINVAL;

}

static inline  void omap_change_voltscale_method(struct voltagedomain *voltdm,

		int voltscale_method) {}

static inline int omap_voltage_late_init(void)

{

	return -EINVAL;

}

#endif



extern void omap2xxx_voltagedomains_init(void);

extern void omap3xxx_voltagedomains_init(void);