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

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

Merge "msm: pm-boot: move pm-boot driver to a new location"

parents 320a3b4c dd56f2db

arch/arm/mach-msm/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ obj-$(CONFIG_MSM_SCM) += scm-boot.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-y += qdsp6v2/

obj-$(CONFIG_PM) += pm-boot.o

obj-$(CONFIG_MSM_NOPM) += no-pm.o



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

drivers/power/qcom/Makefile

+1 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_MSM_PM)		+= msm-pm.o pm-data.o

obj-$(CONFIG_MSM_IDLE_STATS)	+= pm-stats.o

obj-$(CONFIG_PM)		+= pm-boot.o

arch/arm/mach-msm/idle.h→drivers/power/qcom/idle.h

+0 −0

File moved.

View file

drivers/power/qcom/msm-pm.c

+2 −2
Original line number Diff line number Diff line
@@ -39,9 +39,9 @@ 
#endif

#include <mach/msm_bus.h>

#include <soc/qcom/jtag.h>

#include "../../../arch/arm/mach-msm/idle.h"

#include "idle.h"

#include "pm-boot.h"

#include "../../../arch/arm/mach-msm/clock.h"

#include "../../../arch/arm/mach-msm/pm-boot.h"



#define CREATE_TRACE_POINTS

#include <trace/events/trace_msm_low_power.h>

arch/arm/mach-msm/pm-boot.c→drivers/power/qcom/pm-boot.c

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ static int msm_pm_tz_boot_init(void) 
static void msm_pm_write_boot_vector(unsigned int cpu, unsigned long address)

{

	msm_pm_boot_vector[cpu] = address;



	dmac_clean_range((void *)&msm_pm_boot_vector[cpu],

			(void *)(&msm_pm_boot_vector[cpu] +

				sizeof(msm_pm_boot_vector[cpu])));