[v16,1/3] usb: typec: tcpci: move tcpci.h to include/linux/usb/

Commit Message

Xin Ji July 12, 2022, 9:05 a.m. UTC

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 <[e-mail]>
Reviewed-by: Heikki Krogerus <[e-mail]>
Signed-off-by: Xin Ji <[e-mail]>

---
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%)

Comments

Guenter Roeck July 12, 2022, 1:31 p.m. UTC | #1

On 7/12/22 02:05, Xin Ji wrote:
> 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 <[e-mail]>
> Reviewed-by: Heikki Krogerus <[e-mail]>
> Signed-off-by: Xin Ji <[e-mail]>
> 
> ---
> V9 -> V10: Rebase on the latest code
> V8 -> V9 : Add more commit message
> V7 -> V8 : Fix Guanter's comment, remove unnecessary explain

We are now at v16. The change log has not been updated since v10,
making it all but worthless.

Guenter

> ---
>   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

Greg KH July 12, 2022, 1:43 p.m. UTC | #2

On Tue, Jul 12, 2022 at 06:31:22AM -0700, Guenter Roeck wrote:
> On 7/12/22 02:05, Xin Ji wrote:
> > 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 <[e-mail]>
> > Reviewed-by: Heikki Krogerus <[e-mail]>
> > Signed-off-by: Xin Ji <[e-mail]>
> > 
> > ---
> > V9 -> V10: Rebase on the latest code
> > V8 -> V9 : Add more commit message
> > V7 -> V8 : Fix Guanter's comment, remove unnecessary explain
> 
> We are now at v16. The change log has not been updated since v10,
> making it all but worthless.

