Commit graph android_kernel_sony_sdm845/include/linux/devfreq_cooling.h
Message SHA1
Merge branch 'android-4.9-q' of https://android.googlesource.com/kernel/common into HEAD
* 'android-4.9-q' of https://android.googlesource.com/kernel/common: (670 commits)

Conflicts:
	drivers/char/random.c
	drivers/clk/qcom/clk-rcg2.c
	drivers/gpu/drm/msm/msm_gem.c
	drivers/net/phy/micrel.c
	drivers/of/base.c
	drivers/scsi/ufs/ufshcd.c
	drivers/usb/dwc3/gadget.c
	drivers/usb/gadget/function/f_fs.c
	drivers/usb/gadget/function/f_uac2.c
	include/uapi/linux/coresight-stm.h
	net/socket.c
	sound/core/rawmidi.c
	sound/usb/mixer.c

Change-Id: I7e840687c52e36350d4310dbb5bcace1d53ebf24

Michael Bestas   commited 2020-06-30 02:33:58 +03:00
997774b320
thermal: devfreq_cooling: inline all stubs for CONFIG_DEVFREQ_THERMAL=n
commit 3f5b9959041e0db6dacbea80bb833bff5900999f upstream.

When CONFIG_DEVFREQ_THERMAL is disabled all functions except
of_devfreq_cooling_register_power() were already inlined. Also inline
the last function to avoid compile errors when multiple drivers call
of_devfreq_cooling_register_power() when CONFIG_DEVFREQ_THERMAL is not
set. Compilation failed with the following message:
  multiple definition of `of_devfreq_cooling_register_power'
(which then lists all usages of of_devfreq_cooling_register_power())

Thomas Zimmermann reported this problem [0] on a kernel config with
CONFIG_DRM_LIMA={m,y}, CONFIG_DRM_PANFROST={m,y} and
CONFIG_DEVFREQ_THERMAL=n after both, the lima and panfrost drivers
gained devfreq cooling support.

[0] https://www.spinics.net/lists/dri-devel/msg252825.html

Fixes: a76caf55e5 ("thermal: Add devfreq cooling")
Cc: stable@vger.kernel.org
Reported-by: Thomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Tested-by: Thomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20200403205133.1101808-1-martin.blumenstingl@googlemail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Martin Blumenstingl   authored and   Greg Kroah-Hartman   commited 2020-04-24 07:58:53 +02:00
acca1bdda6
drivers: devfreq: Define devfreq_cooling_power outside of defconfig
The struct devfreq_cooling_power is defined only if the devfreq
driver's kernel config flag is defined. Drivers using the devfreq
cooling device APIs without having the devfreq kconfig flag enabled will
have compilation errors because the struct devfreq_cooling_power will
not be defined.

To avoid this, define the struct devfreq_cooling_power and make it
available even when devfreq kernel config flag is not enabled.

Change-Id: I39973c0bbd3f760dc9ce557e8f7308df7b564fad
Signed-off-by: Ram Chandrasekar <rkumbako@codeaurora.org>

Ram Chandrasekar   commited 2017-03-30 17:22:00 -06:00
5f7c0080f4
thermal: devfreq_cooling: use a thermal_cooling_device for register and unregister
Be consistent with what other cooling devices do and return a struct
thermal_cooling_device * on register.  Also, for the unregister, accept
a struct thermal_cooling_device * as parameter.

Cc: Zhang Rui <rui.zhang@intel.com>
Cc: Eduardo Valentin <edubezval@gmail.com>
Signed-off-by: Javi Merino <javi.merino@arm.com>
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>

Javi Merino   authored and   Eduardo Valentin   commited 2015-11-02 13:14:44 -08:00
3c99c2cef7
thermal: Add devfreq cooling
Add a generic thermal cooling device for devfreq, that is similar to
cpu_cooling.

The device must use devfreq.  In order to use the power extension of the
cooling device, it must have registered its OPPs using the OPP library.

Cc: Zhang Rui <rui.zhang@intel.com>
Cc: Eduardo Valentin <edubezval@gmail.com>
Signed-off-by: Javi Merino <javi.merino@arm.com>
Signed-off-by: Ørjan Eide <orjan.eide@arm.com>
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>

Ørjan Eide   authored and   Eduardo Valentin   commited 2015-10-30 10:21:01 -07:00
a76caf55e5