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

Commit 5f441c88 authored by Xiaocheng Li's avatar Xiaocheng Li Committed by Gerrit - the friendly Code Review server
Browse files

msm: socinfo: Support multiplatform 



Upstream prefers existing drivers be converted to support multiplatform
kernels.  This requires drivers to be located in directories that
contain generic functionality instead of specific mach directories.
Move the socinfo driver into drivers/soc/qcom and update the initcall
levels to satisfy dependencies.

Change-Id: If195cd793d84867d371f25136a88f2a7ce239500
Signed-off-by: default avatarXiaocheng Li <lix@codeaurora.org>
Signed-off-by: default avatarAbhimanyu Kapur <abhimany@codeaurora.org>
parent fdc49c46

arch/arm/mach-msm/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ obj-$(CONFIG_MSM_PIL_MSS_QDSP6V5) += pil-q6v5.o pil-msa.o pil-q6v5-mss.o 
obj-$(CONFIG_MSM_PIL_PRONTO) += pil-pronto.o

obj-$(CONFIG_MSM_PIL_FEMTO) += pil-q6v5.o pil-msa.o pil-femto-modem.o

obj-$(CONFIG_MSM_BAM_DMUX) += bam_dmux.o

obj-y += socinfo.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

arch/arm/mach-msm/bam_dmux.c

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

/* Copyright (c) 2011-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
@@ -32,10 +32,11 @@ 
#include <linux/srcu.h>

#include <soc/qcom/subsystem_restart.h>

#include <soc/qcom/subsystem_notif.h>

#include <soc/qcom/socinfo.h>



#include <mach/sps.h>

#include <mach/bam_dmux.h>

#include <mach/msm_smsm.h>

#include <mach/socinfo.h>



#include "bam_dmux_private.h"

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

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include <linux/ioport.h>

#include <mach/board.h>

#include <mach/gpiomux.h>

#include <mach/socinfo.h>

#include <soc/qcom/socinfo.h>



static struct gpiomux_setting ap2mdm_cfg = {

	.func = GPIOMUX_FUNC_GPIO,

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

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

#include <mach/msm_smd.h>

#include <mach/restart.h>

#include <mach/socinfo.h>

#include <soc/qcom/socinfo.h>

#include <mach/rpm-smd.h>

#include <soc/qcom/smem.h>

#include "spm.h"

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

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include <linux/clk/msm-clk-provider.h>

#include <linux/regulator/rpm-smd-regulator.h>

#include <asm/mach/arch.h>

#include <mach/socinfo.h>

#include <soc/qcom/socinfo.h>

#include <mach/board.h>

#include <mach/msm_memtypes.h>

#include <soc/qcom/smem.h>