mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
Merge branches 'pm-devfreq' and 'pm-tools'
* pm-devfreq: PM / devfreq: Define the constant governor name PM / devfreq: Remove unneeded conditional statement PM / devfreq: Show the all available frequencies PM / devfreq: Change return type of devfreq_set_freq_table() PM / devfreq: Use the available min/max frequency Revert "PM / devfreq: Add show_one macro to delete the duplicate code" PM / devfreq: Set min/max_freq when adding the devfreq device * pm-tools: tools/power/cpupower: add libcpupower.so.0.0.1 to .gitignore tools/power/cpupower: Add 64 bit library detection MAINTAINERS: add maintainer for tools/power/cpupower cpupower: Fix no-rounding MHz frequency output
This commit is contained in:
commit
990a848d53
13 changed files with 132 additions and 53 deletions
3
tools/power/cpupower/.gitignore
vendored
3
tools/power/cpupower/.gitignore
vendored
|
|
@ -1,7 +1,6 @@
|
|||
.libs
|
||||
libcpupower.so
|
||||
libcpupower.so.0
|
||||
libcpupower.so.0.0.0
|
||||
libcpupower.so.*
|
||||
build/ccdv
|
||||
cpufreq-info
|
||||
cpufreq-set
|
||||
|
|
|
|||
|
|
@ -30,6 +30,8 @@ OUTDIR := $(shell cd $(OUTPUT) && /bin/pwd)
|
|||
$(if $(OUTDIR),, $(error output directory "$(OUTPUT)" does not exist))
|
||||
endif
|
||||
|
||||
include ../../scripts/Makefile.arch
|
||||
|
||||
# --- CONFIGURATION BEGIN ---
|
||||
|
||||
# Set the following to `true' to make a unstripped, unoptimized
|
||||
|
|
@ -79,7 +81,11 @@ bindir ?= /usr/bin
|
|||
sbindir ?= /usr/sbin
|
||||
mandir ?= /usr/man
|
||||
includedir ?= /usr/include
|
||||
ifeq ($(IS_64_BIT), 1)
|
||||
libdir ?= /usr/lib64
|
||||
else
|
||||
libdir ?= /usr/lib
|
||||
endif
|
||||
localedir ?= /usr/share/locale
|
||||
docdir ?= /usr/share/doc/packages/cpupower
|
||||
confdir ?= /etc/
|
||||
|
|
|
|||
|
|
@ -93,8 +93,6 @@ static void print_speed(unsigned long speed)
|
|||
if (speed > 1000000)
|
||||
printf("%u.%06u GHz", ((unsigned int) speed/1000000),
|
||||
((unsigned int) speed%1000000));
|
||||
else if (speed > 100000)
|
||||
printf("%u MHz", (unsigned int) speed);
|
||||
else if (speed > 1000)
|
||||
printf("%u.%03u MHz", ((unsigned int) speed/1000),
|
||||
(unsigned int) (speed%1000));
|
||||
|
|
|
|||
Loading…
Reference in a new issue