From patchwork Tue Jun 26 23:45:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Li X-Patchwork-Id: 10490351 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 DC6A360325 for ; Wed, 27 Jun 2018 00:03:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CF8911FF13 for ; Wed, 27 Jun 2018 00:03:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C32EB26E54; Wed, 27 Jun 2018 00:03:42 +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 293431FF13 for ; Wed, 27 Jun 2018 00:03:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934349AbeF0ADk (ORCPT ); Tue, 26 Jun 2018 20:03:40 -0400 Received: from mail-he1eur01on0084.outbound.protection.outlook.com ([104.47.0.84]:40736 "EHLO EUR01-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S934331AbeF0ADj (ORCPT ); Tue, 26 Jun 2018 20:03:39 -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=Pe3i661jOuOyQlvSLHU9b+zDbjyCohiEMcIfSBn8k5p/bvV3/d4b+PMaqTJvJL6FlV4REbH53frQ/+mXAHNb9RE6nHwfg7g7KKQGfHDnc00bU48Af6kDJjyg0jkyBCpFIwHcvEohctB9SQS+HNgmX43W8u+OVus1rqgEvwi1zWk= 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 AM0PR0402MB3908.eurprd04.prod.outlook.com (2603:10a6:208:f::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.884.22; Wed, 27 Jun 2018 00:03:32 +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 v8 14/14] staging: typec: tcpci: move tcpci drivers out of staging Date: Wed, 27 Jun 2018 07:45:32 +0800 Message-Id: <1530056732-9640-15-git-send-email-jun.li@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1530056732-9640-1-git-send-email-jun.li@nxp.com> References: <1530056732-9640-1-git-send-email-jun.li@nxp.com> MIME-Version: 1.0 X-Originating-IP: [92.121.68.129] X-ClientProxiedBy: HK0P153CA0011.APCP153.PROD.OUTLOOK.COM (2603:1096:203:18::23) To AM0PR0402MB3908.eurprd04.prod.outlook.com (2603:10a6:208:f::28) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9c747f70-05ab-4b6e-e64d-08d5dbc16e32 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:AM0PR0402MB3908; X-Microsoft-Exchange-Diagnostics: 1; AM0PR0402MB3908; 3:lrJmQbpQsXQ2O3RJw5h0aJAuVMFoiPqNsjbWW7jzAVOpSLPpxZ1XsJni4TVapUmrANTw9VgsgzPZGDrVhKQGNr1H302o8/MUYeIaZxYyiQvu1BEf7aB7rAJ1IZMK7Bfccgs5M9+Y/7RcbMoV0X62y/k5WB99MmCnFB6jHxtKLPnDZYybKtYn7+uHZw2SaF5BJHmpm3cxVCbc2mLzs1clApIuB8LUppSyxZg/L5wdL8lqVpN6ednY1tNz05Z0Wrvg; 25:8NMzaX09yIFwAH67Kedt7grEcYANDxiqYf5nyeJVZ+9LqFpBk5RnWO+xXXYhExFD4M7rn3tdLajTokQDL2BFMQNX59N4nmljobkiaKAjXFJhkPdcQtmmu9Tz4rjCfDTT8/rbvcg0TfSSAwAJTawH1z6RQ90cn3f+dsqFhpUnE99Zr4OtMLZ4NUeUrhGeEKlrhtAyBrAY1UeGJv+GJzr+VbizGbiltf3sbYXyKhI0VfWH+sF2ezQ7+M37PCQ7wXgMPN1XArIi1plplOXerVZ70dMmM655D7fHrhgdG539SVU8snm4uNmKcD3DCxatVHi0PoBfs96YQacpVESly2nVrg==; 31:r/yIuUrxR1kBnMDytSFVmjBq/nbPRE8V0Sm2L7kFrw9Acr2Ut9Lqu5UJUry57SgKGqvglJX6QMAi5bHJYbyyFXk3bYAtW2mYL1eiIz/6MrhbkDo4LdZeSh4dXMycpOnRn7iKAHBPhaDNejszeESvbi9p6mZTZ6FY/tzWbxEG9xEEWRRMRZJ3+Z5r2ktUqA1Kns2nxe3FzmT2qFT1CUT8gqqCwRN4dOuRydtwjT9RmkE= X-MS-TrafficTypeDiagnostic: AM0PR0402MB3908: X-Microsoft-Exchange-Diagnostics: 1; AM0PR0402MB3908; 20:brerI/g6+8RNmpdNc5uB0f9oefX+y9nml0n4mjw9YbKA40szf2j//gZr/yl3sIpMzfTPdnvhzLa4n5Dw+KPCs4luy1rS+UMzje5vykwFnf3sICTwA7AbKgsXE4GgMgkTiDpmbnX+Q78vottenjk6SzRH+D1194QVZgfb0pz9S8NidGxfCtpPLc2iwh0waZs23cWDQX7g5s/nHfhlmtG4Res8ve3umtEkYpVMwXFjb/BMVeQack0omrC3h2kVKJAlsCcdN87pYEJY+zln+auS/M0tRAsjLYb9Wvr1CUNtEiPnc/KxYW4r2GT1sOx/NABh/5uZdsIXAu8b4zxd6h6fetxs4tXdQGX3PHQS/uWU5PP1EXi825mrkLvf69K0N6ptfZCeJbKXlkxILkoZ6+InbbSAo/w90FV2VIyf6eJ5SZuF0m/QGBIb9F4sI+f0KxPR1Vimduhi87EOsGo6Ql8cQ8yRuM8rp6PFrk1iCYz32655iF2rBGkjgNG2yurVNrLl; 4:Pm8RmncVhyFSW3XSxbLaFQ7ygjhj2dVyIozG+14MGj9aLLpXl/kDGrcOAQOwvFnN/F9XeHeTBx4ohJDbC5GLPHOjXBIdmbLzhRaXRagWPW89lGKBBSzEWZR1ZwTmZjO9L9V8VhzThPM+0e3pn9uNsoeEKCBE02qB2dgjmKCzaz6wtA7Um0qXojg06MtGWlfb+Y/FJcVz6J1nk0EnIsErZpXNCWb3nZz5su/Ilwu4qRuXmOVxBLfozrPqg2loUm9Ia+R36ftC8W4HD7uRAO+KoE2vieTgUk5/JFVR4sIoghiWBMA98B/DMRYcoNEOVS699Q1NRsqltF1GZ8qtatzMoSvWRI1mCnbqU976RYLmlCc= 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:AM0PR0402MB3908; BCL:0; PCL:0; RULEID:; SRVR:AM0PR0402MB3908; X-Forefront-PRVS: 0716E70AB6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(1496009)(346002)(136003)(376002)(366004)(39860400002)(396003)(189003)(199004)(2906002)(7736002)(26005)(6486002)(305945005)(486006)(48376002)(478600001)(86362001)(25786009)(4326008)(16526019)(186003)(36756003)(50466002)(16586007)(68736007)(6512007)(47776003)(51416003)(52116002)(53936002)(3846002)(386003)(6506007)(6116002)(76176011)(316002)(97736004)(50226002)(476003)(2616005)(956004)(11346002)(446003)(106356001)(8936002)(81156014)(66066001)(5660300001)(81166006)(8676002)(105586002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR0402MB3908; H:b47624-OptiPlex-7040.ap.freescale.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM0PR0402MB3908; 23:kjBN0LDhwRuFrDbYHfaXM26MkDogtOkICx3NMSp?= =?us-ascii?Q?fJ7nKm3g4UuDrHdTDoXe7OYnprO3ADH1ckZxkU1zh9SbzMg7LCmMP/duZXsY?= =?us-ascii?Q?vMP7bmLTQKzOsjbLfNLzbYqi4neQSXZ7cyxrfk5XxuiBIRoOVnOCR1TIrbIZ?= =?us-ascii?Q?bPMjcIfVo6XmiSVSk3zfVkmHsoj7SRrHsliOfuqaIbA2qQstBIr0efqY+TZ8?= =?us-ascii?Q?e7mctbyEIhcNzE/gdKTzKV4jSd5624HRSq/Cwe4Q+iSxbIF6els+obXzs9Zi?= =?us-ascii?Q?x+7Z2Tm67LW0APH/QfLJ+IvBkS6+MTNXVVNtAFEDyp8rQjiHZY+Pq6VgXsCb?= =?us-ascii?Q?n1VCB0wrZgFuXY+kCH1Hy7vsNE3SL9jAhotwFvpo59C9Obvak4kl9kTrF0lR?= =?us-ascii?Q?h0JGP+4Em5TaSXTWObXP1IvHbu7I/iolQ5CqCQ/6/hKRxkppONtMVwTHkRQs?= =?us-ascii?Q?Sc/V2H4j1e7ccsZBmG+5Ypx4aQXwNrWIYsG0yTftbjAGtOOlTtLbaFf8ySdS?= =?us-ascii?Q?UQsWTgvR+SgHK5eWvC+1R2oQXXzD+YcpgEzta/GMCMDKnvWgHPjBaHK49JXf?= =?us-ascii?Q?xoTeqpneCI/xPP9TDY9bzbqNGAzeQhYqVbPsdSPC4yDwWVAzs2V9P97KBzq6?= =?us-ascii?Q?3O3t//Nz4bqqoVFlF0fUKj9XxFJL4mdnUYTH8kJb2BTGHgRP/jXqYWcYD6Hs?= =?us-ascii?Q?lO2lXUe1Qsw1lY6EFs5y+mWQ7eH2xy7YsfJ7LsWN7KarygrZZNDNRjGwlIsT?= =?us-ascii?Q?QbqgIJDwqzdlJsqOTkdL3KWGFWf3Ni6GPfXT1h3ds6CI930Vd215DNyVxk1b?= =?us-ascii?Q?2fSWe8K1apzTAZ70W/Agj2hrZVkGMEdi4x99cXsYniqhvzLNVYqrj3FFBVV3?= =?us-ascii?Q?mKyEDmCMcFS7yhXaxxCgDWkfmvm0KwUdoH4Ja2Sn+8l9uWrCcNFoWM36Eau9?= =?us-ascii?Q?/0JiM6gf67Wm9y9Hr6+Z3o3iB/skK9KDreGt3n4LNERKKvkpxk1F3ZAKtTPj?= =?us-ascii?Q?OyuVzpns8FEy+OmKohb9VirWGHZjx2Cz5hDAZ3MUiGpHfLDmY67J0XPCIFJd?= =?us-ascii?Q?E4XNm+F+qQb52cfzUQkGyTVbdWR7LM3ckZLLBZM8i5MITa3uEE1+bbzdyryT?= =?us-ascii?Q?P+OT8N4BWGXCZ0uXgi61AipMbOB7hkTC3?= X-Microsoft-Antispam-Message-Info: EgXXTRDgIr16ZMy6s7laQr9SB8V5Yg2m66PJnbnuWSl33BhzzdIR3wq89bfrHAKvyCadM2ZKvSP3Wjw+a1hikvISG1JFwPqNv4S52rFN1Sm5Cetodlj+pdJ6mHCKzrOBecYYIKAf+nTxWx1Syep54uuKqdsrQQAxUnsbBXNhCGhH3EV7TJ/UmJaqA+FmPEZAY5V9w9UzDXwNhjbTm9mw3DeY5SMcoLzrdvRLsC6N1VdfziGKQT2bVB83YbW/JCcFP53AQ5WZDJ3d/IZSUdVXAV2ix7c4s+jXXsoGbuWiLhSmXx71tj6hCRtKfJnC3UUKkk4rvZU32HMR0ZL7tN8IAyy5uTatu4DK6VFM/QAZQk8= X-Microsoft-Exchange-Diagnostics: 1; AM0PR0402MB3908; 6:PgTf2evcqv7S/gIML86CfyRQ/kLWH6n5u2bMYe92KN5jrfhE8c4TI53C617CyGS2/4so+HlW7cAz0EsqV87tHWkry8RIOb/+O44iYVGuxuT2jpnL/hPjX0d4PEAzNP6a6MzW28bBcSZja68VgtIOnd6GAeeD1rIpxBZL+ERUu7twrvhFJF5vu0BR36+lSy7mQweb5UP1GREhxMUvgnb75d3VandvrUIJwQMe+MUuxeJraTQPYdc38GO++pY6drb2g+4NIMhBUZSqSItBlEtqPHtJhMacjfkU6BqjpWEAANHKiocYr9xjsNMAwsk9rhYysSVG4YgjO6hjqrRKEHQvP//SsCkHzPPj1XZ49idnpXOXW5HA+urkrmVXZ7J9JWAGnJq5zrnQkzLohys5/WgzgMgqIgVh8CVhxMgTdMRjIyxeYvju3ulDrSY1AZO7TMTlAmhQT1O3qmGZyCrhGBeTDQ==; 5:mOoFxTg1RkHTlnPmMo3+xIsdND3nP94hm3X8S0/MppZRqWXB5ZfHMWe+e0LQwMXjRYW6hnpo4fdR2pim65JkxlwdpoxZkimpp4XC75QPdPGSZv+Q5Nq4jNscf7j10bKSL7ojxxyLhFVwRog9+nyCqgRGuPeWGonJeIpMNHdpa2s=; 24:GQ6TLtw+Pb1G+5Ps2f3bXkTviD1x/oD6HcE1JqfAOs87QTDmbhJSstW1VM6hAd35+4KisCwkHcbgA/3TJfXbcdOr4K0uCVrs72gfpjO7dTQ= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM0PR0402MB3908; 7:X5Sle/HbrKfuFSwaRhxCGmYeNLWuiyZB/bKw96hrI2Y1tAqXljY/yLs1KBdPDkpLR1KQmG8H3rDVbG07reVeYi02vzDMHAiScsFyaLjsZpVrcDRNnDJG8Mo+jlZrsAD+DMaG1LcN6Bjvi888D0RjN/lWP2gFOs+TrYj6HSWsAjObx0/WVpc1OprNi4Pu6+CGNAeJelDeEKJfAwBXLlFKIn6M+MW6ivYE7p9DewHFm/HmJ+W529ADhXEoYnAWZAPJ X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jun 2018 00:03:32.1949 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9c747f70-05ab-4b6e-e64d-08d5dbc16e32 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR0402MB3908 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 Reviewed-by: Guenter Roeck Acked-by: Heikki Krogerus --- 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