From: Li Jun <jun.li@nxp.com>
To: gregkh@linuxfoundation.org, robh+dt@kernel.org,
heikki.krogerus@linux.intel.com, linux@roeck-us.net
Cc: a.hajda@samsung.com, mark.rutland@arm.com, jun.li@nxp.com,
yueyao@google.com, peter.chen@nxp.com, garsilva@embeddedor.com,
o_leveque@orange.fr, shufan_lee@richtek.com,
linux-usb@vger.kernel.org, devicetree@vger.kernel.org,
linux-imx@nxp.com
Subject: [PATCH v2 12/12] staging: typec: tcpci: move tcpci driver out of staging
Date: Mon, 26 Feb 2018 19:49:19 +0800 [thread overview]
Message-ID: <1519645759-12701-13-git-send-email-jun.li@nxp.com> (raw)
In-Reply-To: <1519645759-12701-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 5546839..1e3d5d0 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -112,8 +112,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 6e53602..ba69c52 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_IRDA) += irda/net/
obj-$(CONFIG_IRDA) += irda/drivers/
obj-$(CONFIG_PRISM2_USB) += wlan-ng/
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 bcb2744..711f7ee 100644
--- a/drivers/usb/typec/Kconfig
+++ b/drivers/usb/typec/Kconfig
@@ -54,6 +54,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 bb3138a..59c88b4 100644
--- a/drivers/usb/typec/Makefile
+++ b/drivers/usb/typec/Makefile
@@ -5,3 +5,4 @@ obj-y += fusb302/
obj-$(CONFIG_TYPEC_WCOVE) += typec_wcove.o
obj-$(CONFIG_TYPEC_UCSI) += ucsi/
obj-$(CONFIG_TYPEC_TPS6598X) += tps6598x.o
+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-02-26 12:05 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-26 11:49 [PATCH v2 00/12] staging: typec: tcpci: move out of staging Li Jun
2018-02-26 11:49 ` [PATCH v2 01/12] usb: typec: add API to get port type and preferred role Li Jun
2018-02-26 13:19 ` Heikki Krogerus
2018-03-05 7:54 ` Jun Li
2018-02-26 11:49 ` [PATCH v2 02/12] usb: typec: add API to get sink and source config Li Jun
2018-02-26 13:32 ` Heikki Krogerus
2018-03-05 8:40 ` Jun Li
2018-02-26 11:49 ` [PATCH v2 03/12] staging: typec: tcpci: support port config passed via dt Li Jun
2018-02-26 14:06 ` Heikki Krogerus
2018-02-26 14:30 ` Jun Li
2018-02-27 11:03 ` Heikki Krogerus
2018-03-05 8:53 ` Jun Li
2018-03-05 9:53 ` Heikki Krogerus
2018-03-05 10:35 ` Jun Li
2018-03-05 11:30 ` Heikki Krogerus
2018-03-05 12:38 ` Jun Li
2018-02-26 11:49 ` [PATCH v2 04/12] staging: typec: tcpci: register port before request irq Li Jun
2018-02-26 11:49 ` [PATCH v2 05/12] staging: typec: tcpci: enable vbus detection Li Jun
2018-02-26 11:49 ` [PATCH v2 06/12] typec: tcpm: add starting value for drp toggling Li Jun
2018-02-26 11:49 ` [PATCH v2 07/12] staging: typec: tcpci: correct " Li Jun
2018-02-26 11:49 ` [PATCH v2 08/12] staging: typec: tcpci: keep the uncontact cc line open Li Jun
2018-02-26 11:49 ` [PATCH v2 09/12] staging: typec: tcpci: Only touch target bit when enable vconn Li Jun
2018-02-26 11:49 ` [PATCH v2 10/12] dt-bindings: connector: add properties for typec power delivery Li Jun
2018-02-27 8:41 ` Andrzej Hajda
2018-03-02 22:38 ` Rob Herring
2018-03-05 7:52 ` Jun Li
2018-03-05 12:25 ` Jun Li
2018-03-05 7:00 ` Jun Li
2018-03-05 9:59 ` Andrzej Hajda
2018-03-06 9:38 ` Jun Li
2018-03-06 11:54 ` Andrzej Hajda
2018-03-06 12:02 ` Heikki Krogerus
2018-03-08 1:41 ` Jun Li
2018-03-09 7:34 ` Heikki Krogerus
2018-03-02 22:29 ` Rob Herring
2018-03-05 7:07 ` Jun Li
2018-02-26 11:49 ` [PATCH v2 11/12] dt-bindings: usb: add documentation for typec port controller(TCPCI) Li Jun
2018-03-02 22:56 ` Rob Herring
2018-02-26 11:49 ` 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=1519645759-12701-13-git-send-email-jun.li@nxp.com \
--to=jun.li@nxp.com \
--cc=a.hajda@samsung.com \
--cc=devicetree@vger.kernel.org \
--cc=garsilva@embeddedor.com \
--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=mark.rutland@arm.com \
--cc=o_leveque@orange.fr \
--cc=peter.chen@nxp.com \
--cc=robh+dt@kernel.org \
--cc=shufan_lee@richtek.com \
--cc=yueyao@google.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).