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

Commit 7672b969 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'pm-opp' and 'pm-general' 

* pm-opp:
  PM / OPP: Remove ARCH_HAS_OPP

* pm-general:
  MAINTAINERS: power_supply: update maintainership
parents bb1c095f 78c5e0bb ad8464a2

Documentation/power/opp.txt

+0 −3
Original line number Diff line number Diff line
@@ -51,9 +51,6 @@ Typical usage of the OPP library is as follows: 
SoC framework	-> modifies on required cases certain OPPs	-> OPP layer

		-> queries to search/retrieve information	->



Architectures that provide a SoC framework for OPP should select ARCH_HAS_OPP

to make the OPP layer available.



OPP layer expects each domain to be represented by a unique device pointer. SoC

framework registers a set of initial OPPs per device with the OPP layer. This

list is expected to be an optimally small number typically around 5 per device.

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -7032,8 +7032,10 @@ F: include/linux/timer* 
F:	kernel/*timer*



POWER SUPPLY CLASS/SUBSYSTEM and DRIVERS

M:	Sebastian Reichel <sre@kernel.org>

M:	Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>

M:	David Woodhouse <dwmw2@infradead.org>

L:	linux-pm@vger.kernel.org

T:	git git://git.infradead.org/battery-2.6.git

S:	Maintained

F:	include/linux/power_supply.h

arch/arm/mach-exynos/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -100,7 +100,6 @@ config SOC_EXYNOS5440 
	default y

	depends on ARCH_EXYNOS5

	select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE

	select ARCH_HAS_OPP

	select HAVE_ARM_ARCH_TIMER

	select AUTO_ZRELADDR

	select MIGHT_HAVE_PCI

arch/arm/mach-highbank/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ config ARCH_HIGHBANK 
	bool "Calxeda ECX-1000/2000 (Highbank/Midway)" if ARCH_MULTI_V7

	select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE

	select ARCH_HAS_HOLES_MEMORYMODEL

	select ARCH_HAS_OPP

	select ARCH_SUPPORTS_BIG_ENDIAN

	select ARM_AMBA

	select ARM_ERRATA_764369 if SMP

arch/arm/mach-imx/Kconfig

+0 −1
Original line number Diff line number Diff line 
menuconfig ARCH_MXC

	bool "Freescale i.MX family" if ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7

	select ARCH_HAS_OPP

	select ARCH_REQUIRE_GPIOLIB

	select ARM_CPU_SUSPEND if PM

	select CLKSRC_MMIO