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

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

Merge "msm: scm: Move the scm driver to drivers/soc/qcom"

parents 9fcdc194 1e635c64
Loading
Loading
Loading
Loading
+1 −3
Original line number Diff line number Diff line
CFLAGS_scm.o :=$(call as-instr,.arch_extension sec,-DREQUIRES_SEC=1)

obj-y += io.o dma.o memory.o
ifndef CONFIG_ARM_ARCH_TIMER
obj-y += timer.o
@@ -26,7 +24,7 @@ obj-$(CONFIG_MSM_JTAG_MM) += jtag-fuse.o jtag-mm.o
obj-$(CONFIG_MSM_SMD) += smd.o smd_debug.o smd_private.o smd_init_dt.o smsm_debug.o
obj-$(CONFIG_MSM_SMP2P) += smp2p.o smp2p_debug.o smp2p_gpio.o
obj-$(CONFIG_MSM_SMP2P_TEST) += smp2p_loopback.o smp2p_test.o smp2p_gpio_test.o smp2p_spinlock_test.o
obj-$(CONFIG_MSM_SCM) += scm.o scm-boot.o
obj-$(CONFIG_MSM_SCM) += scm-boot.o
obj-$(CONFIG_MSM_XPU_ERR_FATAL) += scm-xpu.o
obj-$(CONFIG_MSM_PIL) += peripheral-loader.o
obj-$(CONFIG_MSM_PIL_SSR_GENERIC) += subsys-pil-tz.o
+1 −1
Original line number Diff line number Diff line
@@ -13,9 +13,9 @@
#include <linux/kernel.h>
#include <linux/of.h>
#include <linux/of_fdt.h>
#include <soc/qcom/scm.h>
#include <asm/mach/map.h>
#include <mach/msm_iomap.h>
#include <mach/scm.h>

#include "board-dt.h"

+1 −1
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@
#include <linux/regulator/driver.h>
#include <linux/regulator/of_regulator.h>
#include <linux/regulator/cpr-regulator.h>
#include <soc/qcom/scm.h>
#include <asm/uaccess.h>
#include <mach/scm.h>

/* Register Offsets for RB-CPR and Bit Definitions */

+1 −1
Original line number Diff line number Diff line
@@ -12,8 +12,8 @@
 */

#include <linux/kernel.h>
#include <soc/qcom/scm.h>

#include <mach/scm.h>

#include <asm/io.h>
#include <asm/cacheflush.h>
+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@
#include <linux/io.h>
#include <linux/platform_device.h>
#include <linux/bitops.h>
#include <mach/scm.h>
#include <soc/qcom/scm.h>
#include <mach/jtag.h>

/* Coresight management registers */
Loading