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

Commit 74d29168 authored by Kevin Hilman's avatar Kevin Hilman Committed by Tony Lindgren
Browse files

ARM: OMAP2+: voltage: fixup oscillator handling when CONFIG_PM=n 



commit 908b75e8 (ARM: OMAP: add support for oscillator setup) added a new
API for oscillator setup, but is broken when CONFIG_PM=n.

The new functions have dummy definitions when CONFIG_PM=n, but also have
full implementations available, which conflict.

To fix, wrap the PM implmentations in #ifdef CONFIG_PM.

Cc: Tero Kristo <t-kristo@ti.com>
Signed-off-by: default avatarKevin Hilman <khilman@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 6515b0f7

arch/arm/mach-omap2/pm.c

+2 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ static struct omap_device_pm_latency *pm_lats; 
 */

int (*omap_pm_suspend)(void);



#ifdef CONFIG_PM

/**

 * struct omap2_oscillator - Describe the board main oscillator latencies

 * @startup_time: oscillator startup latency
@@ -68,6 +69,7 @@ void omap_pm_get_oscillator(u32 *tstart, u32 *tshut) 
	*tstart = oscillator.startup_time;

	*tshut = oscillator.shutdown_time;

}

#endif



static int __init _init_omap_device(char *name)

{

arch/arm/mach-omap2/pm.h

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ extern void omap_pm_get_oscillator(u32 *tstart, u32 *tshut); 
extern void omap_pm_setup_sr_i2c_pcb_length(u32 mm);

#else

static inline void omap_pm_setup_oscillator(u32 tstart, u32 tshut) { }

static inline void omap_pm_get_oscillator(u32 *tstart, u32 *tshut) { }

static inline void omap_pm_get_oscillator(u32 *tstart, u32 *tshut) { *tstart = *tshut = 0; }

static inline void omap_pm_setup_sr_i2c_pcb_length(u32 mm) { }

#endif

arch/arm/mach-omap2/vc.c

+2 −0
Original line number Diff line number Diff line
@@ -666,6 +666,7 @@ static u8 omap_vc_calc_vsel(struct voltagedomain *voltdm, u32 uvolt) 
	return voltdm->pmic->uv_to_vsel(uvolt);

}



#ifdef CONFIG_PM

/**

 * omap_pm_setup_sr_i2c_pcb_length - set length of SR I2C traces on PCB

 * @mm: length of the PCB trace in millimetres
@@ -678,6 +679,7 @@ void __init omap_pm_setup_sr_i2c_pcb_length(u32 mm) 
{

	sr_i2c_pcb_length = mm;

}

#endif



void __init omap_vc_init_channel(struct voltagedomain *voltdm)

{