diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-03-17 13:51:39 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-03-17 13:51:39 +0100 |
| commit | 15afee3aeac874ac274d3d8e8783b3ada4125672 (patch) | |
| tree | 4fa5c63100d15ce16cb91e89f5fc5695699978ba /arch | |
| parent | 2ed99e39cb9392312c100d9da591c20641c64d12 (diff) | |
| parent | 2449d33a40553504867f407dd713e9bcf6f9fe24 (diff) | |
| download | linux-stable-15afee3aeac874ac274d3d8e8783b3ada4125672.tar.gz linux-stable-15afee3aeac874ac274d3d8e8783b3ada4125672.tar.bz2 linux-stable-15afee3aeac874ac274d3d8e8783b3ada4125672.zip | |
Merge back earlier 'pm-cpufreq' material.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-spear/spear1310.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-spear/spear1340.c | 1 | ||||
| -rw-r--r-- | arch/arm64/Kconfig | 8 |
3 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mach-spear/spear1310.c b/arch/arm/mach-spear/spear1310.c index 7ad003001ab7..824b12a56a42 100644 --- a/arch/arm/mach-spear/spear1310.c +++ b/arch/arm/mach-spear/spear1310.c @@ -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[] = { diff --git a/arch/arm/mach-spear/spear1340.c b/arch/arm/mach-spear/spear1340.c index 3fb683424729..7b6bff7154e1 100644 --- a/arch/arm/mach-spear/spear1340.c +++ b/arch/arm/mach-spear/spear1340.c @@ -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[] = { diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 27bbcfc7202a..c6e2f5bb1a7b 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -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" |