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

Commit 920abcd8 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "soc: msm: Move scm-xpu to outside of mach-msm into drivers"

parents d8eb2dfa cbd5a652

arch/arm/mach-msm/Kconfig

+0 −5
Original line number Diff line number Diff line
@@ -959,11 +959,6 @@ config MSM_BOOT_STATS 
	 This figures are reported in mpm sleep clock cycles and have a

	 resolution of 31 bits as 1 bit is used as an overflow check.



config MSM_XPU_ERR_FATAL

	bool "Configure XPU violations as fatal errors"

	help

	 Select if XPU violations have to be configured as fatal errors.



config KRAIT_REGULATOR

	bool "Support Kraits powered via ganged regulators in the pmic"

	help

arch/arm/mach-msm/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ obj-$(CONFIG_DEBUG_FS) += perf_debug.o 
obj-$(CONFIG_SMP) += headsmp.o platsmp.o

obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o



obj-$(CONFIG_MSM_XPU_ERR_FATAL) += scm-xpu.o

obj-$(CONFIG_MSM_TEST_QMI_CLIENT) += kernel_test_service_v01.o test_qmi_client.o



obj-$(CONFIG_MSM_PCIE) += pcie.o pcie_irq.o pcie_phy.o

drivers/soc/qcom/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -441,6 +441,11 @@ config MSM_CPU_PWR_CTL 
	  Provides routines to power on cpu rails and l2 cache

	  controller during coldboot.



config MSM_XPU_ERR_FATAL

	bool "Configure XPU violations as fatal errors"

	help

	 Select if XPU violations have to be configured as fatal errors.



source "drivers/soc/qcom/memshare/Kconfig"



endif # ARCH_MSM

drivers/soc/qcom/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -58,3 +58,4 @@ obj-$(CONFIG_MSM_SYSMON_COMM) += sysmon.o 
obj-$(CONFIG_CP_ACCESS64) += cpaccess64.o

obj-$(CONFIG_MSM_CPU_PWR_CTL) += cpu_pwr_ctl.o

obj-$(CONFIG_MSM8994_V1_PMUIRQ_WA) += cti-pmu-irq.o

obj-$(CONFIG_MSM_XPU_ERR_FATAL) += scm-xpu.o

arch/arm/mach-msm/scm-xpu.c→drivers/soc/qcom/scm-xpu.c

+0 −0

File moved.

View file