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: a.hajda@samsung.com, jun.li@nxp.com, cw00.choi@samsung.com, shufan_lee@richtek.com, peter.chen@nxp.com, devicetree@vger.kernel.org, linux-usb@vger.kernel.org, linux-imx@nxp.com Subject: [PATCH v7 14/14] staging: typec: tcpci: move tcpci drivers out of staging Date: Mon, 25 Jun 2018 16:08:46 +0800 [thread overview] Message-ID: <1529914126-22550-15-git-send-email-jun.li@nxp.com> (raw) In-Reply-To: <1529914126-22550-1-git-send-email-jun.li@nxp.com> Move TCPCI(Typec port controller interface) driver and rt1711h 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 | 22 ---------------------- drivers/staging/typec/Makefile | 2 -- drivers/staging/typec/TODO | 5 ----- drivers/usb/typec/Kconfig | 15 +++++++++++++++ drivers/usb/typec/Makefile | 2 ++ drivers/{staging => usb}/typec/tcpci.c | 0 drivers/{staging => usb}/typec/tcpci.h | 0 drivers/{staging => usb}/typec/tcpci_rt1711h.c | 0 10 files changed, 17 insertions(+), 32 deletions(-) diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 75a4804..af9a82f 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -106,8 +106,6 @@ source "drivers/staging/greybus/Kconfig" source "drivers/staging/vc04_services/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 e84959a..8479d47 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_PRISM2_USB) += wlan-ng/ obj-$(CONFIG_COMEDI) += comedi/ obj-$(CONFIG_FB_OLPC_DCON) += olpc_dcon/ diff --git a/drivers/staging/typec/Kconfig b/drivers/staging/typec/Kconfig deleted file mode 100644 index 3aa981f..0000000 --- a/drivers/staging/typec/Kconfig +++ /dev/null @@ -1,22 +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. - -config TYPEC_RT1711H - tristate "Richtek RT1711H Type-C chip driver" - select TYPEC_TCPCI - help - Richtek RT1711H Type-C chip driver that works with - Type-C Port Controller Manager to provide USB PD and USB - Type-C functionalities. - -endif - -endmenu diff --git a/drivers/staging/typec/Makefile b/drivers/staging/typec/Makefile deleted file mode 100644 index 7803d48..0000000 --- a/drivers/staging/typec/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_TYPEC_TCPCI) += tcpci.o -obj-$(CONFIG_TYPEC_RT1711H) += tcpci_rt1711h.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 2c8eab1..972fd19 100644 --- a/drivers/usb/typec/Kconfig +++ b/drivers/usb/typec/Kconfig @@ -56,6 +56,21 @@ 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. + +config TYPEC_RT1711H + tristate "Richtek RT1711H Type-C chip driver" + select TYPEC_TCPCI + help + Richtek RT1711H Type-C chip driver that works with + Type-C Port Controller Manager to provide USB PD and USB + Type-C functionalities. + source "drivers/usb/typec/fusb302/Kconfig" config TYPEC_WCOVE diff --git a/drivers/usb/typec/Makefile b/drivers/usb/typec/Makefile index 1f599a6..46f86ee 100644 --- a/drivers/usb/typec/Makefile +++ b/drivers/usb/typec/Makefile @@ -7,3 +7,5 @@ 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 +obj-$(CONFIG_TYPEC_RT1711H) += tcpci_rt1711h.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 diff --git a/drivers/staging/typec/tcpci_rt1711h.c b/drivers/usb/typec/tcpci_rt1711h.c similarity index 100% rename from drivers/staging/typec/tcpci_rt1711h.c rename to drivers/usb/typec/tcpci_rt1711h.c -- 2.7.4
WARNING: multiple messages have this Message-ID (diff)
From: Jun Li <jun.li@nxp.com> To: robh+dt@kernel.org, gregkh@linuxfoundation.org, heikki.krogerus@linux.intel.com, linux@roeck-us.net Cc: a.hajda@samsung.com, jun.li@nxp.com, cw00.choi@samsung.com, shufan_lee@richtek.com, peter.chen@nxp.com, devicetree@vger.kernel.org, linux-usb@vger.kernel.org, linux-imx@nxp.com Subject: [v7,14/14] staging: typec: tcpci: move tcpci drivers out of staging Date: Mon, 25 Jun 2018 16:08:46 +0800 [thread overview] Message-ID: <1529914126-22550-15-git-send-email-jun.li@nxp.com> (raw) Move TCPCI(Typec port controller interface) driver and rt1711h 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 | 22 ---------------------- drivers/staging/typec/Makefile | 2 -- drivers/staging/typec/TODO | 5 ----- drivers/usb/typec/Kconfig | 15 +++++++++++++++ drivers/usb/typec/Makefile | 2 ++ drivers/{staging => usb}/typec/tcpci.c | 0 drivers/{staging => usb}/typec/tcpci.h | 0 drivers/{staging => usb}/typec/tcpci_rt1711h.c | 0 10 files changed, 17 insertions(+), 32 deletions(-) diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 75a4804..af9a82f 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -106,8 +106,6 @@ source "drivers/staging/greybus/Kconfig" source "drivers/staging/vc04_services/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 e84959a..8479d47 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_PRISM2_USB) += wlan-ng/ obj-$(CONFIG_COMEDI) += comedi/ obj-$(CONFIG_FB_OLPC_DCON) += olpc_dcon/ diff --git a/drivers/staging/typec/Kconfig b/drivers/staging/typec/Kconfig deleted file mode 100644 index 3aa981f..0000000 --- a/drivers/staging/typec/Kconfig +++ /dev/null @@ -1,22 +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. - -config TYPEC_RT1711H - tristate "Richtek RT1711H Type-C chip driver" - select TYPEC_TCPCI - help - Richtek RT1711H Type-C chip driver that works with - Type-C Port Controller Manager to provide USB PD and USB - Type-C functionalities. - -endif - -endmenu diff --git a/drivers/staging/typec/Makefile b/drivers/staging/typec/Makefile deleted file mode 100644 index 7803d48..0000000 --- a/drivers/staging/typec/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -obj-$(CONFIG_TYPEC_TCPCI) += tcpci.o -obj-$(CONFIG_TYPEC_RT1711H) += tcpci_rt1711h.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 2c8eab1..972fd19 100644 --- a/drivers/usb/typec/Kconfig +++ b/drivers/usb/typec/Kconfig @@ -56,6 +56,21 @@ 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. + +config TYPEC_RT1711H + tristate "Richtek RT1711H Type-C chip driver" + select TYPEC_TCPCI + help + Richtek RT1711H Type-C chip driver that works with + Type-C Port Controller Manager to provide USB PD and USB + Type-C functionalities. + source "drivers/usb/typec/fusb302/Kconfig" config TYPEC_WCOVE diff --git a/drivers/usb/typec/Makefile b/drivers/usb/typec/Makefile index 1f599a6..46f86ee 100644 --- a/drivers/usb/typec/Makefile +++ b/drivers/usb/typec/Makefile @@ -7,3 +7,5 @@ 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 +obj-$(CONFIG_TYPEC_RT1711H) += tcpci_rt1711h.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 diff --git a/drivers/staging/typec/tcpci_rt1711h.c b/drivers/usb/typec/tcpci_rt1711h.c similarity index 100% rename from drivers/staging/typec/tcpci_rt1711h.c rename to drivers/usb/typec/tcpci_rt1711h.c
next prev parent reply other threads:[~2018-06-25 8:08 UTC|newest] Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-06-25 8:08 [PATCH v7 00/14] staging: typec: tcpci: move out of staging Li Jun 2018-06-25 8:08 ` [PATCH v7 01/14] dt-bindings: connector: add properties for typec Li Jun 2018-06-25 8:08 ` [v7,01/14] " Jun Li 2018-06-25 8:08 ` [PATCH v7 02/14] dt-bindings: usb: add documentation for typec port controller(TCPCI) Li Jun 2018-06-25 8:08 ` [v7,02/14] " Jun Li 2018-06-25 8:08 ` [PATCH v7 03/14] staging: typec: tcpci: add compatible string for nxp ptn5110 Li Jun 2018-06-25 8:08 ` [v7,03/14] " Jun Li 2018-06-25 8:08 ` [PATCH v7 04/14] usb: typec: add fwnode to tcpc Li Jun 2018-06-25 8:08 ` [v7,04/14] " Jun Li 2018-06-25 8:08 ` [PATCH v7 05/14] usb: typec: add API to get typec basic port power and data config Li Jun 2018-06-25 8:08 ` [v7,05/14] " Jun Li 2018-06-26 8:14 ` [PATCH v7 05/14] " Heikki Krogerus 2018-06-26 8:14 ` [v7,05/14] " Heikki Krogerus 2018-06-25 8:08 ` [PATCH v7 06/14] usb: typec: tcpm: support get typec and pd config from device properties Li Jun 2018-06-25 8:08 ` [v7,06/14] " Jun Li 2018-06-25 10:45 ` [PATCH v7 06/14] " Adam Thomson 2018-06-25 10:45 ` [v7,06/14] " Opensource [Adam Thomson] 2018-06-26 15:01 ` [PATCH v7 06/14] " Jun Li 2018-06-26 15:01 ` [v7,06/14] " Jun Li 2018-06-25 8:08 ` [PATCH v7 07/14] staging: typec: tcpci: remove unused tcpci_tcpc_config Li Jun 2018-06-25 8:08 ` [v7,07/14] " Jun Li 2018-06-25 8:08 ` [PATCH v7 08/14] staging: typec: tcpci: use IS_ERR() instead of PTR_ERR_OR_ZERO() Li Jun 2018-06-25 8:08 ` [v7,08/14] " Jun Li 2018-06-25 8:08 ` [PATCH v7 09/14] staging: typec: tcpci: register port before request irq Li Jun 2018-06-25 8:08 ` [v7,09/14] " Jun Li 2018-06-25 8:08 ` [PATCH v7 10/14] staging: typec: tcpci: enable vbus detection Li Jun 2018-06-25 8:08 ` [v7,10/14] " Jun Li 2018-06-25 8:08 ` [PATCH v7 11/14] typec: tcpm: add starting value for drp toggling Li Jun 2018-06-25 8:08 ` [v7,11/14] " Jun Li 2018-06-25 8:08 ` [PATCH v7 12/14] staging: typec: tcpci: keep the disconnected cc line open Li Jun 2018-06-25 8:08 ` [v7,12/14] " Jun Li 2018-06-25 8:08 ` [PATCH v7 13/14] staging: typec: tcpci: Only touch target bit when enable vconn Li Jun 2018-06-25 8:08 ` [v7,13/14] " Jun Li 2018-06-25 8:08 ` Li Jun [this message] 2018-06-25 8:08 ` [v7,14/14] staging: typec: tcpci: move tcpci drivers out of staging Jun Li
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=1529914126-22550-15-git-send-email-jun.li@nxp.com \ --to=jun.li@nxp.com \ --cc=a.hajda@samsung.com \ --cc=cw00.choi@samsung.com \ --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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.