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 v16 1/3] usb: typec: tcpci: move tcpci.h to include/linux/usb/
Date:   Tue, 12 Jul 2022 17:05:31 +0800
Message-Id: <20220712090534.2783494-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?OP6XZ2kVhB7EeB7wBDbMmTObkVAFx+1rWBA/8aegjJtEh6PmOD7MGPiy5/lD?=
 =?us-ascii?Q?gO+EE9wYrVvJz6rtBsnHFDAbXpuo+Lm6jmyII8bDuSZ3gqvBRBZhy6me1Rry?=
 =?us-ascii?Q?VGEGFB+TthljRQ6Cdt2zdN+K19W5jPTe841HWgq3uSGnp2y1X8albYDKirdv?=
 =?us-ascii?Q?fzTfqLpZrPN65w2HRC3oQF3YSTN0Lj0FPDDngjOfA11tODiTUU9rfFznucaR?=
 =?us-ascii?Q?NwsCJLmOasyrpNi+vF3cs3F/CpI7kkLOBJLkEOtIlKwC+cHb3QNZVjNfOkNn?=
 =?us-ascii?Q?SaGIrKCzW+918XBnKBsnFE6L78sVHaLAMoovrX8rkVBTihRSitEvp0I1Ozlp?=
 =?us-ascii?Q?NGMwHQ3pqKRN6Ub8anqJuYLE4p5D36nvOd+VSyVJUZpuSpNScfdYos620huv?=
 =?us-ascii?Q?+I+v7lHPYYj4OT76oTF9rmEPDdUI+BYQs4OeMrvBvUkW+9S2At/HISXsisSo?=
 =?us-ascii?Q?XO9Bk9VQgBoPCV4Abjg6wBRfssuxRSPrbRIsQ3lw+1HsCvBnB5yByGl2Yti2?=
 =?us-ascii?Q?ot+vQht1/Imx9NWmiHC7oHRDhTK9OQHAWICPcevga9OMkhyFhW0rPpJZtNBD?=
 =?us-ascii?Q?WZp4pfSxDA1E3fntNdrrGNHA/H30q7xqdC62RN1/0pGM7WES2xgperRNtgXH?=
 =?us-ascii?Q?X2DtMQ47ff2onkPFswy84JdgvKJOJcX+zAQdng8i2qsd9+5WrwfIua+ADV1o?=
 =?us-ascii?Q?eA6pF2CzDQgBAPr++A4GwkcODL/g8jzxPytbvYGwA3wqZjZziFVudF1j3CYB?=
 =?us-ascii?Q?aY6fUSQGgM2kU/TBQTpFU42ZnAAyzoWgMOVO6d5LK9TfIeCR5Q7jW31DHSQ0?=
 =?us-ascii?Q?GsQuGdwG9yv6c6VcZzVGt4bJf4+cOScPv4M5p5pYYJfqPCGw1tINp4kqJggH?=
 =?us-ascii?Q?T3HI2EJVZNcaJumqMhUzJKjnf3vd2ZwXpBtPOmL1NTWGO9WNYTUHy6kHcZyn?=
 =?us-ascii?Q?/U7NJU8p59zzIr5Cj828ipjmPl4sQrCxE+BQ1KWmN4oyr7IYJ4ScycGzP0pp?=
 =?us-ascii?Q?HCjAyUdr+ngenj0sNZTiMHm8KfRvX3NSQgHt8YYbliPo61iw9ngDdjiIa6lo?=
 =?us-ascii?Q?Pj4N4O+yy1J5syJzpmUHA/MlGB2QgxkIE4xveAHSILJqB8dRRPYoifw61ojs?=
 =?us-ascii?Q?w3GBeeSDrHFi+bwn6WI6Zq0Hrz8KtVEp+Nz9mekJZIwaCU7ngJH2XuFpk6nz?=
 =?us-ascii?Q?hikjqLQGf2vT7xx0Hba0TkUbkhGoMpSioajcLHOps+DGEkcnRrM2Qg6dCVJs?=
 =?us-ascii?Q?2ohPTfFxyDW1BkEzpo2fBy4fTDHhvutw2dAR67qj8MX2GzU5GlzrTAxwXNu7?=
 =?us-ascii?Q?uCVuFHTn96iJen/UZ2VatIbs41DV7DyFrY3f5tDnXEY4wgah/t+s7mlEvHAr?=
 =?us-ascii?Q?2JNLMqZHDEwn147pT6PouuZZZWpkCHfftyb0YC+Kf1b771I9Td4l78s89ZVQ?=
 =?us-ascii?Q?lkNfarexEPq/GkiSow+XDAzgyL75XV+QXk3p0Q0E1/BvZy398IN5Q/+AZYBA?=
 =?us-ascii?Q?qBlTVqxKI+8V41s7rz4xdGmeshYGGcp/blI2dWD/CYAzQT97kLYZrUaw6XmZ?=
 =?us-ascii?Q?fs2lXGpSHWkuwdINPkxABQ1vTKkx65MxE7gxUfM+?=
X-OriginatorOrg: analogixsemi.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 83f6e4d4-c00e-44b8-944e-08da63e5b462
X-MS-Exchange-CrossTenant-AuthSource: BY5PR04MB6739.namprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2022 09:05:45.3241
 (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: gHTyhcBRi+OE/iuk2ZZY8C6//SFG28VeQHgcvAZrjkfZehnReqDWmAppsyL/95p3rAA+pBmouD09QoqQ4oiqTg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR04MB0658
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: Guenter Roeck <linux@roeck-us.net>
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
---
 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