Commit 1413c361 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pm-5.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull power management fixes from Rafael Wysocki:
 "Fix compile test of the Tegra devfreq driver (Arnd Bergmann) and
  remove redundant Kconfig dependencies from multiple devfreq drivers
  (Leonard Crestez)"

* tag 'pm-5.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PM / devfreq: tegra: Add COMMON_CLK dependency
  PM / devfreq: Drop explicit selection of PM_OPP
parents 534121d2 2cb7bfc1

drivers/devfreq/Kconfig

+1 −4
Original line number Original line Diff line number Diff line
@@ -83,7 +83,6 @@ config ARM_EXYNOS_BUS_DEVFREQ 
	select DEVFREQ_GOV_PASSIVE

	select DEVFREQ_GOV_PASSIVE

	select DEVFREQ_EVENT_EXYNOS_PPMU

	select DEVFREQ_EVENT_EXYNOS_PPMU

	select PM_DEVFREQ_EVENT

	select PM_DEVFREQ_EVENT

	select PM_OPP

	help

	help

	  This adds the common DEVFREQ driver for Exynos Memory bus. Exynos

	  This adds the common DEVFREQ driver for Exynos Memory bus. Exynos

	  Memory bus has one more group of memory bus (e.g, MIF and INT block).

	  Memory bus has one more group of memory bus (e.g, MIF and INT block).
@@ -98,7 +97,7 @@ config ARM_TEGRA_DEVFREQ 
		ARCH_TEGRA_132_SOC || ARCH_TEGRA_124_SOC || \

		ARCH_TEGRA_132_SOC || ARCH_TEGRA_124_SOC || \

		ARCH_TEGRA_210_SOC || \

		ARCH_TEGRA_210_SOC || \

		COMPILE_TEST

		COMPILE_TEST

	select PM_OPP

	depends on COMMON_CLK

	help

	help

	  This adds the DEVFREQ driver for the Tegra family of SoCs.

	  This adds the DEVFREQ driver for the Tegra family of SoCs.

	  It reads ACTMON counters of memory controllers and adjusts the

	  It reads ACTMON counters of memory controllers and adjusts the
@@ -109,7 +108,6 @@ config ARM_TEGRA20_DEVFREQ 
	depends on (TEGRA_MC && TEGRA20_EMC) || COMPILE_TEST

	depends on (TEGRA_MC && TEGRA20_EMC) || COMPILE_TEST

	depends on COMMON_CLK

	depends on COMMON_CLK

	select DEVFREQ_GOV_SIMPLE_ONDEMAND

	select DEVFREQ_GOV_SIMPLE_ONDEMAND

	select PM_OPP

	help

	help

	  This adds the DEVFREQ driver for the Tegra20 family of SoCs.

	  This adds the DEVFREQ driver for the Tegra20 family of SoCs.

	  It reads Memory Controller counters and adjusts the operating

	  It reads Memory Controller counters and adjusts the operating
@@ -121,7 +119,6 @@ config ARM_RK3399_DMC_DEVFREQ 
	select DEVFREQ_EVENT_ROCKCHIP_DFI

	select DEVFREQ_EVENT_ROCKCHIP_DFI

	select DEVFREQ_GOV_SIMPLE_ONDEMAND

	select DEVFREQ_GOV_SIMPLE_ONDEMAND

	select PM_DEVFREQ_EVENT

	select PM_DEVFREQ_EVENT

	select PM_OPP

	help

	help

          This adds the DEVFREQ driver for the RK3399 DMC(Dynamic Memory Controller).

          This adds the DEVFREQ driver for the RK3399 DMC(Dynamic Memory Controller).

          It sets the frequency for the memory controller and reads the usage counts

          It sets the frequency for the memory controller and reads the usage counts