Commit fce680e9 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge tag 'for_3.7-fixes-pm' of... 

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
parents 5e090ed7 ce3810cd

arch/arm/mach-omap2/board-omap3beagle.c

+1 −1
Original line number Diff line number Diff line
@@ -461,7 +461,7 @@ static void __init beagle_opp_init(void) 
		mpu_dev = omap_device_get_by_hwmod_name("mpu");

		iva_dev = omap_device_get_by_hwmod_name("iva");



		if (!mpu_dev || !iva_dev) {

		if (IS_ERR(mpu_dev) || IS_ERR(iva_dev)) {

			pr_err("%s: Aiee.. no mpu/dsp devices? %p %p\n",

				__func__, mpu_dev, iva_dev);

			return;

arch/arm/mach-omap2/pm.c

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ static int __init omap2_set_init_voltage(char *vdd_name, char *clk_name, 
	}



	voltdm = voltdm_lookup(vdd_name);

	if (IS_ERR(voltdm)) {

	if (!voltdm) {

		pr_err("%s: unable to get vdd pointer for vdd_%s\n",

			__func__, vdd_name);

		goto exit;

arch/arm/mach-omap2/sr_device.c

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ static int __init sr_dev_init(struct omap_hwmod *oh, void *user) 
	sr_data->senp_mod = 0x1;



	sr_data->voltdm = voltdm_lookup(sr_dev_attr->sensor_voltdm_name);

	if (IS_ERR(sr_data->voltdm)) {

	if (!sr_data->voltdm) {

		pr_err("%s: Unable to get voltage domain pointer for VDD %s\n",

			__func__, sr_dev_attr->sensor_voltdm_name);

		goto exit;

arch/arm/plat-omap/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ config OMAP_DEBUG_LEDS 
config POWER_AVS_OMAP

	bool "AVS(Adaptive Voltage Scaling) support for OMAP IP versions 1&2"

	depends on POWER_AVS && (ARCH_OMAP3 || ARCH_OMAP4) && PM

	select POWER_SUPPLY

	help

	  Say Y to enable AVS(Adaptive Voltage Scaling)

	  support on OMAP containing the version 1 or

arch/arm/plat-omap/omap_device.c

+1 −1
Original line number Diff line number Diff line
@@ -725,7 +725,7 @@ struct platform_device __init *omap_device_build_ss(const char *pdev_name, int p 
		dev_set_name(&pdev->dev, "%s", pdev->name);



	od = omap_device_alloc(pdev, ohs, oh_cnt, pm_lats, pm_lats_cnt);

	if (!od)

	if (IS_ERR(od))

		goto odbs_exit1;



	ret = platform_device_add_data(pdev, pdata, pdata_len);