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

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

Merge "qcom: qmi: Support multi-platform"

parents 702a591c 1f5cbc30

arch/arm/mach-msm/Kconfig

+0 −11
Original line number Diff line number Diff line
@@ -689,17 +689,6 @@ config MSM_SMD_LOGGING 


	  If in doubt, say yes.



config MSM_QMI_INTERFACE

	depends on IPC_ROUTER

	depends on QMI_ENCDEC

	default n

	bool "MSM QMI Interface Library"

	help

	  Library to send and receive QMI messages over IPC Router.

	  This library provides interface functions to the kernel drivers

	  to perform QMI message marshaling and transport them over IPC

	  Router.



config MSM_TEST_QMI_CLIENT

	depends on MSM_QMI_INTERFACE

	bool "MSM TEST QMI CLIENT"

arch/arm/mach-msm/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ obj-$(CONFIG_MSM_PIL_BCSS) += pil-bcss.o 
obj-$(CONFIG_MSM_BAM_DMUX) += bam_dmux.o

obj-$(CONFIG_MSM_SMD_LOGGING) += smem_log.o

obj-y += socinfo.o

obj-$(CONFIG_MSM_QMI_INTERFACE) += msm_qmi_interface.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/kernel_test_service_v01.c

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

/* Copyright (c) 2013-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,7 +13,7 @@ 


#include <linux/qmi_encdec.h>



#include <mach/msm_qmi_interface.h>

#include <soc/qcom/msm_qmi_interface.h>



#include "kernel_test_service_v01.h"

arch/arm/mach-msm/kernel_test_service_v01.h

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

/* Copyright (c) 2013-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,7 +13,7 @@ 
#ifndef MSM_QMI_TEST_SERVICE_V01_H

#define MSM_QMI_TEST_SERVICE_V01_H



#include <mach/msm_qmi_interface.h>

#include <soc/qcom/msm_qmi_interface.h>



#define TEST_MED_DATA_SIZE_V01 8192

#define TEST_MAX_NAME_SIZE_V01 255

arch/arm/mach-msm/test_qmi_client.c

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

/* Copyright (c) 2013-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
@@ -20,7 +20,7 @@ 


#include <asm/uaccess.h>



#include <mach/msm_qmi_interface.h>

#include <soc/qcom/msm_qmi_interface.h>



#include "kernel_test_service_v01.h"