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

Commit 12fcde69 authored by Srikanth Marepalli's avatar Srikanth Marepalli Committed by Madan Koyyalamudi
Browse files

qcacld-3.0: Use WLAN_WEAR_CHIPSET to modify INI path 

On Wear HL based target with keystone kernel, it generates
WLAN driver with name "qca_cld3_wlan.ko" based on macro
definition WLAN_WEAR_CHIPSET. But the driver was not loading
because of the old INI path and /dev path.
This commit modifies the INI path and /dev path based on
macro defined i.e. WLAN_WEAR_CHIPSET.

Change-Id: I6d457a3bb708de3175c40b0f2b3ba0ebde915838
CRs-Fixed: 3168115
parent 86ea5202

Kbuild

+4 −0
Original line number Diff line number Diff line
@@ -74,6 +74,10 @@ UAPI_INC := -I$(WLAN_ROOT)/$(UAPI_DIR)/linux 
COMMON_DIR :=	core/common

COMMON_INC :=	-I$(WLAN_ROOT)/$(COMMON_DIR)



ifeq (qca_cld3, $(WLAN_WEAR_CHIPSET))

	cppflags-y += -DWLAN_WEAR_CHIPSET

endif



############ HDD ############

HDD_DIR :=	core/hdd

HDD_INC_DIR :=	$(HDD_DIR)/inc

Makefile

+3 −3
Original line number Diff line number Diff line
@@ -14,9 +14,9 @@ M ?= $(shell pwd) 
# WLAN_ROOT must contain an absolute path (i.e. not a relative path)

KBUILD_OPTIONS := WLAN_ROOT=$(shell cd $(KERNEL_SRC); readlink -e $(M))



# MODNAME should be qca_cld3_wlan for helium based platform

ifeq (qca_cld3, $(WLAN_CHIPSET))

KBUILD_OPTIONS += MODNAME?=$(WLAN_CHIPSET)_wlan

# MODNAME should be qca_cld3_wlan for helium based wear target

ifeq (qca_cld3, $(WLAN_WEAR_CHIPSET))

KBUILD_OPTIONS += MODNAME?=$(WLAN_WEAR_CHIPSET)_wlan

else

KBUILD_OPTIONS += MODNAME?=wlan

endif

core/hdd/src/wlan_hdd_driver_ops.c

+4 −0
Original line number Diff line number Diff line
@@ -50,7 +50,11 @@ 
#include "wlan_hdd_thermal.h"



#ifdef MODULE

#ifdef WLAN_WEAR_CHIPSET

#define WLAN_MODULE_NAME  "wlan"

#else

#define WLAN_MODULE_NAME  module_name(THIS_MODULE)

#endif

#else

#define WLAN_MODULE_NAME  "wlan"

#endif

core/hdd/src/wlan_hdd_main.c

+4 −0
Original line number Diff line number Diff line
@@ -200,7 +200,11 @@ 
#include "wlan_hdd_thermal.h"















#ifdef MODULE













#ifdef WLAN_WEAR_CHIPSET













#define WLAN_MODULE_NAME  "wlan"













#else















#define WLAN_MODULE_NAME  module_name(THIS_MODULE)













#endif















#else















#define WLAN_MODULE_NAME  "wlan"















#endif