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

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

Merge "msm: move scm-boot header out of mach-msm folder"

parents d8b1f24c 6d9a86fb

arch/arm/mach-msm/msm-pm.c

+1 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <soc/qcom/spm.h>

#include <soc/qcom/pm.h>

#include <soc/qcom/scm.h>

#include <soc/qcom/scm-boot.h>

#include <asm/suspend.h>

#include <asm/cacheflush.h>

#include <asm/outercache.h>
@@ -38,7 +39,6 @@ 
#include <mach/msm_bus.h>

#include <mach/jtag.h>

#include "idle.h"

#include "scm-boot.h"

#include "clock.h"

#include "pm-boot.h"

arch/arm/mach-msm/platsmp.c

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

#include <soc/qcom/spm.h>

#include <soc/qcom/pm.h>

#include <soc/qcom/scm-boot.h>



#include <asm/cacheflush.h>

#include <asm/cputype.h>
@@ -29,7 +30,6 @@ 
#include <mach/msm_iomap.h>



#include "platsmp.h"

#include "scm-boot.h"



#define VDD_SC1_ARRAY_CLAMP_GFS_CTL 0x15A0

#define SCSS_CPU1CORE_RESET 0xD80

arch/arm/mach-msm/pm-boot.c

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 


#include <linux/module.h>

#include <linux/init.h>

#include "scm-boot.h"

#include <soc/qcom/scm-boot.h>

#include "idle.h"

#include "pm-boot.h"

arch/arm/mach-msm/scm-boot.c

+2 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2010, The Linux Foundation. All rights reserved.

/* Copyright (c) 2010, 2014, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -13,8 +13,7 @@ 
#include <linux/module.h>

#include <linux/slab.h>

#include <soc/qcom/scm.h>



#include "scm-boot.h"

#include <soc/qcom/scm-boot.h>



/*

 * Set the cold/warm boot address for one of the CPU cores.