From patchwork Mon Jun 25 08:08:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Li X-Patchwork-Id: 10485265 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 EABDF6031B for ; Mon, 25 Jun 2018 08:27:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D57DF2889E for ; Mon, 25 Jun 2018 08:27:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C9E58288EF; Mon, 25 Jun 2018 08:27:07 +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 3F4762889E for ; Mon, 25 Jun 2018 08:27:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754207AbeFYI1E (ORCPT ); Mon, 25 Jun 2018 04:27:04 -0400 Received: from mail-db5eur01on0053.outbound.protection.outlook.com ([104.47.2.53]:64032 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752395AbeFYI1B (ORCPT ); Mon, 25 Jun 2018 04:27:01 -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=c/H4ILFkt1sW6x7VDyM2Zz9PrmNYTXbNTxzuUyLZfuw=; b=Am3NBVHFuznm7HMEKis+NFqyQlzN0wW/yjrsxT56otHdCwEfKZdxit3ih5oiewPNDpWKLxjzMTb6POr1SnpyIVMO6fJlvDLXcoObvUAShEIP+FHbv3KufCtaCmC+roeP+Dhh9klZPOv/RU9IPTGJFZHJswsf+VJxfm57F/i0y7Y= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=jun.li@nxp.com; Received: from b47624-OptiPlex-7040.ap.freescale.net (92.121.68.129) by VI1PR0402MB3920.eurprd04.prod.outlook.com (2603:10a6:803:23::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.884.24; Mon, 25 Jun 2018 08:26:53 +0000 From: Li Jun 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 Message-Id: <1529914126-22550-15-git-send-email-jun.li@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1529914126-22550-1-git-send-email-jun.li@nxp.com> References: <1529914126-22550-1-git-send-email-jun.li@nxp.com> MIME-Version: 1.0 X-Originating-IP: [92.121.68.129] X-ClientProxiedBy: HK0PR04CA0004.apcprd04.prod.outlook.com (2603:1096:203:36::16) To VI1PR0402MB3920.eurprd04.prod.outlook.com (2603:10a6:803:23::12) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 93095be5-4ee3-413a-7e93-08d5da756aa4 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(8989117)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600026)(711020)(48565401081)(2017052603328)(7153060)(7193020); SRVR:VI1PR0402MB3920; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0402MB3920; 3:7+whzuAaqgZFhT0c2eDGlZMqPQSaH+U2odnCuLIX9jTtalZeobfatOvFWtXnlpsbcCJX/Oyn/l/KM0nj0nC9hlD9DV/BwqGiKbIWc0kEyWGi0zq2EM5/SlPHJSgBfXIf/XvPdt+MMriR8nKzmE5kFkwbww6CGFxNdBpPLbT5W+eBEovKL8fG+jjwvTvQeJ32nPuahGQ5FIYDYTB24SBZhszhzfbAmkz5am+18LWKvjp38U1xMSQVfbpmxGdaahlB; 25:vMSZ6sTXf6K6JcJB831j65YktxozOEKr0ud03lCOgKAG3QqEYtROhK+44VKYf+Aqy/O9PT4kaWVHjGACwTGBot1cJYarlvQmIQ2h1tNfdMyNDpHFlEm5jH4H0tdBjLm2nOLMCO1ylGcKAt3JhIeFV5hF2S/cinXpJLLG71wjRNu+4f1xK5HrShajUCjLROzCpoM+i/6FEpFwMUcinkhla6Ru01QfSQjY7JJjlX/GzzSmlnc4USH9sguSw80EuCQgGZZNjgWA4ImOQXIcYQ3CgUBsmvXyAejcyp4aDQjek6v7KGuAZc8A4woTR/XZekMQurfDMeqLkAwDyMpaZYYCzA==; 31:/HkKZJhcBP082LcM3qoDU0QecdRIJF7HesMVYA3H2bBKLKkMDrKz+drCzVhqNxR66jqItz17xNE/9A7/ft3Po+8EO88L/BsxTCZllqxZ3zRdnx1wxxn83RlLnSc2laPfsPKnpKbouFreaN01ZE3OymgU7Xux1tHSt96L6hCW80AbR+y2Sii1ZDTc4ee3fA84D8LjUz7KOCu/iHGwsQKBFWufD9G77dBGc8bKiCyeWl0= X-MS-TrafficTypeDiagnostic: VI1PR0402MB3920: X-Microsoft-Exchange-Diagnostics: 1; VI1PR0402MB3920; 20:D0WlVGCXp5aF/aO+3WkXAlZokcaFvBWiLe9xk17jM+ClFzj5gDSO/MdYaf4xCoCr6OkAdJ/3AeBCCGaWU+uMGjiphph3wIG5zautX6Snr2D4VmAwL5A7R2pihrBE+ZVlUOTCkE0zD+2z514bV7sfrEXniBU512ILnQDBWZWcHURBZi4RckVNorma4727YcelgtbJ2we0ekj3K7OUsxZ1H1+RhicbNvG3Kz9qx3ro7zzEb3szmSI5bvaYzth1L1ZU0J0MsphMNxAIUlAt1ylXRBMUPGnKXSSwI42/u1ilPfe02e7+kfWPWiHRQhRQnmk1GCzzxRMIxpTXBrez0l9ptPZw4Z7robYKt1k51bW1U7symDrZ0bTYVwOkUSCJeG9Y3zgzAP/CcnLZtDHYWE5cZ4Cyrzqtfq3UhXX63bJpMjWZCwfiLImYwYWdKz8RXmUAWi/VR7C7f/9TKCrg9GX+GEpYHYHBvkv+7xr3sjpYcDI8m+1OKZp1my/LVSK5BZ0T; 4:BMw8EVdAcdYb1kp2ERcwTA5Iuy0odhlwkZRg1bN4YKhHR3fqEnwNjm4+LZ516c8xa4GROYuEivppxE52frjGjoBEve6o1AvYVm40ZoQcomobArj5GtdsP5Lq1qU2dpYH9/pl3IxouOVYjAtSdqacNlUyoSSQd+GknGlNZz3HJmukJLzZ0O8CaRo2A4Pttzve3uu5dyYYC+sxkCJpbnx+fFc71j/PiLR/7rlhDITwiLojpHeoSZ+6Ae8LIWX1o8+xp+/9sj1fkzz6yIOApVufioi/tCBSz70v2UeK5+GlMoY1mm979KQYFoiIFK1rry0kOPsr8VXZu9OiWjFy3HUQkRG0NWJRPVA0Zys8yNiBpLQ= 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)(93006095)(93001095)(10201501046)(3002001)(3231254)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123560045)(20161123564045)(20161123558120)(6072148)(201708071742011)(7699016); SRVR:VI1PR0402MB3920; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0402MB3920; X-Forefront-PRVS: 0714841678 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(346002)(39380400002)(39860400002)(396003)(376002)(199004)(189003)(53936002)(25786009)(47776003)(316002)(2906002)(16586007)(6486002)(36756003)(4326008)(386003)(6506007)(186003)(6512007)(478600001)(26005)(16526019)(97736004)(8936002)(86362001)(50226002)(52116002)(476003)(81166006)(81156014)(486006)(76176011)(305945005)(51416003)(8676002)(2616005)(6666003)(105586002)(68736007)(446003)(11346002)(66066001)(5660300001)(7736002)(50466002)(3846002)(106356001)(48376002)(6116002)(956004); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR0402MB3920; 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; VI1PR0402MB3920; 23:kJauWNlB3aeadx3bmSbReKdZBo920x2paN4F2l9?= =?us-ascii?Q?KjewI5Jur3QOepIMWO7YmznbExLtnC8dC8PZRHmmqkFAkIwtTahxaunuSuk3?= =?us-ascii?Q?FC8b/bx2xKVU24MFqbtX/N46AM/fDg0Q8X47/47v4SA03fVBKmaBDQCxrjaV?= =?us-ascii?Q?XtUHtAr0qUqvmiuNZuak6y+PDeG9vuvaOUxUzasoR6lsylYDeRez26szSibG?= =?us-ascii?Q?7DWsv5f8wSTs3ty+8kaECqfXymuN1oea5iSXFCufVh0hO5ZY0LHlZdPyX5DN?= =?us-ascii?Q?ezNTejkCD/4qglW25UabIufC71b7MM7h8PqvqL/yz15M2y3MGXl1+7cgkRvs?= =?us-ascii?Q?lKJPcJ1DWPCN9/32wwpbud30fE78Qij4ubfSBxN+1A+efRbEXTBRmN1mRhy/?= =?us-ascii?Q?v5HMFcmLjS/sPvUDCIYBZ1qjqj9U2hwTMSJAjdUoDdnHzO7zKybOVn0C/BxQ?= =?us-ascii?Q?E9xWXSl+nwEU50FDMU80JJR+T8hnvyTvFxLE3Oe/y4V1CP3yYNQtC/n86oiu?= =?us-ascii?Q?j2/6cgwMZ73oIEn6REWq+c8il1GWPxaD3ALDPw6s99914vsjmPzJ1VhqL87v?= =?us-ascii?Q?vmXS7NaoDb++2IWHwtdGzVI9Y6FNDJqs75ZvbsHCrLbh5PDi3+lgrdOfq/fu?= =?us-ascii?Q?xRgT/uGa2CUmHBUE2lMcS5EqISVQibrP8SaHL27J6aKM2eXAWNNS0LqPi7l4?= =?us-ascii?Q?Rljuurq3MV22mfgdDHBmC9YF4fRiB2TqwTwMlwx1paf78eOD5evjW2pnHcX/?= =?us-ascii?Q?ddPZ0jzdhAyaasdSePKEQOO7ROqTBpl5Hztw3vDnBO+JKNIUIhhqtMZyrMBI?= =?us-ascii?Q?OxrNz2jqrqKcjv9Xm40vwuegNujZY2XpNQs8C95ZG+jSMKl9k0v0PG//esxj?= =?us-ascii?Q?jGCulEFEx3LQDmm3ImrSgBzQOfcerrT8Kud787XeSodPfJbQakm4KwWxvGVJ?= =?us-ascii?Q?gSDuVt7GqUaQMWsL5HhMdxF2Eq1qg8AgZ3rFmstBkpUNkRR/NADd12OA8jwL?= =?us-ascii?Q?0YA5UJc8n6tqZp0sZUG4lzWdOhbe+M0BmTZMQZAHUFHpo/WgSIdvIhtz7SDo?= =?us-ascii?Q?TZEOdMW5pE2P4Rj9Xuh9p46uhA7Kq5REZi0oD7Je85ZCuUelStI5Y8VK5SIV?= =?us-ascii?Q?prBOcwuHTgDTuUaa0aif6FZ7FfGbxY+Ojy86d7mWhl/PTVquGgFlTlQ=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Antispam-Message-Info: g8ncMJF8SajvZoxSLvAY3FMuEM+0gZm9NLFdK5sswDS8+ZAiQuQ3KGxbJTTWTpzn+1pi2lqcwFQLUjjBsNyc+iTwmEii6Ol8m7CDjk5Yvlb7lX2x1UBFdQLHtxEYVfHpgOliQ1DTlgOgkcJO/RvBPygmli6HLxD15zD3f3xJkZLH4EEzYbiwPTHpcRmprkEhvQS9UZsS9dgha6NAtnbJYIsqrCXG2GGpC8z+iQryMwdqE9rbYT4nOI4YijinsRFTvMMfYxAfv7cz8Lf75GFysm94ToQK22igwlrOWIGNvR5U9UZL5eae/JfHTv1vcJSkor5okjkWVv0Rjgfg4NsYKiFbwdmoWfRW8FFkAw042WM= X-Microsoft-Exchange-Diagnostics: 1; VI1PR0402MB3920; 6:tfbHQBSpxFqDEPTOdwOl5SVDV4X1VfOYuWD38AEwQoEEGhg2Vq8ZL607fZVnV5va3i+LKMHenvjIaOhBD0YuPEXMhFBnyBoMLw2J2H4NKBpuDPhhAM+cRQZa9acATQQBDwCgd4ieM0pLQEyhM/JmrILQVysvkf9ICWBHMPZpqfY/RLouyX56kVZtz3EuzSkrXPIi0wjxq4F4m5bSS+yvbb3hTNL4UetnumWrKLtXIM/miaVOKfvwzawS1emiGoFbSYQiGP4xsI55YYB/zGNLWTiOixMJCbvgA8A18exVzx6XTwbFcdCQ9+voSaUdNXVZk3tfJy+rGzvtKyxgeASe3kAyaqeSxb4RU7Xcv1Z4pM+dYlKUPkeU9R96NCp53tAUImYSEgYUCpXHHk/Q0Uk1nV61JKF+BqS4ypUZvGf6TidxmOLKnZmHyfqkkTXttIN06s+qxyUA6JFjate1/8UFCg==; 5:nO+CKlvVcsig4/xFXPrqVl4MyVhf7srk/gGXlysY0LhM/MJW5neVBZV2c60yWMze6I8YdLrddXXGsZurCUzvthaLpgsGXmHCYzkaLqDr3DGYXxbaS9PdwvzMr6TMu+KS+lV1edSIXOsymZnYQhEeyBBN1rd1r2kPut7fXFgq8VE=; 24:e+Le8+U30T6CqarQpkYVeLpuOBC9g3xXYT6iQSIjYILIHMIakukZlcksfG4dkv70OZoUjLXnFSH96wYbBoAUlpKxmXcdmQJ6RcrnaQmiq4E= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR0402MB3920; 7:t5vIc4dfQmMqVujbisnUQ1Sw9lpNGbGMURGVhTegRDyv96yNF29kHjk2G9MqO1r932vnQgi7XDyiIyhmY4A76tX340Kn9MGnz7+q1+dMtZSubYmNqsSt7iwCWz8bod+PoYvvSg4IrBYTZP8mjwvSF4AtEODXZE5Vv3k5xu75t+t5DWbjl/ovvJkFAjr0ag2VtHpCwEiPJwuEXnKCr40P3dGYybcGO2Z16kap7keN0ACVt/D5VCi+Om83LxV1i9v2 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jun 2018 08:26:53.2049 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 93095be5-4ee3-413a-7e93-08d5da756aa4 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB3920 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 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 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