From: Li Jun <jun.li@nxp.com>
To: robh+dt@kernel.org, gregkh@linuxfoundation.org,
heikki.krogerus@linux.intel.com, linux@roeck-us.net
Cc: devel@driverdev.osuosl.org, devicetree@vger.kernel.org,
peter.chen@nxp.com, linux-usb@vger.kernel.org,
a.hajda@samsung.com, linux-imx@nxp.com, jun.li@nxp.com,
shufan_lee@richtek.com
Subject: [PATCH v4 13/13] staging: typec: tcpci: move tcpci driver out of staging
Date: Thu, 29 Mar 2018 00:06:18 +0800 [thread overview]
Message-ID: <1522253178-32414-14-git-send-email-jun.li@nxp.com> (raw)
In-Reply-To: <1522253178-32414-1-git-send-email-jun.li@nxp.com>
Move TCPCI(Typec port controller interface) driver out of staging.
Signed-off-by: Li Jun <jun.li@nxp.com>
---
drivers/staging/Kconfig | 2 --
drivers/staging/Makefile | 1 -
drivers/staging/typec/Kconfig | 14 --------------
drivers/staging/typec/Makefile | 1 -
drivers/staging/typec/TODO | 5 -----
drivers/usb/typec/Kconfig | 7 +++++++
drivers/usb/typec/Makefile | 1 +
drivers/{staging => usb}/typec/tcpci.c | 0
drivers/{staging => usb}/typec/tcpci.h | 0
9 files changed, 8 insertions(+), 23 deletions(-)
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index e95ab68..751937d 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -116,8 +116,6 @@ source "drivers/staging/vc04_services/Kconfig"
source "drivers/staging/ccree/Kconfig"
-source "drivers/staging/typec/Kconfig"
-
source "drivers/staging/vboxvideo/Kconfig"
source "drivers/staging/pi433/Kconfig"
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index af8cd6a..039693e 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -2,7 +2,6 @@
# Makefile for staging directory
obj-y += media/
-obj-y += typec/
obj-$(CONFIG_IPX) += ipx/
obj-$(CONFIG_NCP_FS) += ncpfs/
obj-$(CONFIG_IRDA) += irda/net/
diff --git a/drivers/staging/typec/Kconfig b/drivers/staging/typec/Kconfig
deleted file mode 100644
index 5359f55..0000000
--- a/drivers/staging/typec/Kconfig
+++ /dev/null
@@ -1,14 +0,0 @@
-menu "USB Power Delivery and Type-C drivers"
-
-if TYPEC_TCPM
-
-config TYPEC_TCPCI
- tristate "Type-C Port Controller Interface driver"
- depends on I2C
- select REGMAP_I2C
- help
- Type-C Port Controller driver for TCPCI-compliant controller.
-
-endif
-
-endmenu
diff --git a/drivers/staging/typec/Makefile b/drivers/staging/typec/Makefile
deleted file mode 100644
index 53d649a..0000000
--- a/drivers/staging/typec/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-obj-$(CONFIG_TYPEC_TCPCI) += tcpci.o
diff --git a/drivers/staging/typec/TODO b/drivers/staging/typec/TODO
deleted file mode 100644
index 53fe2f7..0000000
--- a/drivers/staging/typec/TODO
+++ /dev/null
@@ -1,5 +0,0 @@
-tcpci:
-- Test with real hardware
-
-Please send patches to Guenter Roeck <linux@roeck-us.net> and copy
-Heikki Krogerus <heikki.krogerus@linux.intel.com>.
diff --git a/drivers/usb/typec/Kconfig b/drivers/usb/typec/Kconfig
index 030f88c..2b8d3c2 100644
--- a/drivers/usb/typec/Kconfig
+++ b/drivers/usb/typec/Kconfig
@@ -55,6 +55,13 @@ config TYPEC_TCPM
if TYPEC_TCPM
+config TYPEC_TCPCI
+ tristate "Type-C Port Controller Interface driver"
+ depends on I2C
+ select REGMAP_I2C
+ help
+ Type-C Port Controller driver for TCPCI-compliant controller.
+
source "drivers/usb/typec/fusb302/Kconfig"
config TYPEC_WCOVE
diff --git a/drivers/usb/typec/Makefile b/drivers/usb/typec/Makefile
index 1f599a6..02758a1 100644
--- a/drivers/usb/typec/Makefile
+++ b/drivers/usb/typec/Makefile
@@ -7,3 +7,4 @@ obj-$(CONFIG_TYPEC_WCOVE) += typec_wcove.o
obj-$(CONFIG_TYPEC_UCSI) += ucsi/
obj-$(CONFIG_TYPEC_TPS6598X) += tps6598x.o
obj-$(CONFIG_TYPEC) += mux/
+obj-$(CONFIG_TYPEC_TCPCI) += tcpci.o
diff --git a/drivers/staging/typec/tcpci.c b/drivers/usb/typec/tcpci.c
similarity index 100%
rename from drivers/staging/typec/tcpci.c
rename to drivers/usb/typec/tcpci.c
diff --git a/drivers/staging/typec/tcpci.h b/drivers/usb/typec/tcpci.h
similarity index 100%
rename from drivers/staging/typec/tcpci.h
rename to drivers/usb/typec/tcpci.h
--
2.7.4
prev parent reply other threads:[~2018-03-28 16:06 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-28 16:06 [PATCH v4 00/13] staging: typec: tcpci: move out of staging Li Jun
2018-03-28 16:06 ` [PATCH v4 01/13] dt-bindings: connector: add properties for typec Li Jun
2018-03-29 19:54 ` Mats Karrman
2018-03-31 3:34 ` Jun Li
2018-04-03 8:29 ` Andrzej Hajda
2018-04-13 11:51 ` Jun Li
2018-04-30 11:23 ` Heikki Krogerus
2018-05-01 7:57 ` Jun Li
2018-03-28 16:06 ` [PATCH v4 02/13] dt-bindings: usb: add documentation for typec port controller(TCPCI) Li Jun
2018-04-09 20:04 ` Rob Herring
2018-04-16 11:54 ` Jun Li
2018-04-16 14:28 ` Rob Herring
2018-04-19 14:47 ` Jun Li
2018-04-30 7:41 ` Mats Karrman
2018-05-01 7:54 ` Jun Li
2018-03-28 16:06 ` [PATCH v4 03/13] staging: typec: tcpci: add compatible string for nxp ptn5110 Li Jun
2018-03-28 16:06 ` [PATCH v4 04/13] usb: typec: add fwnode to tcpc Li Jun
2018-03-29 12:57 ` Heikki Krogerus
2018-03-31 3:17 ` Jun Li
2018-03-28 16:06 ` [PATCH v4 05/13] usb: typec: add API to get typec basic port power and data config Li Jun
2018-03-28 16:06 ` [PATCH v4 06/13] usb: typec: tcpm: support get typec and pd config from device properties Li Jun
2018-03-28 16:06 ` [PATCH v4 07/13] staging: typec: tcpci: register port before request irq Li Jun
2018-03-29 10:52 ` Dan Carpenter
2018-03-31 3:09 ` Jun Li
2018-03-31 8:01 ` Dan Carpenter
2018-03-28 16:06 ` [PATCH v4 08/13] staging: typec: tcpci: enable vbus detection Li Jun
2018-03-28 16:06 ` [PATCH v4 09/13] typec: tcpm: add starting value for drp toggling Li Jun
2018-03-28 16:06 ` [PATCH v4 10/13] usb: typec: tcpm: set cc for drp toggling attach Li Jun
2018-03-29 21:18 ` Mats Karrman
2018-03-31 3:37 ` Jun Li
2018-03-29 22:49 ` Guenter Roeck
2018-03-31 4:38 ` Jun Li
2018-03-28 16:06 ` [PATCH v4 11/13] staging: typec: tcpci: keep the not connecting cc line open Li Jun
2018-03-30 15:15 ` Guenter Roeck
2018-03-31 4:49 ` Jun Li
2018-03-28 16:06 ` [PATCH v4 12/13] staging: typec: tcpci: Only touch target bit when enable vconn Li Jun
2018-03-28 16:06 ` Li Jun [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1522253178-32414-14-git-send-email-jun.li@nxp.com \
--to=jun.li@nxp.com \
--cc=a.hajda@samsung.com \
--cc=devel@driverdev.osuosl.org \
--cc=devicetree@vger.kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=heikki.krogerus@linux.intel.com \
--cc=linux-imx@nxp.com \
--cc=linux-usb@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=peter.chen@nxp.com \
--cc=robh+dt@kernel.org \
--cc=shufan_lee@richtek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).