From mboxrd@z Thu Jan 1 00:00:00 1970 From: Li Jun Subject: [PATCH v4 13/13] staging: typec: tcpci: move tcpci driver out of staging Date: Thu, 29 Mar 2018 00:06:18 +0800 Message-ID: <1522253178-32414-14-git-send-email-jun.li@nxp.com> References: <1522253178-32414-1-git-send-email-jun.li@nxp.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1522253178-32414-1-git-send-email-jun.li@nxp.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: driverdev-devel-bounces@linuxdriverproject.org Sender: "devel" 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 List-Id: devicetree@vger.kernel.org Move TCPCI(Typec port controller interface) driver out of staging. Signed-off-by: Li Jun --- 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 and copy -Heikki Krogerus . 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 From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [v4,13/13] staging: typec: tcpci: move tcpci driver out of staging From: Jun Li Message-Id: <1522253178-32414-14-git-send-email-jun.li@nxp.com> Date: Thu, 29 Mar 2018 00:06:18 +0800 To: robh+dt@kernel.org, gregkh@linuxfoundation.org, heikki.krogerus@linux.intel.com, linux@roeck-us.net Cc: a.hajda@samsung.com, shufan_lee@richtek.com, peter.chen@nxp.com, devicetree@vger.kernel.org, linux-usb@vger.kernel.org, linux-imx@nxp.com, jun.li@nxp.com, devel@driverdev.osuosl.org List-ID: TW92ZSBUQ1BDSShUeXBlYyBwb3J0IGNvbnRyb2xsZXIgaW50ZXJmYWNlKSBkcml2ZXIgb3V0IG9m IHN0YWdpbmcuCgpTaWduZWQtb2ZmLWJ5OiBMaSBKdW4gPGp1bi5saUBueHAuY29tPgotLS0KIGRy aXZlcnMvc3RhZ2luZy9LY29uZmlnICAgICAgICAgICAgICAgIHwgIDIgLS0KIGRyaXZlcnMvc3Rh Z2luZy9NYWtlZmlsZSAgICAgICAgICAgICAgIHwgIDEgLQogZHJpdmVycy9zdGFnaW5nL3R5cGVj L0tjb25maWcgICAgICAgICAgfCAxNCAtLS0tLS0tLS0tLS0tLQogZHJpdmVycy9zdGFnaW5nL3R5 cGVjL01ha2VmaWxlICAgICAgICAgfCAgMSAtCiBkcml2ZXJzL3N0YWdpbmcvdHlwZWMvVE9ETyAg ICAgICAgICAgICB8ICA1IC0tLS0tCiBkcml2ZXJzL3VzYi90eXBlYy9LY29uZmlnICAgICAgICAg ICAgICB8ICA3ICsrKysrKysKIGRyaXZlcnMvdXNiL3R5cGVjL01ha2VmaWxlICAgICAgICAgICAg IHwgIDEgKwogZHJpdmVycy97c3RhZ2luZyA9PiB1c2J9L3R5cGVjL3RjcGNpLmMgfCAgMAogZHJp dmVycy97c3RhZ2luZyA9PiB1c2J9L3R5cGVjL3RjcGNpLmggfCAgMAogOSBmaWxlcyBjaGFuZ2Vk LCA4IGluc2VydGlvbnMoKyksIDIzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMv c3RhZ2luZy9LY29uZmlnIGIvZHJpdmVycy9zdGFnaW5nL0tjb25maWcKaW5kZXggZTk1YWI2OC4u NzUxOTM3ZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9zdGFnaW5nL0tjb25maWcKKysrIGIvZHJpdmVy cy9zdGFnaW5nL0tjb25maWcKQEAgLTExNiw4ICsxMTYsNiBAQCBzb3VyY2UgImRyaXZlcnMvc3Rh Z2luZy92YzA0X3NlcnZpY2VzL0tjb25maWciCiAKIHNvdXJjZSAiZHJpdmVycy9zdGFnaW5nL2Nj cmVlL0tjb25maWciCiAKLXNvdXJjZSAiZHJpdmVycy9zdGFnaW5nL3R5cGVjL0tjb25maWciCi0K IHNvdXJjZSAiZHJpdmVycy9zdGFnaW5nL3Zib3h2aWRlby9LY29uZmlnIgogCiBzb3VyY2UgImRy aXZlcnMvc3RhZ2luZy9waTQzMy9LY29uZmlnIgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9zdGFnaW5n L01ha2VmaWxlIGIvZHJpdmVycy9zdGFnaW5nL01ha2VmaWxlCmluZGV4IGFmOGNkNmEuLjAzOTY5 M2UgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvc3RhZ2luZy9NYWtlZmlsZQorKysgYi9kcml2ZXJzL3N0 YWdpbmcvTWFrZWZpbGUKQEAgLTIsNyArMiw2IEBACiAjIE1ha2VmaWxlIGZvciBzdGFnaW5nIGRp cmVjdG9yeQogCiBvYmoteQkJCQkrPSBtZWRpYS8KLW9iai15CQkJCSs9IHR5cGVjLwogb2JqLSQo Q09ORklHX0lQWCkJCSs9IGlweC8KIG9iai0kKENPTkZJR19OQ1BfRlMpCQkrPSBuY3Bmcy8KIG9i ai0kKENPTkZJR19JUkRBKQkJKz0gaXJkYS9uZXQvCmRpZmYgLS1naXQgYS9kcml2ZXJzL3N0YWdp bmcvdHlwZWMvS2NvbmZpZyBiL2RyaXZlcnMvc3RhZ2luZy90eXBlYy9LY29uZmlnCmRlbGV0ZWQg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCA1MzU5ZjU1Li4wMDAwMDAwCi0tLSBhL2RyaXZlcnMvc3Rh Z2luZy90eXBlYy9LY29uZmlnCisrKyAvZGV2L251bGwKQEAgLTEsMTQgKzAsMCBAQAotbWVudSAi VVNCIFBvd2VyIERlbGl2ZXJ5IGFuZCBUeXBlLUMgZHJpdmVycyIKLQotaWYgVFlQRUNfVENQTQot Ci1jb25maWcgVFlQRUNfVENQQ0kKLQl0cmlzdGF0ZSAiVHlwZS1DIFBvcnQgQ29udHJvbGxlciBJ bnRlcmZhY2UgZHJpdmVyIgotCWRlcGVuZHMgb24gSTJDCi0Jc2VsZWN0IFJFR01BUF9JMkMKLQlo ZWxwCi0JICBUeXBlLUMgUG9ydCBDb250cm9sbGVyIGRyaXZlciBmb3IgVENQQ0ktY29tcGxpYW50 IGNvbnRyb2xsZXIuCi0KLWVuZGlmCi0KLWVuZG1lbnUKZGlmZiAtLWdpdCBhL2RyaXZlcnMvc3Rh Z2luZy90eXBlYy9NYWtlZmlsZSBiL2RyaXZlcnMvc3RhZ2luZy90eXBlYy9NYWtlZmlsZQpkZWxl dGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggNTNkNjQ5YS4uMDAwMDAwMAotLS0gYS9kcml2ZXJz L3N0YWdpbmcvdHlwZWMvTWFrZWZpbGUKKysrIC9kZXYvbnVsbApAQCAtMSArMCwwIEBACi1vYmot JChDT05GSUdfVFlQRUNfVENQQ0kpCSs9IHRjcGNpLm8KZGlmZiAtLWdpdCBhL2RyaXZlcnMvc3Rh Z2luZy90eXBlYy9UT0RPIGIvZHJpdmVycy9zdGFnaW5nL3R5cGVjL1RPRE8KZGVsZXRlZCBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDUzZmUyZjcuLjAwMDAwMDAKLS0tIGEvZHJpdmVycy9zdGFnaW5n L3R5cGVjL1RPRE8KKysrIC9kZXYvbnVsbApAQCAtMSw1ICswLDAgQEAKLXRjcGNpOgotLSBUZXN0 IHdpdGggcmVhbCBoYXJkd2FyZQotCi1QbGVhc2Ugc2VuZCBwYXRjaGVzIHRvIEd1ZW50ZXIgUm9l Y2sgPGxpbnV4QHJvZWNrLXVzLm5ldD4gYW5kIGNvcHkKLUhlaWtraSBLcm9nZXJ1cyA8aGVpa2tp Lmtyb2dlcnVzQGxpbnV4LmludGVsLmNvbT4uCmRpZmYgLS1naXQgYS9kcml2ZXJzL3VzYi90eXBl Yy9LY29uZmlnIGIvZHJpdmVycy91c2IvdHlwZWMvS2NvbmZpZwppbmRleCAwMzBmODhjLi4yYjhk M2MyIDEwMDY0NAotLS0gYS9kcml2ZXJzL3VzYi90eXBlYy9LY29uZmlnCisrKyBiL2RyaXZlcnMv dXNiL3R5cGVjL0tjb25maWcKQEAgLTU1LDYgKzU1LDEzIEBAIGNvbmZpZyBUWVBFQ19UQ1BNCiAK IGlmIFRZUEVDX1RDUE0KIAorY29uZmlnIFRZUEVDX1RDUENJCisJdHJpc3RhdGUgIlR5cGUtQyBQ b3J0IENvbnRyb2xsZXIgSW50ZXJmYWNlIGRyaXZlciIKKwlkZXBlbmRzIG9uIEkyQworCXNlbGVj dCBSRUdNQVBfSTJDCisJaGVscAorCSAgVHlwZS1DIFBvcnQgQ29udHJvbGxlciBkcml2ZXIgZm9y IFRDUENJLWNvbXBsaWFudCBjb250cm9sbGVyLgorCiBzb3VyY2UgImRyaXZlcnMvdXNiL3R5cGVj L2Z1c2IzMDIvS2NvbmZpZyIKIAogY29uZmlnIFRZUEVDX1dDT1ZFCmRpZmYgLS1naXQgYS9kcml2 ZXJzL3VzYi90eXBlYy9NYWtlZmlsZSBiL2RyaXZlcnMvdXNiL3R5cGVjL01ha2VmaWxlCmluZGV4 IDFmNTk5YTYuLjAyNzU4YTEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvdXNiL3R5cGVjL01ha2VmaWxl CisrKyBiL2RyaXZlcnMvdXNiL3R5cGVjL01ha2VmaWxlCkBAIC03LDMgKzcsNCBAQCBvYmotJChD T05GSUdfVFlQRUNfV0NPVkUpCSs9IHR5cGVjX3djb3ZlLm8KIG9iai0kKENPTkZJR19UWVBFQ19V Q1NJKQkrPSB1Y3NpLwogb2JqLSQoQ09ORklHX1RZUEVDX1RQUzY1OThYKQkrPSB0cHM2NTk4eC5v CiBvYmotJChDT05GSUdfVFlQRUMpCQkrPSBtdXgvCitvYmotJChDT05GSUdfVFlQRUNfVENQQ0kp CSs9IHRjcGNpLm8KZGlmZiAtLWdpdCBhL2RyaXZlcnMvc3RhZ2luZy90eXBlYy90Y3BjaS5jIGIv ZHJpdmVycy91c2IvdHlwZWMvdGNwY2kuYwpzaW1pbGFyaXR5IGluZGV4IDEwMCUKcmVuYW1lIGZy b20gZHJpdmVycy9zdGFnaW5nL3R5cGVjL3RjcGNpLmMKcmVuYW1lIHRvIGRyaXZlcnMvdXNiL3R5 cGVjL3RjcGNpLmMKZGlmZiAtLWdpdCBhL2RyaXZlcnMvc3RhZ2luZy90eXBlYy90Y3BjaS5oIGIv ZHJpdmVycy91c2IvdHlwZWMvdGNwY2kuaApzaW1pbGFyaXR5IGluZGV4IDEwMCUKcmVuYW1lIGZy b20gZHJpdmVycy9zdGFnaW5nL3R5cGVjL3RjcGNpLmgKcmVuYW1lIHRvIGRyaXZlcnMvdXNiL3R5 cGVjL3RjcGNpLmgK