linux-next: manual merge of the usb-serial tree with Linus' tree

linux-next: manual merge of the usb-serial tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2020 bytes --]

Hi all,

Today's linux-next merge of the usb-serial tree got a conflict in:

  drivers/usb/serial/cp210x.c

between commit:

  6f7ec77cc8b6 ("USB: serial: cp210x: fix alternate function for CP2102N QFN20")

from Linus' tree and commit:

  8051334e901f ("USB: serial: cp210x: add support for GPIOs on CP2108")

from the usb-serial tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/usb/serial/cp210x.c
index fcb812bc832c,3d376c0b6537..000000000000
--- a/drivers/usb/serial/cp210x.c
+++ b/drivers/usb/serial/cp210x.c
@@@ -247,12 -247,11 +247,12 @@@ struct cp210x_serial_private 
  #ifdef CONFIG_GPIOLIB
  	struct gpio_chip	gc;
  	bool			gpio_registered;
- 	u8			gpio_pushpull;
- 	u8			gpio_altfunc;
- 	u8			gpio_input;
+ 	u16			gpio_pushpull;
+ 	u16			gpio_altfunc;
+ 	u16			gpio_input;
  #endif
  	u8			partnum;
 +	u32			fw_version;
  	speed_t			min_speed;
  	speed_t			max_speed;
  	bool			use_actual_rate;
@@@ -540,13 -579,10 +582,16 @@@ struct cp210x_quad_port_config 
  #define CP210X_2NCONFIG_GPIO_RSTLATCH_IDX	587
  #define CP210X_2NCONFIG_GPIO_CONTROL_IDX	600
  
 +/* CP2102N QFN20 port configuration values */
 +#define CP2102N_QFN20_GPIO2_TXLED_MODE		BIT(2)
 +#define CP2102N_QFN20_GPIO3_RXLED_MODE		BIT(3)
 +#define CP2102N_QFN20_GPIO1_RS485_MODE		BIT(4)
 +#define CP2102N_QFN20_GPIO0_CLK_MODE		BIT(6)
 +
- /* CP210X_VENDOR_SPECIFIC, CP210X_WRITE_LATCH call writes these 0x2 bytes. */
+ /*
+  * CP210X_VENDOR_SPECIFIC, CP210X_WRITE_LATCH call writes these 0x02 bytes
+  * for CP2102N, CP2103, CP2104 and CP2105.
+  */
  struct cp210x_gpio_write {
  	u8	mask;
  	u8	state;

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the usb-serial tree with Linus' tree

[Johan Hovold]

[-- Attachment #1: Type: text/plain, Size: 871 bytes --]

On Thu, Jun 17, 2021 at 03:02:24PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the usb-serial tree got a conflict in:
> 
>   drivers/usb/serial/cp210x.c
> 
> between commit:
> 
>   6f7ec77cc8b6 ("USB: serial: cp210x: fix alternate function for CP2102N QFN20")
> 
> from Linus' tree and commit:
> 
>   8051334e901f ("USB: serial: cp210x: add support for GPIOs on CP2108")
> 
> from the usb-serial tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

Thanks, looks good.

Johan

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]