aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-omap2/pm.c2
-rw-r--r--arch/arm/mach-omap2/pm.h2
-rw-r--r--arch/arm/mach-omap2/vc.c2
3 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
index 109a02e02d72..ef668c756db7 100644
--- a/arch/arm/mach-omap2/pm.c
+++ b/arch/arm/mach-omap2/pm.c
@@ -39,6 +39,7 @@ static struct omap_device_pm_latency *pm_lats;
39 */ 39 */
40int (*omap_pm_suspend)(void); 40int (*omap_pm_suspend)(void);
41 41
42#ifdef CONFIG_PM
42/** 43/**
43 * struct omap2_oscillator - Describe the board main oscillator latencies 44 * struct omap2_oscillator - Describe the board main oscillator latencies
44 * @startup_time: oscillator startup latency 45 * @startup_time: oscillator startup latency
@@ -68,6 +69,7 @@ void omap_pm_get_oscillator(u32 *tstart, u32 *tshut)
68 *tstart = oscillator.startup_time; 69 *tstart = oscillator.startup_time;
69 *tshut = oscillator.shutdown_time; 70 *tshut = oscillator.shutdown_time;
70} 71}
72#endif
71 73
72static int __init _init_omap_device(char *name) 74static int __init _init_omap_device(char *name)
73{ 75{
diff --git a/arch/arm/mach-omap2/pm.h b/arch/arm/mach-omap2/pm.h
index 4db7b238a0d5..02c291c8e470 100644
--- a/arch/arm/mach-omap2/pm.h
+++ b/arch/arm/mach-omap2/pm.h
@@ -135,7 +135,7 @@ extern void omap_pm_get_oscillator(u32 *tstart, u32 *tshut);
135extern void omap_pm_setup_sr_i2c_pcb_length(u32 mm); 135extern void omap_pm_setup_sr_i2c_pcb_length(u32 mm);
136#else 136#else
137static inline void omap_pm_setup_oscillator(u32 tstart, u32 tshut) { } 137static inline void omap_pm_setup_oscillator(u32 tstart, u32 tshut) { }
138static inline void omap_pm_get_oscillator(u32 *tstart, u32 *tshut) { } 138static inline void omap_pm_get_oscillator(u32 *tstart, u32 *tshut) { *tstart = *tshut = 0; }
139static inline void omap_pm_setup_sr_i2c_pcb_length(u32 mm) { } 139static inline void omap_pm_setup_sr_i2c_pcb_length(u32 mm) { }
140#endif 140#endif
141 141
diff --git a/arch/arm/mach-omap2/vc.c b/arch/arm/mach-omap2/vc.c
index 687aa86c0d5e..a89ec8affed4 100644
--- a/arch/arm/mach-omap2/vc.c
+++ b/arch/arm/mach-omap2/vc.c
@@ -666,6 +666,7 @@ static u8 omap_vc_calc_vsel(struct voltagedomain *voltdm, u32 uvolt)
666 return voltdm->pmic->uv_to_vsel(uvolt); 666 return voltdm->pmic->uv_to_vsel(uvolt);
667} 667}
668 668
669#ifdef CONFIG_PM
669/** 670/**
670 * omap_pm_setup_sr_i2c_pcb_length - set length of SR I2C traces on PCB 671 * omap_pm_setup_sr_i2c_pcb_length - set length of SR I2C traces on PCB
671 * @mm: length of the PCB trace in millimetres 672 * @mm: length of the PCB trace in millimetres
@@ -678,6 +679,7 @@ void __init omap_pm_setup_sr_i2c_pcb_length(u32 mm)
678{ 679{
679 sr_i2c_pcb_length = mm; 680 sr_i2c_pcb_length = mm;
680} 681}
682#endif
681 683
682void __init omap_vc_init_channel(struct voltagedomain *voltdm) 684void __init omap_vc_init_channel(struct voltagedomain *voltdm)
683{ 685{