Revert "drivers: usb: properly remove TypeC driver"

* This will be replaced and guarded with a config, to allow N935F to work
ananjaser1211 · Jun 18, 2020 · d19066c · d19066c
1 parent 1bc5cdc
commit d19066c
Show file tree

Hide file tree

Showing 5 changed files with 1,383 additions and 1 deletion.
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
@@ -153,6 +153,8 @@ source "drivers/usb/phy/Kconfig"
 
 source "drivers/usb/gadget/Kconfig"
 
+source "drivers/usb/typec/Kconfig"
+
 config USB_LED_TRIG
 	bool "USB LED Triggers"
 	depends on LEDS_CLASS && USB_COMMON && LEDS_TRIGGERS

diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
@@ -63,6 +63,7 @@ obj-$(CONFIG_USB_COMMON)	+= common/
 
 obj-$(CONFIG_USBIP_CORE)	+= usbip/
 
+obj-$(CONFIG_TYPEC)		+= typec/
 obj-$(CONFIG_USB_NOTIFY_LAYER)	+= notify/
 obj-$(CONFIG_USB_TYPEC_MANAGER_NOTIFIER)	+= manager/
-
+obj-$(CONFIG_TYPEC)		+= typec/
diff --git a/drivers/usb/typec/Kconfig b/drivers/usb/typec/Kconfig
@@ -0,0 +1,10 @@
+
+menu "USB Power Delivery and Type-C drivers"
+
+config TYPEC
+	tristate
+	default y
+	depends on ANDROID_MAJOR_VERSION != "n"
+	depends on ANDROID_MAJOR_VERSION != "o"
+
+endmenu
diff --git a/drivers/usb/typec/Makefile b/drivers/usb/typec/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_TYPEC)		+= typec.o