Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 084c9cac authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pm+acpi-3.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull ACPI and power management fixes from Rafael Wysocki:
 "These are a few recent regression fixes, a revert of the ACPI video
  commit I promised, a system resume fix related to request_firmware(),
  an ACPI video quirk for one more Win8-oriented BIOS, an ACPI device
  enumeration documentation update and a few fixes for ARM cpufreq
  drivers.

  Specifics:

   - Fix for a recently introduced NULL pointer dereference in the core
     system suspend code occuring when platforms without ACPI attempt to
     use the "freeze" sleep state from Zhang Rui.

   - Fix for a recently introduced build warning in cpufreq headers from
     Brian W Hart.

   - Fix for a 3.13 cpufreq regression related to sysem resume that
     triggers on some systems with multiple CPU clusters from Viresh
     Kumar.

   - Fix for a 3.4 regression in request_firmware() resulting in
     WARN_ON()s on some systems during system resume from Takashi Iwai.

   - Revert of the ACPI video commit that changed the default value of
     the video.brightness_switch_enabled command line argument to 0 as
     it has been reported to break existing setups.

   - ACPI device enumeration documentation update to take recent code
     changes into account and make the documentation match the code
     again from Darren Hart.

   - Fixes for the sa1110, imx6q, kirkwood, and cpu0 cpufreq drivers
     from Linus Walleij, Nicolas Del Piano, Quentin Armitage, Viresh
     Kumar.

   - New ACPI video blacklist entry for HP ProBook 4540s from Hans de
     Goede"

* tag 'pm+acpi-3.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  cpufreq: make table sentinel macros unsigned to match use
  cpufreq: move policy kobj to policy->cpu at resume
  cpufreq: cpu0: OPPs can be populated at runtime
  cpufreq: kirkwood: Reinstate cpufreq driver for ARCH_KIRKWOOD
  cpufreq: imx6q: Select PM_OPP
  cpufreq: sa1110: set memory type for h3600
  ACPI / video: Add use_native_backlight quirk for HP ProBook 4540s
  PM / sleep: fix freeze_ops NULL pointer dereferences
  PM / sleep: Fix request_firmware() error at resume
  Revert "ACPI / video: change acpi-video brightness_switch_enabled default to 0"
  ACPI / documentation: Remove reference to acpi_platform_device_ids from enumeration.txt
parents 3e8e2756 39628080

Documentation/acpi/enumeration.txt

+0 −6
Original line number Diff line number Diff line
@@ -60,12 +60,6 @@ If the driver needs to perform more complex initialization like getting and 
configuring GPIOs it can get its ACPI handle and extract this information

from ACPI tables.



Currently the kernel is not able to automatically determine from which ACPI

device it should make the corresponding platform device so we need to add

the ACPI device explicitly to acpi_platform_device_ids list defined in

drivers/acpi/acpi_platform.c. This limitation is only for the platform

devices, SPI and I2C devices are created automatically as described below.



DMA support

~~~~~~~~~~~

DMA controllers enumerated via ACPI should be registered in the system to

Documentation/devicetree/bindings/cpufreq/cpufreq-cpu0.txt

+4 −2
Original line number Diff line number Diff line
@@ -8,10 +8,12 @@ Both required and optional properties listed below must be defined 
under node /cpus/cpu@0.



Required properties:

- operating-points: Refer to Documentation/devicetree/bindings/power/opp.txt

  for details

- None



Optional properties:

- operating-points: Refer to Documentation/devicetree/bindings/power/opp.txt for

  details. OPPs *must* be supplied either via DT, i.e. this property, or

  populated at runtime.

- clock-latency: Specify the possible maximum transition latency for clock,

  in unit of nanoseconds.

- voltage-tolerance: Specify the CPU voltage tolerance in percentage.

Documentation/kernel-parameters.txt

+1 −1
Original line number Diff line number Diff line
@@ -3526,7 +3526,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			the allocated input device; If set to 0, video driver

			will only send out the event without touching backlight

			brightness level.

			default: 0

			default: 1



	virtio_mmio.device=

			[VMMIO] Memory mapped virtio (platform) device.

drivers/acpi/video.c

+9 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ MODULE_AUTHOR("Bruno Ducrot"); 
MODULE_DESCRIPTION("ACPI Video Driver");

MODULE_LICENSE("GPL");



static bool brightness_switch_enabled;

static bool brightness_switch_enabled = 1;

module_param(brightness_switch_enabled, bool, 0644);



/*
@@ -581,6 +581,14 @@ static struct dmi_system_id video_dmi_table[] __initdata = { 
	},

	{

	.callback = video_set_use_native_backlight,

	.ident = "HP ProBook 4540s",

	.matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),

		DMI_MATCH(DMI_PRODUCT_VERSION, "HP ProBook 4540s"),

		},

	},

	{

	.callback = video_set_use_native_backlight,

	.ident = "HP ProBook 2013 models",

	.matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),

drivers/cpufreq/Kconfig.arm

+2 −1
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ config ARM_IMX6Q_CPUFREQ 
	tristate "Freescale i.MX6 cpufreq support"

	depends on ARCH_MXC

	depends on REGULATOR_ANATOP

	select PM_OPP

	help

	  This adds cpufreq driver support for Freescale i.MX6 series SoCs.
@@ -118,7 +119,7 @@ config ARM_INTEGRATOR 
	  If in doubt, say Y.



config ARM_KIRKWOOD_CPUFREQ

	def_bool MACH_KIRKWOOD

	def_bool ARCH_KIRKWOOD || MACH_KIRKWOOD

	help

	  This adds the CPUFreq driver for Marvell Kirkwood

	  SoCs.