diff options
author | Tony Lindgren <tony@atomide.com> | 2012-10-08 18:57:41 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-10-08 18:57:41 -0400 |
commit | fce680e9faaa8acc0ab0a931c5fa823b581cbab0 (patch) | |
tree | c96026ec637128c21c665a733db5594ebebbb5a4 /arch | |
parent | 5e090ed7af10729a396a25df43d69a236e789736 (diff) | |
parent | ce3810cdb4ca31238c87e095d2c494a5eaa4f65d (diff) |
Merge tag 'for_3.7-fixes-pm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-v3.7-rc1/fixes-pm
OMAP PM related fixes for v3.7-rc
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-omap2/board-omap3beagle.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap2/pm.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap2/sr_device.c | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/plat-omap/omap_device.c | 2 |
5 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index 68ff8d51973c..79d4820b291b 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c | |||
@@ -461,7 +461,7 @@ static void __init beagle_opp_init(void) | |||
461 | mpu_dev = omap_device_get_by_hwmod_name("mpu"); | 461 | mpu_dev = omap_device_get_by_hwmod_name("mpu"); |
462 | iva_dev = omap_device_get_by_hwmod_name("iva"); | 462 | iva_dev = omap_device_get_by_hwmod_name("iva"); |
463 | 463 | ||
464 | if (!mpu_dev || !iva_dev) { | 464 | if (IS_ERR(mpu_dev) || IS_ERR(iva_dev)) { |
465 | pr_err("%s: Aiee.. no mpu/dsp devices? %p %p\n", | 465 | pr_err("%s: Aiee.. no mpu/dsp devices? %p %p\n", |
466 | __func__, mpu_dev, iva_dev); | 466 | __func__, mpu_dev, iva_dev); |
467 | return; | 467 | return; |
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c index abefbc4d8e0b..1e40afe7ed3c 100644 --- a/arch/arm/mach-omap2/pm.c +++ b/arch/arm/mach-omap2/pm.c | |||
@@ -177,7 +177,7 @@ static int __init omap2_set_init_voltage(char *vdd_name, char *clk_name, | |||
177 | } | 177 | } |
178 | 178 | ||
179 | voltdm = voltdm_lookup(vdd_name); | 179 | voltdm = voltdm_lookup(vdd_name); |
180 | if (IS_ERR(voltdm)) { | 180 | if (!voltdm) { |
181 | pr_err("%s: unable to get vdd pointer for vdd_%s\n", | 181 | pr_err("%s: unable to get vdd pointer for vdd_%s\n", |
182 | __func__, vdd_name); | 182 | __func__, vdd_name); |
183 | goto exit; | 183 | goto exit; |
diff --git a/arch/arm/mach-omap2/sr_device.c b/arch/arm/mach-omap2/sr_device.c index cbeae56b56a9..f8217a5a4a26 100644 --- a/arch/arm/mach-omap2/sr_device.c +++ b/arch/arm/mach-omap2/sr_device.c | |||
@@ -122,7 +122,7 @@ static int __init sr_dev_init(struct omap_hwmod *oh, void *user) | |||
122 | sr_data->senp_mod = 0x1; | 122 | sr_data->senp_mod = 0x1; |
123 | 123 | ||
124 | sr_data->voltdm = voltdm_lookup(sr_dev_attr->sensor_voltdm_name); | 124 | sr_data->voltdm = voltdm_lookup(sr_dev_attr->sensor_voltdm_name); |
125 | if (IS_ERR(sr_data->voltdm)) { | 125 | if (!sr_data->voltdm) { |
126 | pr_err("%s: Unable to get voltage domain pointer for VDD %s\n", | 126 | pr_err("%s: Unable to get voltage domain pointer for VDD %s\n", |
127 | __func__, sr_dev_attr->sensor_voltdm_name); | 127 | __func__, sr_dev_attr->sensor_voltdm_name); |
128 | goto exit; | 128 | goto exit; |
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig index ca83a7659aef..d30f480ccd12 100644 --- a/arch/arm/plat-omap/Kconfig +++ b/arch/arm/plat-omap/Kconfig | |||
@@ -48,6 +48,7 @@ config OMAP_DEBUG_LEDS | |||
48 | config POWER_AVS_OMAP | 48 | config POWER_AVS_OMAP |
49 | bool "AVS(Adaptive Voltage Scaling) support for OMAP IP versions 1&2" | 49 | bool "AVS(Adaptive Voltage Scaling) support for OMAP IP versions 1&2" |
50 | depends on POWER_AVS && (ARCH_OMAP3 || ARCH_OMAP4) && PM | 50 | depends on POWER_AVS && (ARCH_OMAP3 || ARCH_OMAP4) && PM |
51 | select POWER_SUPPLY | ||
51 | help | 52 | help |
52 | Say Y to enable AVS(Adaptive Voltage Scaling) | 53 | Say Y to enable AVS(Adaptive Voltage Scaling) |
53 | support on OMAP containing the version 1 or | 54 | support on OMAP containing the version 1 or |
diff --git a/arch/arm/plat-omap/omap_device.c b/arch/arm/plat-omap/omap_device.c index cee85a55bd82..7a7d1f2a65e9 100644 --- a/arch/arm/plat-omap/omap_device.c +++ b/arch/arm/plat-omap/omap_device.c | |||
@@ -725,7 +725,7 @@ struct platform_device __init *omap_device_build_ss(const char *pdev_name, int p | |||
725 | dev_set_name(&pdev->dev, "%s", pdev->name); | 725 | dev_set_name(&pdev->dev, "%s", pdev->name); |
726 | 726 | ||
727 | od = omap_device_alloc(pdev, ohs, oh_cnt, pm_lats, pm_lats_cnt); | 727 | od = omap_device_alloc(pdev, ohs, oh_cnt, pm_lats, pm_lats_cnt); |
728 | if (!od) | 728 | if (IS_ERR(od)) |
729 | goto odbs_exit1; | 729 | goto odbs_exit1; |
730 | 730 | ||
731 | ret = platform_device_add_data(pdev, pdata, pdata_len); | 731 | ret = platform_device_add_data(pdev, pdata, pdata_len); |