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

Commit 4e042ee2 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 SPM and AVS headers to machine independent directory"

parents ae879e80 bab4a107

arch/arm/mach-msm/avs.c

+3 −3
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.

 * Copyright (c) 2012-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
@@ -14,8 +14,8 @@ 
#include <linux/module.h>

#include <linux/kernel.h>

#include <asm/cputype.h>

#include <mach/avs.h>

#include "spm.h"

#include <soc/qcom/avs.h>

#include <soc/qcom/spm.h>



u32 avs_get_avscsr(void)

{

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

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

#include <mach/rpm-smd.h>

#include <soc/qcom/smem.h>

#include "spm.h"

#include <soc/qcom/spm.h>

#include "board-dt.h"

#include "clock.h"

#include "platsmp.h"

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

+1 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <mach/board.h>

#include <mach/msm_memtypes.h>

#include <soc/qcom/smem.h>

#include <soc/qcom/spm.h>

#include <mach/msm_smd.h>

#include <mach/restart.h>

#include <mach/rpm-smd.h>
@@ -42,7 +43,6 @@ 
#include "board-dt.h"

#include "clock.h"

#include "platsmp.h"

#include "spm.h"

#include "pm.h"



#define MPQ8092_MAC_FUSE_PHYS     0xfc4bc0e0

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

+1 −1
Original line number Diff line number Diff line
@@ -47,10 +47,10 @@ 
#include <mach/rpm-smd.h>

#include <soc/qcom/smem.h>

#include <linux/msm_thermal.h>

#include <soc/qcom/spm.h>

#include "board-dt.h"

#include "clock.h"

#include "platsmp.h"

#include "spm.h"

#include "pm.h"

#include "spm-regulator.h"

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

+1 −1
Original line number Diff line number Diff line
@@ -40,11 +40,11 @@ 
#include <mach/msm_smd.h>

#include <mach/rpm-smd.h>

#include <soc/qcom/smem.h>

#include <soc/qcom/spm.h>

#include <linux/msm_thermal.h>

#include "board-dt.h"

#include "clock.h"

#include "platsmp.h"

#include "spm.h"

#include "pm.h"



static struct of_dev_auxdata msm8610_auxdata_lookup[] __initdata = {