Skip to contentSkip to conversation

usb: typec: Group all TCPCI/TCPM code together

PATCH New Heikki Krogerus 1 participant 1 message Sep 20, 2018

Subsystems (3)
lore
Share & tools
lore

Heikki Krogerus

author maintainer
#0 lore raw

PATCH 12/12 usb: typec: Group all TCPCI/TCPM code together

Moving all the drivers that depend on the Port Controller Manager under a new directory drivers/usb/typec/tcpm/ and making Guenter Roeck the designated reviewer of that code.

---
 MAINTAINERS                                   |  6 +++
 drivers/usb/typec/Kconfig                     | 45 +---------------
 drivers/usb/typec/Makefile                    |  6 +--
 drivers/usb/typec/fusb302/Kconfig             |  7 ---
 drivers/usb/typec/fusb302/Makefile            |  2 -
 drivers/usb/typec/tcpm/Kconfig                | 52 +++++++++++++++++++
 drivers/usb/typec/tcpm/Makefile               |  7 +++
 drivers/usb/typec/{fusb302 => tcpm}/fusb302.c |  0
 .../usb/typec/{fusb302 => tcpm}/fusb302_reg.h |  0
 drivers/usb/typec/{ => tcpm}/tcpci.c          |  0
 drivers/usb/typec/{ => tcpm}/tcpci.h          |  0
 drivers/usb/typec/{ => tcpm}/tcpci_rt1711h.c  |  0
 drivers/usb/typec/{ => tcpm}/tcpm.c           |  0
 .../usb/typec/{typec_wcove.c => tcpm/wcove.c} |  0
 14 files changed, 67 insertions(+), 58 deletions(-)
 delete mode 100644 drivers/usb/typec/fusb302/Kconfig
 delete mode 100644 drivers/usb/typec/fusb302/Makefile
 create mode 100644 drivers/usb/typec/tcpm/Kconfig
 create mode 100644 drivers/usb/typec/tcpm/Makefile
 rename drivers/usb/typec/{fusb302 => tcpm}/fusb302.c (100%)
 rename drivers/usb/typec/{fusb302 => tcpm}/fusb302_reg.h (100%)
 rename drivers/usb/typec/{ => tcpm}/tcpci.c (100%)
 rename drivers/usb/typec/{ => tcpm}/tcpci.h (100%)
 rename drivers/usb/typec/{ => tcpm}/tcpci_rt1711h.c (100%)
 rename drivers/usb/typec/{ => tcpm}/tcpm.c (100%)
 rename drivers/usb/typec/{typec_wcove.c => tcpm/wcove.c} (100%)
MAINTAINERS +6 -0
index 9ad052aeac39..8edc920b29e3 100644
@@ -15269,6 +15269,12 @@ F:	Documentation/driver-api/usb/typec_bus.rst
 F:	drivers/usb/typec/altmodes/
 F:	include/linux/usb/typec_altmode.h
 
+USB TYPEC PORT CONTROLLER DRIVERS
+M:	Guenter Roeck <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	drivers/usb/typec/tcpm/
+
 USB UHCI DRIVER
 M:	Alan Stern <[email protected]>
 L:	[email protected]
drivers/usb/typec/Kconfig +1 -44

51 lines not on this page · raw message

drivers/usb/typec/Makefile +1 -5
index 45b0aef428a8..6696b7263d61 100644
@@ -2,11 +2,7 @@
 obj-$(CONFIG_TYPEC)		+= typec.o
 typec-y				:= class.o mux.o bus.o
 obj-$(CONFIG_TYPEC)		+= altmodes/
-obj-$(CONFIG_TYPEC_TCPM)	+= tcpm.o
-obj-y				+= fusb302/
-obj-$(CONFIG_TYPEC_WCOVE)	+= typec_wcove.o
+obj-$(CONFIG_TYPEC_TCPM)	+= tcpm/
 obj-$(CONFIG_TYPEC_UCSI)	+= ucsi/
 obj-$(CONFIG_TYPEC_TPS6598X)	+= tps6598x.o
 obj-$(CONFIG_TYPEC)		+= mux/
-obj-$(CONFIG_TYPEC_TCPCI)	+= tcpci.o
-obj-$(CONFIG_TYPEC_RT1711H)	+= tcpci_rt1711h.o
drivers/usb/typec/fusb302/Kconfig deleted +0 -7
deleted file mode 100644
index fce099ff39fe..000000000000
@@ -1,7 +0,0 @@
-config TYPEC_FUSB302
-	tristate "Fairchild FUSB302 Type-C chip driver"
-	depends on I2C
-	help
-	  The Fairchild FUSB302 Type-C chip driver that works with
-	  Type-C Port Controller Manager to provide USB PD and USB
-	  Type-C functionalities.
drivers/usb/typec/fusb302/Makefile deleted +0 -2
deleted file mode 100644
index 3b51b33631a0..000000000000
@@ -1,2 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-obj-$(CONFIG_TYPEC_FUSB302)	+= fusb302.o
drivers/usb/typec/tcpm/Kconfig new file +52 -0

52 lines not on this page · raw message

drivers/usb/typec/tcpm/Makefile new file +7 -0
new file mode 100644
index 000000000000..a5ff6c8eb892
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0
+obj-$(CONFIG_TYPEC_TCPM)	+= tcpm.o
+obj-$(CONFIG_TYPEC_FUSB302)	+= fusb302.o
+obj-$(CONFIG_TYPEC_WCOVE)	+= typec_wcove.o
+typec_wcove-y			:= wcove.o
+obj-$(CONFIG_TYPEC_TCPCI)	+= tcpci.o
+obj-$(CONFIG_TYPEC_RT1711H)	+= tcpci_rt1711h.o
drivers/usb/typec/tcpm/fusb302.c renamed from drivers/usb/typec/fusb302/fusb302.c +0 -0
similarity index 100%
rename from drivers/usb/typec/fusb302/fusb302.c
rename to drivers/usb/typec/tcpm/fusb302.c
drivers/usb/typec/tcpm/fusb302_reg.h renamed from drivers/usb/typec/fusb302/fusb302_reg.h +0 -0
similarity index 100%
rename from drivers/usb/typec/fusb302/fusb302_reg.h
rename to drivers/usb/typec/tcpm/fusb302_reg.h
drivers/usb/typec/tcpm/tcpci.c renamed from drivers/usb/typec/tcpci.c +0 -0
similarity index 100%
rename from drivers/usb/typec/tcpci.c
rename to drivers/usb/typec/tcpm/tcpci.c
drivers/usb/typec/tcpm/tcpci.h renamed from drivers/usb/typec/tcpci.h +0 -0
similarity index 100%
rename from drivers/usb/typec/tcpci.h
rename to drivers/usb/typec/tcpm/tcpci.h
drivers/usb/typec/tcpm/tcpci_rt1711h.c renamed from drivers/usb/typec/tcpci_rt1711h.c +0 -0
similarity index 100%
rename from drivers/usb/typec/tcpci_rt1711h.c
rename to drivers/usb/typec/tcpm/tcpci_rt1711h.c
drivers/usb/typec/tcpm/tcpm.c renamed from drivers/usb/typec/tcpm.c +0 -0
similarity index 100%
rename from drivers/usb/typec/tcpm.c
rename to drivers/usb/typec/tcpm/tcpm.c
drivers/usb/typec/tcpm/wcove.c renamed from drivers/usb/typec/typec_wcove.c +0 -0
similarity index 100%
rename from drivers/usb/typec/typec_wcove.c
rename to drivers/usb/typec/tcpm/wcove.c