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

Commit 15afee3a authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge back earlier 'pm-cpufreq' material.

parents 2ed99e39 2449d33a

arch/arm/mach-spear/spear1310.c

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
static void __init spear1310_dt_init(void)

{

	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);

	platform_device_register_simple("spear-cpufreq", -1, NULL, 0);

}



static const char * const spear1310_dt_board_compat[] = {

arch/arm/mach-spear/spear1340.c

+1 −0
Original line number Diff line number Diff line
@@ -143,6 +143,7 @@ static void __init spear1340_dt_init(void) 
{

	of_platform_populate(NULL, of_default_bus_match_table,

			spear1340_auxdata_lookup, NULL);

	platform_device_register_simple("spear-cpufreq", -1, NULL, 0);

}



static const char * const spear1340_dt_board_compat[] = {

arch/arm64/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -303,6 +303,14 @@ source "drivers/cpuidle/Kconfig" 


endmenu



menu "Power management options"



source "kernel/power/Kconfig"



source "drivers/cpufreq/Kconfig"



endmenu



source "net/Kconfig"



source "drivers/Kconfig"

drivers/base/power/main.c

+5 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <linux/async.h>

#include <linux/suspend.h>

#include <trace/events/power.h>

#include <linux/cpufreq.h>

#include <linux/cpuidle.h>

#include <linux/timer.h>
@@ -789,6 +790,8 @@ void dpm_resume(pm_message_t state) 
	mutex_unlock(&dpm_list_mtx);

	async_synchronize_full();

	dpm_show_time(starttime, state, NULL);



	cpufreq_resume();

}



/**
@@ -1259,6 +1262,8 @@ int dpm_suspend(pm_message_t state) 


	might_sleep();



	cpufreq_suspend();



	mutex_lock(&dpm_list_mtx);

	pm_transition = state;

	async_error = 0;

drivers/cpufreq/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ source "drivers/cpufreq/Kconfig.x86" 
endmenu



menu "ARM CPU frequency scaling drivers"

depends on ARM

depends on ARM || ARM64

source "drivers/cpufreq/Kconfig.arm"

endmenu