From 66984cdd1b36458732ebfcd2c3cc9f34a3104c7e Mon Sep 17 00:00:00 2001
From: chailu1 <chailu1@lenovo.com>
Date: Sun, 26 Sep 2021 13:53:33 +0800
Subject: [PATCH] typc: Open macro for TCPC

tcpc
pen macro for TCPC

Change-Id: Ic319d2ac613e5b864db2fd45f90bb9410326c83e
Signed-off-by: chailu1 <chailu1@lenovo.com>
Reviewed-on: https://gerrit.mot.com/2076631
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Yuecai Liu <liuyc20@motorola.com>
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
Submit-Approved: Jira Key
---
 drivers/usb/typec/mmi_tcpc/Android.mk | 39 ++++++++++++++-------------
 drivers/usb/typec/mmi_tcpc/Kbuild     | 20 +++++++-------
 2 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/drivers/usb/typec/mmi_tcpc/Android.mk b/drivers/usb/typec/mmi_tcpc/Android.mk
index e5e9c63a1df0..c2da8e842fd1 100644
--- a/drivers/usb/typec/mmi_tcpc/Android.mk
+++ b/drivers/usb/typec/mmi_tcpc/Android.mk
@@ -1,33 +1,34 @@
 DLKM_DIR := motorola/kernel/modules
 LOCAL_PATH := $(call my-dir)
 
-#ifeq ($(TCPC_SGM7220),true)
+ifeq ($(TCPC_SGM7220),true)
 	KERNEL_CFLAGS += CONFIG_TCPC_SGM7220=y
-#endi
 
-#ifeq ($(TCPC_RT1711H),true)
+	include $(CLEAR_VARS)
+	LOCAL_MODULE_TAGS := optional
+	LOCAL_MODULE := tcpc_sgm7220.ko
+	LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
+	include $(DLKM_DIR)/AndroidKernelModule.mk
+endif
+
+ifeq ($(TCPC_RT1711H),true)
 	KERNEL_CFLAGS += CONFIG_TCPC_RT1711H=y
-#endif
 
-#ifeq ($(TCPC_CLASS),true)
+	include $(CLEAR_VARS)
+	LOCAL_MODULE_TAGS := optional
+	LOCAL_MODULE := tcpc_rt1711h.ko
+	LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
+	include $(DLKM_DIR)/AndroidKernelModule.mk
+endif
+
+ifeq ($(TCPC_CLASS),true)
 	KERNEL_CFLAGS += CONFIG_TCPC_CLASS=y
-#endif
+endif
 
-#ifeq ($(USB_POWER_DELIVERY),true)
+ifeq ($(USB_POWER_DELIVERY),true)
 	KERNEL_CFLAGS += CONFIG_USB_POWER_DELIVERY=y
-#endif
+endif
 
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := tcpc_sgm7220.ko
-LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
-include $(DLKM_DIR)/AndroidKernelModule.mk
-
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := tcpc_rt1711h.ko
-LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
-include $(DLKM_DIR)/AndroidKernelModule.mk
 
 
 include $(CLEAR_VARS)
diff --git a/drivers/usb/typec/mmi_tcpc/Kbuild b/drivers/usb/typec/mmi_tcpc/Kbuild
index 5075ee06954e..f9ab20809133 100644
--- a/drivers/usb/typec/mmi_tcpc/Kbuild
+++ b/drivers/usb/typec/mmi_tcpc/Kbuild
@@ -7,26 +7,26 @@ subdir-ccflags-y += -Wall -Werror -DCONFIG_RT_REGMAP
 
 EXTRA_CFLAGS += -DCONFIG_PD_DBG_INFO
 
-#ifneq ($(filter m y,$(CONFIG_TCPC_CLASS)),)
+ifneq ($(filter m y,$(CONFIG_TCPC_CLASS)),)
 	EXTRA_CFLAGS += -DCONFIG_TCPC_CLASS
-#endif
+endif
 
-#ifneq ($(filter m y,$(CONFIG_USB_POWER_DELIVERY)),)
+ifneq ($(filter m y,$(CONFIG_USB_POWER_DELIVERY)),)
 	EXTRA_CFLAGS += -DCONFIG_USB_POWER_DELIVERY
-#endif
+endif
 
-#ifneq ($(filter m y,$(CONFIG_TCPC_RT1711H)),)
+ifneq ($(filter m y,$(CONFIG_TCPC_RT1711H)),)
 	obj-m	+= tcpc_rt1711h.o
-#endif
+endif
 
-#ifneq ($(filter m y,$(CONFIG_TCPC_SGM7220)),)
+ifneq ($(filter m y,$(CONFIG_TCPC_SGM7220)),)
 	obj-m	+= tcpc_sgm7220.o
-#endif
+endif
 
 tcpc_class-objs			+= tcpci_core.o tcpci_typec.o tcpci_timer.o \
 		tcpm.o tcpci.o pd_dbg_info.o tcpci_alert.o rt-regmap.o tcpci_dual_role.o
 
-#ifneq ($(filter m y,$(CONFIG_USB_POWER_DELIVERY)),)
+ifneq ($(filter m y,$(CONFIG_USB_POWER_DELIVERY)),)
 tcpc_class-objs			+= tcpci_event.o \
 		pd_core.o pd_policy_engine.o pd_process_evt.o \
 		pd_dpm_core.o pd_dpm_uvdm.o pd_dpm_alt_mode_dp.o pd_dpm_pdo_select.o\
@@ -37,7 +37,7 @@ tcpc_class-objs			+= tcpci_event.o \
 		pd_policy_engine_src.o pd_policy_engine_snk.o pd_policy_engine_ufp.o pd_policy_engine_vcs.o \
 		pd_policy_engine_dfp.o pd_policy_engine_dr.o pd_policy_engine_drs.o pd_policy_engine_prs.o \
 		pd_policy_engine_dbg.o pd_policy_engine_com.o pd_dpm_alt_mode_dc.o
-#endif
+endif
 
 obj-m	+= tcpc_class.o
 obj-m	+= rt_pd_manager.o