From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 15 Feb 2021 17:50:01 +0000 (+0100)
Subject: Merge branches 'powercap' and 'pm-misc'
X-Git-Tag: accepted/tizen/unified/20230118.172025~7760^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a9a939cb34dfffb9f43b988a681d2566ca157b74;p=platform%2Fkernel%2Flinux-rpi.git

Merge branches 'powercap' and 'pm-misc'

* powercap:
  powercap: intel_rapl: Use topology interface in rapl_init_domains()
  powercap: intel_rapl: Use topology interface in rapl_add_package()
  powercap/intel_rapl: add support for AlderLake Mobile
  powercap/drivers/dtpm: Fix size of object being allocated
  powercap/drivers/dtpm: Fix an IS_ERR() vs NULL check
  powercap/drivers/dtpm: Fix some missing unlock bugs
  powercap/drivers/dtpm: Fix a double shift bug
  powercap/drivers/dtpm: Fix __udivdi3 and __aeabi_uldivmod unresolved symbols
  powercap/drivers/dtpm: Add CPU energy model based support
  powercap/drivers/dtpm: Add API for dynamic thermal power management
  Documentation/powercap/dtpm: Add documentation for dtpm
  units: Add Watt units

* pm-misc:
  PM: Kconfig: remove unneeded "default n" options
  PM: EM: update Kconfig description and drop "default n" option
---

a9a939cb34dfffb9f43b988a681d2566ca157b74
diff --cc include/linux/units.h
index 5c115c8,92c234e,5c115c8..dcc30a5
--- a/include/linux/units.h
+++ b/include/linux/units.h
@@@@ -2,8 -2,12 -2,8 +2,12 @@@@
   #ifndef _LINUX_UNITS_H
   #define _LINUX_UNITS_H
   
 - #include <linux/kernel.h>
 + #include <linux/math.h>
   
+ +#define MILLIWATT_PER_WATT	1000L
+ +#define MICROWATT_PER_MILLIWATT	1000L
+ +#define MICROWATT_PER_WATT	1000000L
+ +
   #define ABSOLUTE_ZERO_MILLICELSIUS -273150
   
   static inline long milli_kelvin_to_millicelsius(long t)