Merge "techpack: ipa: Fix include path" (8bb9e5aa) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/platform/msm/Makefile

+19 −0

Original line number	Original line	Diff line number	Diff line
	@@ -26,5 +26,24 @@ include $(srctree)/techpack/dataipa/config/dataipa_GKI.conf
	endif		endif
	endif		endif

			DATAIPADRVTOP = $(srctree)/techpack/dataipa/drivers/platform/msm

			ifneq (,$(filter $(CONFIG_IPA3),y m))
			LINUXINCLUDE += -I$(DATAIPADRVTOP)/gsi
			LINUXINCLUDE += -I$(DATAIPADRVTOP)/ipa
			LINUXINCLUDE += -I$(DATAIPADRVTOP)/ipa/ipa_v3
			LINUXINCLUDE += -I$(DATAIPADRVTOP)/ipa/ipa_v3/ipahal
			LINUXINCLUDE += -I$(DATAIPADRVTOP)/ipa/ipa_clients
			endif

			ifneq (,$(filter $(CONFIG_IPA3_REGDUMP),y m))
			LINUXINCLUDE += -I$(DATAIPADRVTOP)/ipa/ipa_v3/dump
			endif

			ifneq (,$(filter $(CONFIG_IPA3_REGDUMP_IPA_4_5),y m))
			LINUXINCLUDE += -I$(DATAIPADRVTOP)/ipa/ipa_v3/dump/ipa4.5
			endif


	obj-$(CONFIG_GSI) += gsi/		obj-$(CONFIG_GSI) += gsi/
	obj-$(CONFIG_IPA3) += ipa/		obj-$(CONFIG_IPA3) += ipa/

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -49,8 +49,3 @@ obj-$(CONFIG_IPA3) += ipam.o

	obj-y += ipa_v3/ ipa_clients/		obj-y += ipa_v3/ ipa_clients/

	ccflags-$(CONFIG_IPA3) += -Idrivers/platform/msm/ipa/ipa_v3
	ccflags-$(CONFIG_IPA3) += -Idrivers/platform/msm/ipa/ipa_v3/ipahal
	ccflags-$(CONFIG_IPA3) += -Idrivers/platform/msm/ipa/ipa_clients
	ccflags-$(CONFIG_IPA3_REGDUMP) += -Idrivers/platform/msm/ipa/ipa_v3/dump
	ccflags-$(CONFIG_IPA3_REGDUMP_IPA_4_5) += -Idrivers/platform/msm/ipa/ipa_v3/dump/ipa4.5

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -14,13 +14,13 @@
	#include <linux/ipa_uc_offload.h>		#include <linux/ipa_uc_offload.h>
	#include <linux/pci.h>		#include <linux/pci.h>
	#include "ipa_api.h"		#include "ipa_api.h"
	#include "ipa_v3/ipa_i.h"		#include "ipa_i.h"

	/*		/*
	* The following for adding code (ie. for EMULATION) not found on x86.		* The following for adding code (ie. for EMULATION) not found on x86.
	*/		*/
	#if defined(CONFIG_IPA_EMULATION)		#if defined(CONFIG_IPA_EMULATION)
	# include "ipa_v3/ipa_emulation_stubs.h"		# include "ipa_emulation_stubs.h"
	#endif		#endif

	#define DRV_NAME "ipa"		#define DRV_NAME "ipa"

+3 −3

Original line number	Original line	Diff line number	Diff line
	// SPDX-License-Identifier: GPL-2.0-only		// SPDX-License-Identifier: GPL-2.0-only
	/*		/*
	* Copyright (c) 2013-2019, The Linux Foundation. All rights reserved.		* Copyright (c) 2013-2020, The Linux Foundation. All rights reserved.
	*/		*/

	#include <linux/debugfs.h>		#include <linux/debugfs.h>
	@@ -14,8 +14,8 @@
	#include <linux/sched.h>		#include <linux/sched.h>
	#include <linux/atomic.h>		#include <linux/atomic.h>
	#include <linux/ecm_ipa.h>		#include <linux/ecm_ipa.h>
	#include "../ipa_common_i.h"		#include "ipa_common_i.h"
	#include "../ipa_v3/ipa_pm.h"		#include "ipa_pm.h"

	#define DRIVER_NAME "ecm_ipa"		#define DRIVER_NAME "ecm_ipa"
	#define ECM_IPA_IPV4_HDR_NAME "ecm_eth_ipv4"		#define ECM_IPA_IPV4_HDR_NAME "ecm_eth_ipv4"

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -8,7 +8,7 @@
	#include <linux/mm.h>		#include <linux/mm.h>
	#include <linux/module.h>		#include <linux/module.h>
	#include "ipa_clients_i.h"		#include "ipa_clients_i.h"
	#include "../ipa_v3/ipa_i.h"		#include "ipa_i.h"

	static int __init ipa_clients_manager_init(void)		static int __init ipa_clients_manager_init(void)
	{		{