diff options
Diffstat (limited to 'arch/arm/mach-omap2/vc.c')
-rw-r--r-- | arch/arm/mach-omap2/vc.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/arm/mach-omap2/vc.c b/arch/arm/mach-omap2/vc.c index 031d116fbf10..84da34f9a7cf 100644 --- a/arch/arm/mach-omap2/vc.c +++ b/arch/arm/mach-omap2/vc.c | |||
@@ -10,6 +10,7 @@ | |||
10 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
11 | #include <linux/delay.h> | 11 | #include <linux/delay.h> |
12 | #include <linux/init.h> | 12 | #include <linux/init.h> |
13 | #include <linux/bug.h> | ||
13 | 14 | ||
14 | #include <plat/cpu.h> | 15 | #include <plat/cpu.h> |
15 | 16 | ||
@@ -247,7 +248,7 @@ static void __init omap4_vc_init_channel(struct voltagedomain *voltdm) | |||
247 | * omap_vc_i2c_init - initialize I2C interface to PMIC | 248 | * omap_vc_i2c_init - initialize I2C interface to PMIC |
248 | * @voltdm: voltage domain containing VC data | 249 | * @voltdm: voltage domain containing VC data |
249 | * | 250 | * |
250 | * Use PMIC supplied seetings for I2C high-speed mode and | 251 | * Use PMIC supplied settings for I2C high-speed mode and |
251 | * master code (if set) and program the VC I2C configuration | 252 | * master code (if set) and program the VC I2C configuration |
252 | * register. | 253 | * register. |
253 | * | 254 | * |
@@ -265,8 +266,8 @@ static void __init omap_vc_i2c_init(struct voltagedomain *voltdm) | |||
265 | 266 | ||
266 | if (initialized) { | 267 | if (initialized) { |
267 | if (voltdm->pmic->i2c_high_speed != i2c_high_speed) | 268 | if (voltdm->pmic->i2c_high_speed != i2c_high_speed) |
268 | pr_warn("%s: I2C config for all channels must match.", | 269 | pr_warn("%s: I2C config for vdd_%s does not match other channels (%u).", |
269 | __func__); | 270 | __func__, voltdm->name, i2c_high_speed); |
270 | return; | 271 | return; |
271 | } | 272 | } |
272 | 273 | ||
@@ -292,9 +293,7 @@ void __init omap_vc_init_channel(struct voltagedomain *voltdm) | |||
292 | u32 val; | 293 | u32 val; |
293 | 294 | ||
294 | if (!voltdm->pmic || !voltdm->pmic->uv_to_vsel) { | 295 | if (!voltdm->pmic || !voltdm->pmic->uv_to_vsel) { |
295 | pr_err("%s: PMIC info requried to configure vc for" | 296 | pr_err("%s: No PMIC info for vdd_%s\n", __func__, voltdm->name); |
296 | "vdd_%s not populated.Hence cannot initialize vc\n", | ||
297 | __func__, voltdm->name); | ||
298 | return; | 297 | return; |
299 | } | 298 | } |
300 | 299 | ||