A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-09 05:39:54 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix build error on SM8650 platform

Browse source 
TP:
Fix build error on SM8650 platform.

Change-Id: I674b3a4e05ca1707bec2407b3d3d8eae35baa3a0
Signed-off-by: Wenge Zhu <zhuwg1@motorola.com>
Reviewed-on: https://gerrit.mot.com/2774628
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Yeqing Wang <wangyq13@motorola.com>
Reviewed-by: Jichao Zou <zoujc@motorola.com>
Submit-Approved: Jira Key
This commit is contained in:
Wenge Zhu 2023-10-23 21:33:26 +08:00 • committed by zhuwg1
commit d64069aa55
7 changed files with 26 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/input/touchscreen/goodix_berlin_mmi/Android.mk
View file

@ -10,7 +10,7 @@ ifeq ($(DRM_PANEL_NOTIFICATIONS),true)
endif
ifeq ($(TOUCHSCREEN_GOODIX_BRL_SPI),true)
ifeq ($(call is-board-platform-in-list,taro kalama parrot crow), true)
ifeq ($(call is-board-platform-in-list,taro kalama parrot crow pineapple), true)
KBUILD_OPTIONS += CONFIG_TOUCHSCREEN_GOODIX_BRL_SPI=y
else
KERNEL_CFLAGS += CONFIG_TOUCHSCREEN_GOODIX_BRL_SPI=y

2
drivers/input/touchscreen/goodix_berlin_mmi/Makefile
View file

@ -15,4 +15,6 @@ clean:
KBUILD_EXTRA_SYMBOLS += $(M)/../../../mmi_info/$(GKI_OBJ_MODULE_DIR)/Module.symvers
KBUILD_EXTRA_SYMBOLS += $(M)/../touchscreen_mmi/$(GKI_OBJ_MODULE_DIR)/Module.symvers
ifneq ($(filter m y, $(CONFIG_INPUT_GTP_PASSIVE_PEN_NOTIFIER)),)
KBUILD_EXTRA_SYMBOLS += $(M)/../../../misc/hall/$(GKI_OBJ_MODULE_DIR)/Module.symvers
endif

7
drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_i2c.c
View file

@ -228,11 +228,18 @@ err_pdev:
return ret;
}
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))
static void goodix_i2c_remove(struct i2c_client *client)
{
platform_device_unregister(goodix_pdev);
}
#else
static int goodix_i2c_remove(struct i2c_client *client)
{
platform_device_unregister(goodix_pdev);
return 0;
}
#endif
#ifdef CONFIG_OF
static const struct of_device_id i2c_matchs[] = {

7
drivers/input/touchscreen/goodix_berlin_mmi/goodix_brl_spi.c
View file

@ -264,11 +264,18 @@ err_pdev:
return ret;
}
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 0))
static void goodix_spi_remove(struct spi_device *spi)
{
platform_device_unregister(goodix_pdev);
}
#else
static int goodix_spi_remove(struct spi_device *spi)
{
platform_device_unregister(goodix_pdev);
return 0;
}
#endif
#ifdef CONFIG_OF
static const struct of_device_id spi_matchs[] = {

8
drivers/input/touchscreen/goodix_berlin_mmi/goodix_ts_core.c
View file

@ -14,18 +14,17 @@
* General Public License for more details.
*
*/
#include <linux/version.h>
#include <linux/fs.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
#include <linux/uaccess.h>
#include "goodix_ts_core.h"
#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 38)
#include <linux/input/mt.h>
#define INPUT_TYPE_B_PROTOCOL
#endif
#include "goodix_ts_core.h"
#include "goodix_ts_mmi.h"
#define PINCTRL_STATE_ACTIVE "pmx_ts_active"
@ -33,6 +32,10 @@
#define GOODIX_DEFAULT_CFG_NAME "goodix_cfg_group.cfg"
#define GOOIDX_INPUT_PHYS "goodix_ts/input0"
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 0))
#define PDE_DATA(x) pde_data(x)
#endif
struct goodix_module goodix_modules;
int core_module_prob_sate = CORE_MODULE_UNPROBED;
@ -2237,6 +2240,7 @@ static int goodix_generic_noti_callback(struct notifier_block *self,
ret = goodix_send_ic_config(cd, CONFIG_TYPE_NORMAL);
if (ret)
ts_info("failed send normal config[ignore]");
fallthrough;
case NOTIFY_FWUPDATE_FAILED:
if (hw_ops->read_version(cd, &cd->fw_version))
ts_info("failed read fw version info[ignore]");

1
drivers/input/touchscreen/goodix_berlin_mmi/goodix_ts_core.h
View file

@ -16,6 +16,7 @@
#include <linux/completion.h>
#include <linux/of_irq.h>
#include <linux/clk.h>
#include <linux/version.h>
#ifdef CONFIG_OF
#include <linux/of_gpio.h>
#include <linux/regulator/consumer.h>

2
drivers/input/touchscreen/touchscreen_mmi/Makefile
View file

@ -11,4 +11,6 @@ modules_install:
KBUILD_EXTRA_SYMBOLS += $(M)/../../../sensors/Module.symvers
KBUILD_EXTRA_SYMBOLS += $(M)/../../../mmi_relay/Module.symvers
ifneq ($(filter m y, $(CONFIG_DRM_DYNAMIC_REFRESH_RATE)),)
KBUILD_EXTRA_SYMBOLS += $(OUT_DIR)/../../vendor/qcom/opensource/display-drivers/msm/Module.symvers
endif