Skip to content

Commit 990da41

Browse files
Junlisuzhougregkh
authored andcommitted
staging: typec: tcpci: move tcpci drivers out of staging
Move TCPCI(Typec port controller interface) driver and rt1711h driver out of staging. Signed-off-by: Li Jun <jun.li@nxp.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 0025148 commit 990da41

File tree

10 files changed

+17
-32
lines changed

10 files changed

+17
-32
lines changed

drivers/staging/Kconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,6 @@ source "drivers/staging/greybus/Kconfig"
106106

107107
source "drivers/staging/vc04_services/Kconfig"
108108

109-
source "drivers/staging/typec/Kconfig"
110-
111109
source "drivers/staging/vboxvideo/Kconfig"
112110

113111
source "drivers/staging/pi433/Kconfig"

drivers/staging/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
# Makefile for staging directory
33

44
obj-y += media/
5-
obj-y += typec/
65
obj-$(CONFIG_PRISM2_USB) += wlan-ng/
76
obj-$(CONFIG_COMEDI) += comedi/
87
obj-$(CONFIG_FB_OLPC_DCON) += olpc_dcon/

drivers/staging/typec/Kconfig

Lines changed: 0 additions & 22 deletions
This file was deleted.

drivers/staging/typec/Makefile

Lines changed: 0 additions & 2 deletions
This file was deleted.

drivers/staging/typec/TODO

Lines changed: 0 additions & 5 deletions
This file was deleted.

drivers/usb/typec/Kconfig

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,21 @@ config TYPEC_TCPM
5656

5757
if TYPEC_TCPM
5858

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+
select TYPEC_TCPCI
69+
help
70+
Richtek RT1711H Type-C chip driver that works with
71+
Type-C Port Controller Manager to provide USB PD and USB
72+
Type-C functionalities.
73+
5974
source "drivers/usb/typec/fusb302/Kconfig"
6075

6176
config TYPEC_WCOVE

drivers/usb/typec/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,5 @@ obj-$(CONFIG_TYPEC_WCOVE) += typec_wcove.o
77
obj-$(CONFIG_TYPEC_UCSI) += ucsi/
88
obj-$(CONFIG_TYPEC_TPS6598X) += tps6598x.o
99
obj-$(CONFIG_TYPEC) += mux/
10+
obj-$(CONFIG_TYPEC_TCPCI) += tcpci.o
11+
obj-$(CONFIG_TYPEC_RT1711H) += tcpci_rt1711h.o
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)