Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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.

Acked-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Heikki Krogerus and committed by
Greg Kroah-Hartman
ae8a2ca8 c800c51f

+67 -58
+6
MAINTAINERS
··· 15286 15286 F: drivers/usb/typec/altmodes/ 15287 15287 F: include/linux/usb/typec_altmode.h 15288 15288 15289 + USB TYPEC PORT CONTROLLER DRIVERS 15290 + M: Guenter Roeck <linux@roeck-us.net> 15291 + L: linux-usb@vger.kernel.org 15292 + S: Maintained 15293 + F: drivers/usb/typec/tcpm/ 15294 + 15289 15295 USB UHCI DRIVER 15290 15296 M: Alan Stern <stern@rowland.harvard.edu> 15291 15297 L: linux-usb@vger.kernel.org
+1 -44
drivers/usb/typec/Kconfig
··· 45 45 46 46 if TYPEC 47 47 48 - config TYPEC_TCPM 49 - tristate "USB Type-C Port Controller Manager" 50 - depends on USB 51 - select USB_ROLE_SWITCH 52 - select POWER_SUPPLY 53 - help 54 - The Type-C Port Controller Manager provides a USB PD and USB Type-C 55 - state machine for use with Type-C Port Controllers. 56 - 57 - if TYPEC_TCPM 58 - 59 - config TYPEC_TCPCI 60 - tristate "Type-C Port Controller Interface driver" 61 - depends on I2C 62 - select REGMAP_I2C 63 - help 64 - Type-C Port Controller driver for TCPCI-compliant controller. 65 - 66 - config TYPEC_RT1711H 67 - tristate "Richtek RT1711H Type-C chip driver" 68 - depends on I2C 69 - select TYPEC_TCPCI 70 - help 71 - Richtek RT1711H Type-C chip driver that works with 72 - Type-C Port Controller Manager to provide USB PD and USB 73 - Type-C functionalities. 74 - 75 - source "drivers/usb/typec/fusb302/Kconfig" 76 - 77 - config TYPEC_WCOVE 78 - tristate "Intel WhiskeyCove PMIC USB Type-C PHY driver" 79 - depends on ACPI 80 - depends on INTEL_SOC_PMIC 81 - depends on INTEL_PMC_IPC 82 - depends on BXT_WC_PMIC_OPREGION 83 - help 84 - This driver adds support for USB Type-C detection on Intel Broxton 85 - platforms that have Intel Whiskey Cove PMIC. The driver can detect the 86 - role and cable orientation. 87 - 88 - To compile this driver as module, choose M here: the module will be 89 - called typec_wcove 90 - 91 - endif # TYPEC_TCPM 48 + source "drivers/usb/typec/tcpm/Kconfig" 92 49 93 50 source "drivers/usb/typec/ucsi/Kconfig" 94 51
+1 -5
drivers/usb/typec/Makefile
··· 2 2 obj-$(CONFIG_TYPEC) += typec.o 3 3 typec-y := class.o mux.o bus.o 4 4 obj-$(CONFIG_TYPEC) += altmodes/ 5 - obj-$(CONFIG_TYPEC_TCPM) += tcpm.o 6 - obj-y += fusb302/ 7 - obj-$(CONFIG_TYPEC_WCOVE) += typec_wcove.o 5 + obj-$(CONFIG_TYPEC_TCPM) += tcpm/ 8 6 obj-$(CONFIG_TYPEC_UCSI) += ucsi/ 9 7 obj-$(CONFIG_TYPEC_TPS6598X) += tps6598x.o 10 8 obj-$(CONFIG_TYPEC) += mux/ 11 - obj-$(CONFIG_TYPEC_TCPCI) += tcpci.o 12 - obj-$(CONFIG_TYPEC_RT1711H) += tcpci_rt1711h.o
-7
drivers/usb/typec/fusb302/Kconfig
··· 1 - config TYPEC_FUSB302 2 - tristate "Fairchild FUSB302 Type-C chip driver" 3 - depends on I2C 4 - help 5 - The Fairchild FUSB302 Type-C chip driver that works with 6 - Type-C Port Controller Manager to provide USB PD and USB 7 - Type-C functionalities.
-2
drivers/usb/typec/fusb302/Makefile
··· 1 - # SPDX-License-Identifier: GPL-2.0 2 - obj-$(CONFIG_TYPEC_FUSB302) += fusb302.o
drivers/usb/typec/fusb302/fusb302.c drivers/usb/typec/tcpm/fusb302.c
drivers/usb/typec/fusb302/fusb302_reg.h drivers/usb/typec/tcpm/fusb302_reg.h
drivers/usb/typec/tcpci.c drivers/usb/typec/tcpm/tcpci.c
drivers/usb/typec/tcpci.h drivers/usb/typec/tcpm/tcpci.h
drivers/usb/typec/tcpci_rt1711h.c drivers/usb/typec/tcpm/tcpci_rt1711h.c
drivers/usb/typec/tcpm.c drivers/usb/typec/tcpm/tcpm.c
+52
drivers/usb/typec/tcpm/Kconfig
··· 1 + config TYPEC_TCPM 2 + tristate "USB Type-C Port Controller Manager" 3 + depends on USB 4 + select USB_ROLE_SWITCH 5 + select POWER_SUPPLY 6 + help 7 + The Type-C Port Controller Manager provides a USB PD and USB Type-C 8 + state machine for use with Type-C Port Controllers. 9 + 10 + if TYPEC_TCPM 11 + 12 + config TYPEC_TCPCI 13 + tristate "Type-C Port Controller Interface driver" 14 + depends on I2C 15 + select REGMAP_I2C 16 + help 17 + Type-C Port Controller driver for TCPCI-compliant controller. 18 + 19 + if TYPEC_TCPCI 20 + 21 + config TYPEC_RT1711H 22 + tristate "Richtek RT1711H Type-C chip driver" 23 + help 24 + Richtek RT1711H Type-C chip driver that works with 25 + Type-C Port Controller Manager to provide USB PD and USB 26 + Type-C functionalities. 27 + 28 + endif # TYPEC_TCPCI 29 + 30 + config TYPEC_FUSB302 31 + tristate "Fairchild FUSB302 Type-C chip driver" 32 + depends on I2C 33 + help 34 + The Fairchild FUSB302 Type-C chip driver that works with 35 + Type-C Port Controller Manager to provide USB PD and USB 36 + Type-C functionalities. 37 + 38 + config TYPEC_WCOVE 39 + tristate "Intel WhiskeyCove PMIC USB Type-C PHY driver" 40 + depends on ACPI 41 + depends on INTEL_SOC_PMIC 42 + depends on INTEL_PMC_IPC 43 + depends on BXT_WC_PMIC_OPREGION 44 + help 45 + This driver adds support for USB Type-C on Intel Broxton platforms 46 + that have Intel Whiskey Cove PMIC. The driver works with USB Type-C 47 + Port Controller Manager to provide USB PD and Type-C functionalities. 48 + 49 + To compile this driver as module, choose M here: the module will be 50 + called typec_wcove.ko 51 + 52 + endif # TYPEC_TCPM
+7
drivers/usb/typec/tcpm/Makefile
··· 1 + # SPDX-License-Identifier: GPL-2.0 2 + obj-$(CONFIG_TYPEC_TCPM) += tcpm.o 3 + obj-$(CONFIG_TYPEC_FUSB302) += fusb302.o 4 + obj-$(CONFIG_TYPEC_WCOVE) += typec_wcove.o 5 + typec_wcove-y := wcove.o 6 + obj-$(CONFIG_TYPEC_TCPCI) += tcpci.o 7 + obj-$(CONFIG_TYPEC_RT1711H) += tcpci_rt1711h.o
drivers/usb/typec/typec_wcove.c drivers/usb/typec/tcpm/wcove.c