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

Commit f009e46e authored by David Collins's avatar David Collins
Browse files

regulator: move the spm-regulator driver to the drivers/regulator directory 



Move the spm-regulator driver from the arch/arm/mach-msm
directory into the drivers/regulator directory.  Moving this
driver out of the arch/arm/mach-msm directory allows it to be
shared with architectures other than 'arm'.  In particular,
moving it allows it to be used by arm64.

Also move the header file for the spm-regulator driver from the
arch/arm/mach-msm directory into the include/linux/regulator
directory.  Moving the header file requires updating all files
which include it.

Change-Id: I0c5a20a5f3512ef19c9cdb939342224d11667650
Signed-off-by: default avatarDavid Collins <collinsd@codeaurora.org>
parent 1e88a63a

Documentation/devicetree/bindings/arm/msm/spm-regulator.txt→Documentation/devicetree/bindings/regulator/spm-regulator.txt

+1 −1
Original line number Diff line number Diff line 
Qualcomm SPM Regulators

Qualcomm Technologies SPM Regulators



spm-regulator is a regulator device which supports PMIC processor supply

regulators via the SPM module.

arch/arm/configs/msm8916_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ CONFIG_MSM_SMP2P=y 
CONFIG_MSM_SMP2P_TEST=y

CONFIG_MSM_QMI_INTERFACE=y

CONFIG_MEM_SHARE_QMI_SERVICE=y

CONFIG_MSM_SPM_REGULATOR=y

CONFIG_REGULATOR_SPM=y

CONFIG_MSM_SMCMOD=y

CONFIG_MSM_SUBSYSTEM_RESTART=y

CONFIG_MSM_PIL=y

arch/arm/mach-msm/Kconfig

+3 −13
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ config ARCH_MSM8610 
	select ARM_HAS_SG_CHAIN

	select REGULATOR

	select REGULATOR_RPM_SMD

	select MSM_SPM_REGULATOR

	select REGULATOR_SPM

	select MSM_JTAG_MM if CORESIGHT_ETM

	select MSM_CPR_REGULATOR

	select MSM_RPM_LOG
@@ -262,7 +262,7 @@ config ARCH_MSM8226 
	select ARM_HAS_SG_CHAIN

	select REGULATOR

	select REGULATOR_RPM_SMD

	select MSM_SPM_REGULATOR

	select REGULATOR_SPM

	select MSM_JTAG_MM if CORESIGHT_ETM

	select MSM_CPR_REGULATOR

	select MSM_RPM_LOG
@@ -294,7 +294,7 @@ config ARCH_MSMSAMARIUM 
	select MSM_RPM_SMD

	select REGULATOR

	select REGULATOR_RPM_SMD

	select MSM_SPM_REGULATOR

	select REGULATOR_SPM

	select ARM_HAS_SG_CHAIN

	select MSM_RUN_QUEUE_STATS

	select ARCH_WANT_KMAP_ATOMIC_FLUSH
@@ -806,16 +806,6 @@ config MSM_IDLE_WAIT_ON_MODEM 
	  for idle power collapse, wait the number of microseconds in case

	  Modem becomes ready soon.



config MSM_SPM_REGULATOR

	bool "SPM regulator driver"

	depends on REGULATOR && SPMI && OF_SPMI

	help

	  Enable support for the SPM regulator driver which is used for

	  setting voltages of processor supply regulators via the SPM module

	  found inside of the MSM chips.  The SPM regulator driver can be used

	  on MSM systems where the APSS processor cores are supplied by their

	  own PMIC regulator.



config MSM_SMCMOD

	tristate "Secure Monitor Call (SMC) Module"

	default n

arch/arm/mach-msm/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ obj-$(CONFIG_SURF_FFA_GPIO_KEYPAD) += keypad-surf-ffa.o 


obj-$(CONFIG_MSM_BOOT_STATS) += boot_stats.o



obj-$(CONFIG_MSM_SPM_REGULATOR) += spm-regulator.o



obj-$(CONFIG_ARCH_FSM9900) += board-fsm9900.o board-fsm9900-gpiomux.o

obj-$(CONFIG_ARCH_FSM9900) += clock-fsm9900.o

obj-$(CONFIG_ARCH_FSM9900) += rfic-fsm9900.o bbif-fsm9900.o

arch/arm/mach-msm/board-8226.c

+1 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <linux/regulator/onsemi-ncp6335d.h>

#include <linux/regulator/qpnp-regulator.h>

#include <linux/regulator/rpm-smd-regulator.h>

#include <linux/regulator/spm-regulator.h>

#include <linux/clk/msm-clk-provider.h>

#include <asm/mach/map.h>

#include <asm/mach/arch.h>
@@ -50,7 +51,6 @@ 
#include "board-dt.h"

#include "clock.h"

#include "platsmp.h"

#include "spm-regulator.h"



static struct of_dev_auxdata msm_hsic_host_adata[] = {

	OF_DEV_AUXDATA("qcom,hsic-host", 0xF9A00000, "msm_hsic_host", NULL),