Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Xin Ji <xji@analogixsemi.com>
To:     Guenter Roeck <linux@roeck-us.net>,
        Heikki Krogerus <heikki.krogerus@linux.intel.com>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Matthias Brugger <matthias.bgg@gmail.com>
Cc:     bliang@analogixsemi.com, qwen@analogixsemi.com,
        jli@analogixsemi.com, Xin Ji <xji@analogixsemi.com>,
        linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
        linux-arm-kernel@lists.infradead.org,
        linux-mediatek@lists.infradead.org
Subject: [PATCH v13 1/3] usb: typec: tcpci: move tcpci.h to include/linux/usb/
Date:   Tue,  5 Jul 2022 13:36:54 +0800
Message-Id: <20220705053657.2340274-1-xji@analogixsemi.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?09ZReE8HjnproFbGfOEOiTJAZ9FiZ87DCQhJl92CyVM2jhAyLD+VISPpCvbg?=
 =?us-ascii?Q?rzDoBaE90baRk0ALYPv3lGXmD9nOpGmCDKiPuw0Ri5NjtKf67UEC9cdcC9gW?=
 =?us-ascii?Q?VQNVHT58UnfssDSDHNx3j99LNa+hTiSTWVlcwLr9NA0idVQyUGCkllX43IAx?=
 =?us-ascii?Q?0nbfYUH9u1r4eo6duzj5lcdPJJ5pXxhIE0IOSmk50S6Yg8mZwe638sUzl0U/?=
 =?us-ascii?Q?v/uClhPbv6TiYpiomSnKLpmIkGGXWhgbGLYMgawcA2IST54feE7AaDmOxQiX?=
 =?us-ascii?Q?RyeN0n4Mr8hOelPYZXUtHH8Wb+k3wkMsF+FqPxi6VGFIn3zxOqd02ITuFpuc?=
 =?us-ascii?Q?snEk65vH2Ok4U/fuZxKR9V7PZZ5/Jo9EdY+E21t+jZJrk3CPIGV9r8p8V2Ko?=
 =?us-ascii?Q?+d9zynD3TbMnLm0OQdaQrEHFvSZej6aWSBdTzcW0spHEU3mQfwOIguN0Dgtx?=
 =?us-ascii?Q?2pNU9frSeBgN/MiT7/ofGO01TXcUsHBjEFCO39rzJBy7Syd8vWuf3vnvmF/R?=
 =?us-ascii?Q?EVy5GdKcyrVxD8I23VZpCDB1nPcag9jY1721rqRoBfQHxcAI2Phxig/99PaC?=
 =?us-ascii?Q?f7+5DDF2tijhpitMtBIF2FoWXPV29xKtcChsPDrJNmWr+AC6j7cltqUwREP5?=
 =?us-ascii?Q?SLncJ5QwA4aehxg02y//IEeb7ltAwiKUVeiQ0atrn9uSkoph0LuXZxbu43hY?=
 =?us-ascii?Q?yt1iMsdFWcYvZGF7SmKT1Usnq4vPKI7s3F3/w3IZDZEv+76An8RieaJjzfr7?=
 =?us-ascii?Q?l+ufT3LkXYXLt8xCabFn75a3td6QO+SbZ6UUDywjn31RDYHwkEVSqlM1+C3g?=
 =?us-ascii?Q?rCn4PRGWdlG68pE1FI7Iq7gk3n45dQe32zlvEmp8KvPlHzpiCHdJ1O/fuqHi?=
 =?us-ascii?Q?O5IKoeL9UXBaGZ+NxtoMKmrstTRUuoWCyUw3uI1QTigU7f7JxVqzf4ndfYyS?=
 =?us-ascii?Q?890QIWOH58PHzcsAzHN0/itb0MbXsd7J4siIDc/454uzcrddBnWm/h0wN848?=
 =?us-ascii?Q?xzbkzEqQNkvgSy7PuKtSOdgkqeTk5Q+VBMOHl1oK4UIKArjwIvRCvYoxe/yw?=
 =?us-ascii?Q?9oqF8/sUfRYcWHk/2gKa+6rLGwRlTMjQkXN2oUSlYHZ71ZPmdW5bVf2PF6P4?=
 =?us-ascii?Q?Z1amJA1bFMJ40HhqfWdeSe2VAULWVePVgx4rflIrY/HBQHSl1QaUj0+6Vc8C?=
 =?us-ascii?Q?sxWr4CBGY6C7pjcl4BcKd6ad/VjrpYvHST+t8YtQmHvKl4Rx9qL9hnBt9+d5?=
 =?us-ascii?Q?+nQM85QuCE5NY7i1CAuMq3lzZKaMfn0eHwJS+TA/So24s+zbsntFjnSuyjjA?=
 =?us-ascii?Q?nikAhbCTHUf7CCxYC+nybatOb3LEUvyGRldfoFHJN7TLufdzZeYtpjG2+TMn?=
 =?us-ascii?Q?RS6Kx5CnhjOyYIq0tVhyc8PgJ1bLYjfuIKScp21EvorpcBn+EeTKAvP3XO3N?=
 =?us-ascii?Q?F/bzFrbydEnXnf3YBo7++16008ExXdSE6an1wvvqheo1+vFPNvwOEEfl3hX6?=
 =?us-ascii?Q?OJ4W/vAF4Djc+6A6gtcValIB3ahdEdC4PCMjUI+ac2WK/1evFolCNL/CAk+l?=
 =?us-ascii?Q?bDWyBEwVZfXf8MBtMy9IbaMbe+qrSs9iXq0Wxw4a?=
