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

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

Merge "usb: type_c: Rename USB_EXT_TYPE_C to USB_EXT_TYPE_C_PERICOM"

parents 48e6473b 314dafd4

arch/arm64/configs/msmcortex_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ CONFIG_BLK_DEV_LOOP=y 
CONFIG_BLK_DEV_RAM=y

CONFIG_QSEECOM=y

CONFIG_HDCP_QSEECOM=y

CONFIG_USB_EXT_TYPE_C=y

CONFIG_USB_EXT_TYPE_C_PERICOM=y

CONFIG_MSM_ULTRASOUND=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

drivers/misc/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -541,12 +541,12 @@ config UID_CPUTIME 
	help

	  Per UID based cpu time statistics exported to /proc/uid_cputime



config USB_EXT_TYPE_C

	tristate "USB Type-C charger detection support using external chip"

config USB_EXT_TYPE_C_PERICOM

	tristate "USB Type-C charger detection support using Pericom chip"

	depends on I2C && POWER_SUPPLY

	help

	  Enables support for the USB Type-C chargers using external

	  chips connected using I2C.

	  pericom chip connected using I2C.



	  This adds support for detecting USB Type-C chargers that

	  can supply upto 3A Vbus current for charging.

drivers/misc/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -65,4 +65,4 @@ obj-$(CONFIG_CXL_BASE) += cxl/ 
obj-$(CONFIG_UID_CPUTIME) += uid_cputime.o

obj-y				+= qcom/

obj-$(CONFIG_TI_DRV2667) += ti_drv2667.o

obj-$(CONFIG_USB_EXT_TYPE_C)	+= type-c-pericom.o
 
obj-$(CONFIG_USB_EXT_TYPE_C_PERICOM)	+= type-c-pericom.o