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

Commit 5a8d2815 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pm-fixes' 

* pm-fixes:
  cpufreq: Revert commit 2f7021a8 to fix CPU hotplug regression
  cpufreq: s3c24xx: fix "depends on ARM_S3C24XX" in Kconfig
  cpufreq: s3c24xx: rename CONFIG_CPU_FREQ_S3C24XX_DEBUGFS
  PM / Sleep: Fix comment typo in pm_wakeup.h
  PM / Sleep: avoid 'autosleep' in shutdown progress
  cpufreq: Revert commit a66b2e to fix suspend/resume regression
parents fc0ad6c7 e8d05276

arch/arm/mach-s3c24xx/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ config S3C24XX_GPIO_EXTRA128 


config S3C24XX_PLL

	bool "Support CPUfreq changing of PLL frequency (EXPERIMENTAL)"

	depends on ARM_S3C24XX

	depends on ARM_S3C24XX_CPUFREQ

	help

	  Compile in support for changing the PLL frequency from the

	  S3C24XX series CPUfreq driver. The PLL takes time to settle

drivers/cpufreq/cpufreq.c

+3 −1
Original line number Diff line number Diff line
@@ -1942,13 +1942,15 @@ static int __cpuinit cpufreq_cpu_callback(struct notifier_block *nfb, 
	if (dev) {

		switch (action) {

		case CPU_ONLINE:

		case CPU_ONLINE_FROZEN:

			cpufreq_add_dev(dev, NULL);

			break;

		case CPU_DOWN_PREPARE:

		case CPU_UP_CANCELED_FROZEN:

		case CPU_DOWN_PREPARE_FROZEN:

			__cpufreq_remove_dev(dev, NULL);

			break;

		case CPU_DOWN_FAILED:

		case CPU_DOWN_FAILED_FROZEN:

			cpufreq_add_dev(dev, NULL);

			break;

		}

drivers/cpufreq/cpufreq_governor.c

+0 −3
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
#include <linux/slab.h>

#include <linux/types.h>

#include <linux/workqueue.h>

#include <linux/cpu.h>



#include "cpufreq_governor.h"
@@ -137,10 +136,8 @@ void gov_queue_work(struct dbs_data *dbs_data, struct cpufreq_policy *policy, 
	if (!all_cpus) {

		__gov_queue_work(smp_processor_id(), dbs_data, delay);

	} else {

		get_online_cpus();

		for_each_cpu(i, policy->cpus)

			__gov_queue_work(i, dbs_data, delay);

		put_online_cpus();

	}

}

EXPORT_SYMBOL_GPL(gov_queue_work);

drivers/cpufreq/cpufreq_stats.c

+2 −4
Original line number Diff line number Diff line
@@ -353,13 +353,11 @@ static int __cpuinit cpufreq_stat_cpu_callback(struct notifier_block *nfb, 
		cpufreq_update_policy(cpu);

		break;

	case CPU_DOWN_PREPARE:

	case CPU_DOWN_PREPARE_FROZEN:

		cpufreq_stats_free_sysfs(cpu);

		break;

	case CPU_DEAD:

		cpufreq_stats_free_table(cpu);

		break;

	case CPU_UP_CANCELED_FROZEN:

		cpufreq_stats_free_sysfs(cpu);

	case CPU_DEAD_FROZEN:

		cpufreq_stats_free_table(cpu);

		break;

	}

drivers/cpufreq/s3c24xx-cpufreq.c

+2 −2
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ static struct clk *clk_hclk; 
static struct clk *clk_pclk;

static struct clk *clk_arm;



#ifdef CONFIG_CPU_FREQ_S3C24XX_DEBUGFS

#ifdef CONFIG_ARM_S3C24XX_CPUFREQ_DEBUGFS

struct s3c_cpufreq_config *s3c_cpufreq_getconfig(void)

{

	return &cpu_cur;
@@ -59,7 +59,7 @@ struct s3c_iotimings *s3c_cpufreq_getiotimings(void) 
{

	return &s3c24xx_iotiming;

}

#endif /* CONFIG_CPU_FREQ_S3C24XX_DEBUGFS */

#endif /* CONFIG_ARM_S3C24XX_CPUFREQ_DEBUGFS */



static void s3c_cpufreq_getcur(struct s3c_cpufreq_config *cfg)

{