X-OriginatorOrg: analogixsemi.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 27b98b18-9820-4bfa-bd35-08da5e486962
X-MS-Exchange-CrossTenant-AuthSource: BY5PR04MB6739.namprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jul 2022 05:37:12.8205
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: b099b0b4-f26c-4cf5-9a0f-d5be9acab205
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: wH2mu87I/MkvIh7SezLiUwG+GB3tvAjYCQD1NT4VB2I0g/AmKu1zDkIwPoYEMEQQTASBSW9J4E7c8gHDY4fCUQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR04MB0651
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,
        T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

USB PD controllers which consisting of a microcontroller (acting as the TCPM)
and a port controller (TCPC) - may require that the driver for the PD
controller accesses directly also the on-chip port controller in some cases.

Move tcpci.h to include/linux/usb/ is convenience access TCPC registers.

Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Xin Ji <xji@analogixsemi.com>

---
V9 -> V10: Rebase on the latest code
V8 -> V9 : Add more commit message
V7 -> V8 : Fix Guanter's comment, remove unnecessary explain

Signed-off-by: Xin Ji <xji@analogixsemi.com>
---
 drivers/usb/typec/tcpm/tcpci.c                        | 3 +--
 drivers/usb/typec/tcpm/tcpci_maxim.c                  | 3 +--
 drivers/usb/typec/tcpm/tcpci_mt6360.c                 | 3 +--
 drivers/usb/typec/tcpm/tcpci_rt1711h.c                | 2 +-
 {drivers/usb/typec/tcpm => include/linux/usb}/tcpci.h | 1 +
 5 files changed, 5 insertions(+), 7 deletions(-)
 rename {drivers/usb/typec/tcpm => include/linux/usb}/tcpci.h (99%)

diff --git a/drivers/usb/typec/tcpm/tcpci.c b/drivers/usb/typec/tcpm/tcpci.c
index f33e08eb7670..812784702d53 100644
--- a/drivers/usb/typec/tcpm/tcpci.c
+++ b/drivers/usb/typec/tcpm/tcpci.c
@@ -13,11 +13,10 @@
 #include <linux/property.h>
 #include <linux/regmap.h>
 #include <linux/usb/pd.h>
+#include <linux/usb/tcpci.h>
 #include <linux/usb/tcpm.h>
 #include <linux/usb/typec.h>
 
-#include "tcpci.h"
-
 #define	PD_RETRY_COUNT_DEFAULT			3
 #define	PD_RETRY_COUNT_3_0_OR_HIGHER		2
 #define	AUTO_DISCHARGE_DEFAULT_THRESHOLD_MV	3500
diff --git a/drivers/usb/typec/tcpm/tcpci_maxim.c b/drivers/usb/typec/tcpm/tcpci_maxim.c
index df2505570f07..4b6705f3d7b7 100644
--- a/drivers/usb/typec/tcpm/tcpci_maxim.c
+++ b/drivers/usb/typec/tcpm/tcpci_maxim.c
@@ -11,11 +11,10 @@
 #include <linux/module.h>
 #include <linux/regmap.h>
 #include <linux/usb/pd.h>
+#include <linux/usb/tcpci.h>
 #include <linux/usb/tcpm.h>
 #include <linux/usb/typec.h>
 
-#include "tcpci.h"
-
 #define PD_ACTIVITY_TIMEOUT_MS				10000
 
 #define TCPC_VENDOR_ALERT				0x80
diff --git a/drivers/usb/typec/tcpm/tcpci_mt6360.c b/drivers/usb/typec/tcpm/tcpci_mt6360.c
index 8a952eaf9016..1b7c31278ebb 100644
--- a/drivers/usb/typec/tcpm/tcpci_mt6360.c
+++ b/drivers/usb/typec/tcpm/tcpci_mt6360.c
@@ -11,10 +11,9 @@
 #include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
+#include <linux/usb/tcpci.h>
 #include <linux/usb/tcpm.h>
 
-#include "tcpci.h"
-
 #define MT6360_REG_PHYCTRL1	0x80
 #define MT6360_REG_PHYCTRL3	0x82
 #define MT6360_REG_PHYCTRL7	0x86
diff --git a/drivers/usb/typec/tcpm/tcpci_rt1711h.c b/drivers/usb/typec/tcpm/tcpci_rt1711h.c
index b56a0880a044..3291ca4948da 100644
--- a/drivers/usb/typec/tcpm/tcpci_rt1711h.c
+++ b/drivers/usb/typec/tcpm/tcpci_rt1711h.c
@@ -10,9 +10,9 @@
 #include <linux/i2c.h>
 #include <linux/interrupt.h>
 #include <linux/gpio/consumer.h>
+#include <linux/usb/tcpci.h>
 #include <linux/usb/tcpm.h>
 #include <linux/regmap.h>
-#include "tcpci.h"
 
 #define RT1711H_VID		0x29CF
 #define RT1711H_PID		0x1711
diff --git a/drivers/usb/typec/tcpm/tcpci.h b/include/linux/usb/tcpci.h
similarity index 99%
rename from drivers/usb/typec/tcpm/tcpci.h
rename to include/linux/usb/tcpci.h
index b2edd45f13c6..20c0bedb8ec8 100644
--- a/drivers/usb/typec/tcpm/tcpci.h
+++ b/include/linux/usb/tcpci.h
@@ -9,6 +9,7 @@
 #define __LINUX_USB_TCPCI_H
 
 #include <linux/usb/typec.h>
+#include <linux/usb/tcpm.h>
 
 #define TCPC_VENDOR_ID			0x0
 #define TCPC_PRODUCT_ID			0x2
-- 
2.25.1