From patchwork Mon May 28 02:52:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Li X-Patchwork-Id: 10429731 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D4BF4601C7 for ; Mon, 28 May 2018 03:10:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C466D28AF4 for ; Mon, 28 May 2018 03:10:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B8FBA28AF7; Mon, 28 May 2018 03:10:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 03DA528AF4 for ; Mon, 28 May 2018 03:10:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753120AbeE1DKn (ORCPT ); Sun, 27 May 2018 23:10:43 -0400 Received: from mail-eopbgr00058.outbound.protection.outlook.com ([40.107.0.58]:6784 "EHLO EUR02-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753050AbeE1DKl (ORCPT ); Sun, 27 May 2018 23:10:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=NqKWO9TnD/zdPLAlJyciyGZEzUYHt+qAlzejYGmHEFU=; b=JT0uXP9ubIHxDjYOz9LSVMAczb+g8vv3aBQSBRgmlCF/BwFk/w1LWVK+R9+zgVBeyQd5Cx3UTQedczJLlsISQIbjiRnIq0X8TKVOw9JZQeOBEPFAlyTcrHNh3xGFAYVeAjZONcBjqEqH35zVivTWvQIb3497N8sJGnV3QdohtYw= Received: from b47624-OptiPlex-7040.ap.freescale.net (92.121.68.129) by VI1PR0402MB3919.eurprd04.prod.outlook.com (2603:10a6:803:22::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.797.11; Mon, 28 May 2018 03:10:33 +0000 From: Li Jun To: robh+dt@kernel.org, gregkh@linuxfoundation.org, heikki.krogerus@linux.intel.com, linux@roeck-us.net Cc: cw00.choi@samsung.com, a.hajda@samsung.com, shufan_lee@richtek.com, peter.chen@nxp.com, garsilva@embeddedor.com, gsomlo@gmail.com, jun.li@nxp.com, linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-imx@nxp.com Subject: [PATCH v6 15/15] staging: typec: tcpci: move tcpci drivers out of staging Date: Mon, 28 May 2018 10:52:47 +0800 Message-Id: <1527475967-15201-16-git-send-email-jun.li@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1527475967-15201-1-git-send-email-jun.li@nxp.com> References: <1527475967-15201-1-git-send-email-jun.li@nxp.com> MIME-Version: 1.0 X-Originating-IP: [92.121.68.129] X-ClientProxiedBy: HK2PR0302CA0015.apcprd03.prod.outlook.com (2603:1096:202::25) To VI1PR0402MB3919.eurprd04.prod.outlook.com (2603:10a6:803:22::32) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(48565401081)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:VI1PR0402MB3919; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0402MB3919; 3:1DCv3CrHLCQts6VIiPjuhW/5mh9UQf6eArY/Qy8aoFaX6yW78M4tdFXlBjkaTwzkFesaPYyGACIashCgvlosvMOKtM58Tl6uY+B/Dft/LZ27hWS5y4z1S/GCsR0djxxgviRWd7Ss49Lz3aMzn5Y3/0QbSw0dcEx6QykLLsvdSQnIyJJnzr8HycOavojcki7MweJRBLblJ/zrh45+rY1KuceZ5seeOMA1Wq27wjxi8kkOR9dZphz9GjF1rMzBRpq4; 25:lcPDNvGaMYxvQ1HJasbwBLEehxs3EXIi7nl3lJ7x902FD5ttVqkYJamBLNwbp4teuKchZgRbrrmom1Q2s9PuXGULSFQYmVN+EPUTiakW9hi0QvM1WHE3UbshFysRqMCZyPBeb2hx9SAyUEzMupqECqsI7z5KDIC7hEyD7jx6EECK1A21Zjz9QRJgkdfxkyiuEdi4fbXaNMsLfvPRZCuetTZheqKs65ZAZCnFk0uLnMXNiGW4Sc7is09CcvWyjgY+gHbMuDij0vNBakQ7SZ9l75iDvjhzMbx3dMCmhLTr4q71d1ooJE2XkMtTmzRzs9YEXI6RI8YvCxsRZ69bVbzSmA==; 31:2ZjdngC6hCobzMjg8CkgfD8Z9MvR9HQAdRqHJy4tpS2JYsXVBJt4zZjM9/sVwDBMeVu5txjTWBvMBhhtDbZsuwy6A4meoKA1c/I10dSeBP0q7dwdJPWDWcoyl2P4xydxt4lCl8gi38xaMKhSSzEOwJGLv4gtA/o3RKi/A0vr0+FdFqYrIsPeR8rtLNdRGBTCCwIu1Ckn4gxoZ94Y0igxKiZtAam8YcHC8FsoRCdHZoI= X-MS-TrafficTypeDiagnostic: VI1PR0402MB3919: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=jun.li@nxp.com; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0402MB3919; 20:yNKklRNVgKZ4w0TBX5h+kKbOeJl8N8mJOO6y/rRM1up+l46OGYVN+da2b6EEDCdzbS/Tx6Vs+gJLATcn4YYKy/MIyBcnVC9ohhJkh8BB9Xg4hlX6QLMr+cLTiaww0w3vNg+8t+K2G7Pm+rKct78+fvrbdrN4fm7qndSJ8BjoyZcoA1O3uo2JkgfyY0tVI6kq9ELG4Cpltlb3cchDaivp6VBSa7Wmxw52c5DyRXOkGLOSsilEVu1M0CJ/3mRi/Hawg+TZ3HSdzDT0tcRWbUVmG0FxXI39zySe4lDYUCD5P++I8H7DfUSfybJjHAy0ld19UHZCXcOkdnbJ1Rv59eXC4rXAxvYLhuluAg+3/AhsemR846hUvifdfHugoLXOUoebOZFjS9zYQMNVFmeXqAbybUSl1fWRbmR4x6Duji4sz4ISuNKDm0JzrtE9cH5NBZ4AMdeqHh4MzDH28Aeb5gyHUIDLVOfhJdvqEpZYbmTPvZPDtsQ3NwSwakzaQPYl43Ds; 4:gzCSF+3XyEup9RlqZYt/YaoCSX2juPPGLfhv0FaxYQnliX6v5bx9ZnuRd3AokPB4h1CjMrihLebPAFMlvjFge1VQC1cQ+U2JpTNkRBMxMCzBWnDqWq10UUrMWM3aXFrLOlN/UUjvi9NXvbRDNkqUEGYqXz3q0wiCkKrstWwpYfAkaRXv9uYS/wdXzy5m9IsEg7ihDs2gFBnLLktLd72UB3iLhirdk3e7+IjqRU3gm/KSRGfrF774ix84hgPHjAYmK5adbtu4z38b/yccX+40kEaESgYIrUyeTrktSD5k4NZtvGqTPS55f0HLJdNFPe4Kw6TvJf6bBhv8Tm7qFlGl10kYFvehsjei6y2jiF1TCxg= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(228905959029699); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3231254)(944501410)(52105095)(10201501046)(93006095)(93001095)(3002001)(6055026)(149027)(150027)(6041310)(20161123560045)(20161123558120)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(6072148)(201708071742011)(7699016); SRVR:VI1PR0402MB3919; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0402MB3919; X-Forefront-PRVS: 06860EDC7B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(1496009)(39380400002)(396003)(39860400002)(366004)(346002)(376002)(199004)(189003)(6506007)(8676002)(16526019)(305945005)(26005)(7736002)(386003)(486006)(446003)(48376002)(11346002)(956004)(2616005)(2906002)(66066001)(81156014)(186003)(3846002)(81166006)(478600001)(8936002)(50466002)(6486002)(5660300001)(6116002)(6666003)(7416002)(36756003)(50226002)(47776003)(39060400002)(476003)(86362001)(106356001)(68736007)(53936002)(51416003)(105586002)(16586007)(316002)(4326008)(6512007)(76176011)(97736004)(25786009)(52116002); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR0402MB3919; H:b47624-OptiPlex-7040.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR0402MB3919; 23:ykrY3s2E5x6sgYClJM73g2qSlSqxH4R3spjmhpM?= =?us-ascii?Q?L5iI8VRBKwWikIMYbMpcXg0J2JJlVy2sBcrOf/qmM8g029I341BBWVk8ehZj?= =?us-ascii?Q?STwN+a6IlGGHF/YthiPA4TzS5A3DQ/CBh7hC9x/+j+KD9KZuar2G7ZwQNXdz?= =?us-ascii?Q?MaamfstUZPn1tmhkCVl18HdnXEgO4yxI/wAcsr6cHDAPyiLP5MuK9KgcpNwW?= =?us-ascii?Q?6pE3WjyZWnjT6ok+FHL4HjSFWqnFq6K0IKECGYCn/z3GxBh5/zYXYm3XepVa?= =?us-ascii?Q?SR3xi3OVer+Y1+3SdOyur9S+6wNpo9wWVDyYh9BRxVn+hBoPOGilCin4Wzqb?= =?us-ascii?Q?8z6ylSbe0if38L5sKnZW6JX3npmAOgzOA2VjWunr1LbbNR7pyI75RbzgUsqs?= =?us-ascii?Q?f8Q4y/Go1wG2xrz5rbcQsscn/AwFccWKVpBqoT3oIv2jsP83A3CRLlRRVgCW?= =?us-ascii?Q?oyqPNOhxlZ4jIw8WqDjrHdgrAbg2cttEoXSdGxH/LQo3/TxENons0P5fTlWq?= =?us-ascii?Q?C0QGo7OTOvFlfjGV1MlXTBBAMN2zeCMI9vikLE2WpKj9Uc23Tapa2jvOSaIK?= =?us-ascii?Q?AU3v3eApwh/ztK/kU8dkkXZR7u6+Zew6UPoaN1VDNcKO6/rQaCtxWX78lMVC?= =?us-ascii?Q?+jnlOtJh/UJmWPXS76I7mrJ0p6+1VYtm9Aw9jNuhdRjpeRzxoSyttY7E7AbL?= =?us-ascii?Q?misSv3gEMSCiH1FO+eWhg7XMIWOzm516/HkCy3xhAWqI4OIoAtLhm1F9LJss?= =?us-ascii?Q?T/LgFSuE+2dmYYtqeggtUDGz0RUN27TrDgdZrH7Pet+PNf4UkK2IUIKUcQpe?= =?us-ascii?Q?951nkGj+Ygz/9VhydnGPg+un7NcAOPDdM41duhfjkHOkarnL34nGb46M48vq?= =?us-ascii?Q?V86tT3rY0taV+aEVvQoz2SL2J/jJId1jZawAkp6tfjbk2d7U5024dV2bSd7j?= =?us-ascii?Q?hG5zHPQm4mrDxYgpIMgZFW+ISTm6AhRn7aQI+fasKWibVrsOePrb3hh+VAzo?= =?us-ascii?Q?G75BtTiKjU+jJSiha0b+rZT7d04fV9Ow6IpBxWwBmith4GL0IwrIG1jy8d8X?= =?us-ascii?Q?EySn4YVXQGpU6pYvXqt3wjcvc3TIbxQiZxoLG8l0Dh3xsX5X2BAjibCXFamv?= =?us-ascii?Q?QAgLJF2Boj8aiGAyuN3oACcpK2ZqxYgyvO8Rccaxp5Wc9kK9lN9+sfSV058g?= =?us-ascii?Q?+CU3SjrqzpXA7s5lKlkdHN7WyEiHnofK10WoxFFdrBxcI/WJ10GAzjKkkOQ?= =?us-ascii?Q?=3D=3D?= X-Microsoft-Antispam-Message-Info: GrEreEW8cd5tgDf6w/CghXXXAPm83/8RsWt2WQc14EvEC6JJqOVHfk0qGc5BrgLG7wFy2be2MgqSa3Os3mTLOUgCwj0PqZlqGrtFHld0E8x7oi9Ju/EQVdG2eEZ4TFsAAqfZYA5p6x978KJZavoX3jqAWaaIc8hlRymkzjFFJAcHgEWsIAPFWxtKIDgUfb00 X-Microsoft-Exchange-Diagnostics: 1; VI1PR0402MB3919; 6:B6T3Slh4dG8pNp4Of46EwLuHawlj7zKf6s5Vquaj9Id1CxQnX4nQgeLkylVd3+IhLFHKqRE5hKKRsbqkuFwm9KAl4ZIPumAEtCY0ZKwI6/NzCpBw37t418uqpxa5syCcs8HIAHeJavjO9xT5h6+Bx6X6x+VjAna2aD28vHui4LSnFr72TyBexaMIJoCbKBExrrasiMw4+rKQdZuBVSEBX3SXVnnSDoBBTDeS7XxoqyPMu2nOzw7eAyiqTSWPPYrliDoC5OP2ioLArv9KiNdO9tjORs4wo4mGj+/CTxhKUSkOuOIwvJ21YvrJwRm7dwiMxzqt5KZus8FFgZWb/oYYGaWV1gDIlnOHYn+3Sv8pRgmZxBCyo7uuPN9yrIOA3nabi3uvn00JC8mb/zsGJIIcuqYa9fb3zApbT9ZyQ/yPRow3yxAKJmnXvxnwdcn292GRUKGPZcdUaW0mMEfeezhN3A==; 5:n0uqBinQDcSSzD92zN6e5VtRMmIF+7GKi3dRL+6iQx+1Ti8QtqnHJ4hsJtxkybXPbkdyookpMGPPVJur1YqPkKbpEAJnONGWRkBLyIQTCV5SZPgChcZhv8NpLfz51MizjomB5OWoUztSCwE+NamX40c1J0kiweEoQzAvjOTyyOQ=; 24:klathrQO+IvBhKZ/WKZYwdb0qaMJ3GP2FSz9CwK1FL9ROt8D03m9BTxWqCo37RztoYeSEwqDWvyfKJ/KQbJdBaCXosjcsPdFeuq9fzwvflM= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR0402MB3919; 7:t4p4xMiVF+Ov2LwCmK91RKjd6+9PP/1e2khuP7icL+KYLRcMi1Gax4L2Jrce/3Mod/MH24+3PZdfRyxmLHOEKHoiI9WIjtZxqQhSmyzQeY4hS8xPqcmjRmEtLHWpf4G8Q5ajmoYZLQBayeFg3G6CRRfleHdIxqvNaxTUFcWkCBJo0H6jKo4qRDOsf2v/ny1TTGPL2zTUefkan6gtV0eqCD1bn9sGcQK4OU35jEuEujUzQu8RcaxpPJvU2H8vFRJT X-MS-Office365-Filtering-Correlation-Id: 9c12d310-39aa-471b-5f01-08d5c44896d7 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2018 03:10:33.5022 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9c12d310-39aa-471b-5f01-08d5c44896d7 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB3919 Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Move TCPCI(Typec port controller interface) driver and rt1711h driver out of staging. Signed-off-by: Li Jun --- 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 d5926f0..d83ff66 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -112,8 +112,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 919753c..a71ec1f 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_PRISM2_USB) += wlan-ng/ 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 and copy -Heikki Krogerus . 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