It's also already in my tree for a while, so I have no idea what this is
being generated against :(

Xin Ji July 13, 2022, 6:28 a.m. UTC | #3

On Tue, Jul 12, 2022 at 03:43:48PM +0200, Greg Kroah-Hartman wrote:
> On Tue, Jul 12, 2022 at 06:31:22AM -0700, Guenter Roeck wrote:
> > On 7/12/22 02:05, Xin Ji wrote:
> > > 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 <[e-mail]>
> > > Reviewed-by: Heikki Krogerus <[e-mail]>
> > > Signed-off-by: Xin Ji <[e-mail]>
> > > 
> > > ---
> > > V9 -> V10: Rebase on the latest code
> > > V8 -> V9 : Add more commit message
> > > V7 -> V8 : Fix Guanter's comment, remove unnecessary explain
> > 
> > We are now at v16. The change log has not been updated since v10,
> > making it all but worthless.
> 
> It's also already in my tree for a while, so I have no idea what this is
> being generated against :(
Hi all, I'm little confused, do I need update change log from v11 to
v16? There is no changes since v10.
Thanks,
Xin

Greg KH July 13, 2022, 6:36 a.m. UTC | #4

On Wed, Jul 13, 2022 at 02:28:45PM +0800, Xin Ji wrote:
> On Tue, Jul 12, 2022 at 03:43:48PM +0200, Greg Kroah-Hartman wrote:
> > On Tue, Jul 12, 2022 at 06:31:22AM -0700, Guenter Roeck wrote:
> > > On 7/12/22 02:05, Xin Ji wrote:
> > > > 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 <[e-mail]>
> > > > Reviewed-by: Heikki Krogerus <[e-mail]>
> > > > Signed-off-by: Xin Ji <[e-mail]>
> > > > 
> > > > ---
> > > > V9 -> V10: Rebase on the latest code
> > > > V8 -> V9 : Add more commit message
> > > > V7 -> V8 : Fix Guanter's comment, remove unnecessary explain
> > > 
> > > We are now at v16. The change log has not been updated since v10,
> > > making it all but worthless.
> > 
> > It's also already in my tree for a while, so I have no idea what this is
> > being generated against :(
> Hi all, I'm little confused, do I need update change log from v11 to
> v16? There is no changes since v10.

I'm confused, why are you sending a patch over that is already in my
tree and in linux-next?  You got an email saying it was merged, see
commit 7963d4d71011 ("usb: typec: tcpci: move tcpci.h to
include/linux/usb/").

thanks,

greg k-h

Xin Ji July 13, 2022, 6:48 a.m. UTC | #5

On Wed, Jul 13, 2022 at 08:36:53AM +0200, Greg Kroah-Hartman wrote:
> On Wed, Jul 13, 2022 at 02:28:45PM +0800, Xin Ji wrote:
> > On Tue, Jul 12, 2022 at 03:43:48PM +0200, Greg Kroah-Hartman wrote:
> > > On Tue, Jul 12, 2022 at 06:31:22AM -0700, Guenter Roeck wrote:
> > > > On 7/12/22 02:05, Xin Ji wrote:
> > > > > 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 <[e-mail]>
> > > > > Reviewed-by: Heikki Krogerus <[e-mail]>
> > > > > Signed-off-by: Xin Ji <[e-mail]>
> > > > > 
> > > > > ---
> > > > > V9 -> V10: Rebase on the latest code
> > > > > V8 -> V9 : Add more commit message
> > > > > V7 -> V8 : Fix Guanter's comment, remove unnecessary explain
> > > > 
> > > > We are now at v16. The change log has not been updated since v10,
> > > > making it all but worthless.
> > > 
> > > It's also already in my tree for a while, so I have no idea what this is
> > > being generated against :(
> > Hi all, I'm little confused, do I need update change log from v11 to
> > v16? There is no changes since v10.
> 
> I'm confused, why are you sending a patch over that is already in my
> tree and in linux-next?  You got an email saying it was merged, see
> commit 7963d4d71011 ("usb: typec: tcpci: move tcpci.h to
> include/linux/usb/").
> 
> thanks,
> 
> greg k-h
Hi greg k-h, sorry for that, this serial has 3 patches, so I just think
need update all 3 patches in each upstream.

I'll only update the 2 patches next time.

Thanks,
Xin

Guenter Roeck July 13, 2022, 3:56 p.m. UTC | #6

On Wed, Jul 13, 2022 at 02:48:18PM +0800, Xin Ji wrote:
> On Wed, Jul 13, 2022 at 08:36:53AM +0200, Greg Kroah-Hartman wrote:
> > On Wed, Jul 13, 2022 at 02:28:45PM +0800, Xin Ji wrote:
> > > On Tue, Jul 12, 2022 at 03:43:48PM +0200, Greg Kroah-Hartman wrote:
> > > > On Tue, Jul 12, 2022 at 06:31:22AM -0700, Guenter Roeck wrote:
> > > > > On 7/12/22 02:05, Xin Ji wrote:
> > > > > > 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 <[e-mail]>
> > > > > > Reviewed-by: Heikki Krogerus <[e-mail]>
> > > > > > Signed-off-by: Xin Ji <[e-mail]>
> > > > > > 
> > > > > > ---
> > > > > > V9 -> V10: Rebase on the latest code
> > > > > > V8 -> V9 : Add more commit message
> > > > > > V7 -> V8 : Fix Guanter's comment, remove unnecessary explain
> > > > > 
> > > > > We are now at v16. The change log has not been updated since v10,
> > > > > making it all but worthless.
> > > > 
> > > > It's also already in my tree for a while, so I have no idea what this is
> > > > being generated against :(
> > > Hi all, I'm little confused, do I need update change log from v11 to
> > > v16? There is no changes since v10.
> > 
> > I'm confused, why are you sending a patch over that is already in my
> > tree and in linux-next?  You got an email saying it was merged, see
> > commit 7963d4d71011 ("usb: typec: tcpci: move tcpci.h to
> > include/linux/usb/").
> > 
> > thanks,
> > 
> > greg k-h
> Hi greg k-h, sorry for that, this serial has 3 patches, so I just think
> need update all 3 patches in each upstream.

If you resend patches as part of a series, please explain in the change
log that this patch was unchanged.

Guenter

Patch

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