usb: typec: fusb302: Move out of staging

The driver is in good enough shape to be moved out of staging. Do it. Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
mariux64 · Sep 18, 2017 · 76f0c53 · 76f0c53
1 parent 4b4e02c
commit 76f0c53
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 13 deletions.
diff --git a/drivers/staging/typec/Kconfig b/drivers/staging/typec/Kconfig
@@ -9,8 +9,6 @@ config TYPEC_TCPCI
 	help
 	  Type-C Port Controller driver for TCPCI-compliant controller.
 
-source "drivers/staging/typec/fusb302/Kconfig"
-
 endif
 
 endmenu
diff --git a/drivers/staging/typec/Makefile b/drivers/staging/typec/Makefile
@@ -1,2 +1 @@
 obj-$(CONFIG_TYPEC_TCPCI)	+= tcpci.o
-obj-y				+= fusb302/
diff --git a/drivers/staging/typec/fusb302/TODO b/drivers/staging/typec/fusb302/TODO
diff --git a/drivers/usb/typec/Kconfig b/drivers/usb/typec/Kconfig
@@ -12,6 +12,12 @@ config TYPEC_TCPM
 	  The Type-C Port Controller Manager provides a USB PD and USB Type-C
 	  state machine for use with Type-C Port Controllers.
 
+if TYPEC_TCPM
+
+source "drivers/usb/typec/fusb302/Kconfig"
+
+endif
+
 config TYPEC_WCOVE
 	tristate "Intel WhiskeyCove PMIC USB Type-C PHY driver"
 	depends on ACPI

diff --git a/drivers/usb/typec/Makefile b/drivers/usb/typec/Makefile
@@ -1,4 +1,5 @@
 obj-$(CONFIG_TYPEC)		+= typec.o
 obj-$(CONFIG_TYPEC_TCPM)	+= tcpm.o
+obj-y				+= fusb302/
 obj-$(CONFIG_TYPEC_WCOVE)	+= typec_wcove.o
 obj-$(CONFIG_TYPEC_UCSI)	+= ucsi/
diff --git a/drivers/staging/typec/fusb302/Kconfig → drivers/usb/typec/fusb302/Kconfig b/drivers/staging/typec/fusb302/Kconfig → drivers/usb/typec/fusb302/Kconfig
diff --git a/drivers/staging/typec/fusb302/Makefile → drivers/usb/typec/fusb302/Makefile b/drivers/staging/typec/fusb302/Makefile → drivers/usb/typec/fusb302/Makefile
diff --git a/drivers/staging/typec/fusb302/fusb302.c → drivers/usb/typec/fusb302/fusb302.c b/drivers/staging/typec/fusb302/fusb302.c → drivers/usb/typec/fusb302/fusb302.c
diff --git a/drivers/staging/typec/fusb302/fusb302_reg.h → drivers/usb/typec/fusb302/fusb302_reg.h b/drivers/staging/typec/fusb302/fusb302_reg.h → drivers/usb/typec/fusb302/fusb302_reg.h