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

Commit ae0d78d8 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 PM header to machine independent location"

parents 4e042ee2 edeb731d

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

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

#include <soc/qcom/smem.h>

#include <soc/qcom/spm.h>

#include <soc/qcom/pm.h>

#include "board-dt.h"

#include "clock.h"

#include "platsmp.h"

#include "pm.h"



static struct of_dev_auxdata apq8084_auxdata_lookup[] __initdata = {

	OF_DEV_AUXDATA("qcom,msm-sdcc", 0xF9824000, "msm_sdcc.1", NULL),

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

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

#include <soc/qcom/smem.h>

#include <soc/qcom/spm.h>

#include <soc/qcom/pm.h>

#include <mach/msm_smd.h>

#include <mach/restart.h>

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

#include "clock.h"

#include "platsmp.h"

#include "pm.h"



#define MPQ8092_MAC_FUSE_PHYS     0xfc4bc0e0

#define MPQ8092_MAC_FUSE_SIZE     0x10

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

+1 −1
Original line number Diff line number Diff line
@@ -48,10 +48,10 @@ 
#include <soc/qcom/smem.h>

#include <linux/msm_thermal.h>

#include <soc/qcom/spm.h>

#include <soc/qcom/pm.h>

#include "board-dt.h"

#include "clock.h"

#include "platsmp.h"

#include "pm.h"

#include "spm-regulator.h"



static struct of_dev_auxdata msm_hsic_host_adata[] = {

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

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

#include <soc/qcom/smem.h>

#include <soc/qcom/spm.h>

#include <soc/qcom/pm.h>

#include <linux/msm_thermal.h>

#include "board-dt.h"

#include "clock.h"

#include "platsmp.h"

#include "pm.h"



static struct of_dev_auxdata msm8610_auxdata_lookup[] __initdata = {

	OF_DEV_AUXDATA("qcom,msm-sdcc", 0xF9824000, \

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

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

#include <soc/qcom/smem.h>

#include <soc/qcom/spm.h>



#include <soc/qcom/pm.h>

#include "board-dt.h"

#include "platsmp.h"

#include "pm.h"



static void __init msm8916_early_memory(void)

{