diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-01-11 19:08:47 -0500 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-01-11 19:08:47 -0500 |
| commit | 1e3f28a552c7acf6dd8acfe505beb4990e8cbd55 (patch) | |
| tree | c501d538faa010b2a503ab79aba104bf12e76a12 /drivers/powercap | |
| parent | 989652871b06f1fb173bc5e8e2ea03bec8f8eeeb (diff) | |
| parent | d35818a9153e7f230fd65dc935e001a1b9bc08ff (diff) | |
Merge branch 'acpi-soc'
* acpi-soc:
PM / clk: don't leave clocks enabled when driver not bound
i2c: dw: Add APM X-Gene ACPI I2C device support
ACPI / APD: Add APM X-Gene ACPI I2C device support
ACPI / LPSS: change 'does not have' to 'has' in comment
Revert "dmaengine: dw: platform: provide platform data for Intel"
dmaengine: dw: return immediately from IRQ when DMA isn't in use
dmaengine: dw: platform: power on device on shutdown
ACPI / LPSS: override power state for LPSS DMA device
ACPI / LPSS: power on when probe() and otherwise when remove()
ACPI / LPSS: do delay for all LPSS devices when D3->D0
ACPI / LPSS: allow to use specific PM domain during ->probe()
Revert "ACPI / LPSS: allow to use specific PM domain during ->probe()"
device core: add BUS_NOTIFY_DRIVER_NOT_BOUND notification
x86/platform/iosf_mbi: Remove duplicate definitions
Conflicts:
drivers/i2c/busses/i2c-designware-platdrv.c
Diffstat (limited to 'drivers/powercap')
| -rw-r--r-- | drivers/powercap/intel_rapl.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/powercap/intel_rapl.c b/drivers/powercap/intel_rapl.c index 48747c28a43d..4099159ffa3d 100644 --- a/drivers/powercap/intel_rapl.c +++ b/drivers/powercap/intel_rapl.c | |||
| @@ -988,16 +988,16 @@ static void set_floor_freq_atom(struct rapl_domain *rd, bool enable) | |||
| 988 | } | 988 | } |
| 989 | 989 | ||
| 990 | if (!power_ctrl_orig_val) | 990 | if (!power_ctrl_orig_val) |
| 991 | iosf_mbi_read(BT_MBI_UNIT_PMC, BT_MBI_PMC_READ, | 991 | iosf_mbi_read(BT_MBI_UNIT_PMC, MBI_CR_READ, |
| 992 | rapl_defaults->floor_freq_reg_addr, | 992 | rapl_defaults->floor_freq_reg_addr, |
| 993 | &power_ctrl_orig_val); | 993 | &power_ctrl_orig_val); |
| 994 | mdata = power_ctrl_orig_val; | 994 | mdata = power_ctrl_orig_val; |
| 995 | if (enable) { | 995 | if (enable) { |
| 996 | mdata &= ~(0x7f << 8); | 996 | mdata &= ~(0x7f << 8); |
| 997 | mdata |= 1 << 8; | 997 | mdata |= 1 << 8; |
| 998 | } | 998 | } |
| 999 | iosf_mbi_write(BT_MBI_UNIT_PMC, BT_MBI_PMC_WRITE, | 999 | iosf_mbi_write(BT_MBI_UNIT_PMC, MBI_CR_WRITE, |
| 1000 | rapl_defaults->floor_freq_reg_addr, mdata); | 1000 | rapl_defaults->floor_freq_reg_addr, mdata); |
| 1001 | } | 1001 | } |
| 1002 | 1002 | ||
| 1003 | static u64 rapl_compute_time_window_core(struct rapl_package *rp, u64 value, | 1003 | static u64 rapl_compute_time_window_core(struct rapl_package *rp, u64 value, |