From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sun, 4 Feb 2024 14:21:02 +0000 (-0800)
Subject: Merge 6.8-rc3 into tty-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a802f50d6e92298d44a806d326a2ba3eefa6db72;p=linux.git

Merge 6.8-rc3 into tty-next

We need the tty/serial fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

a802f50d6e92298d44a806d326a2ba3eefa6db72
diff --cc drivers/tty/serial/max310x.c
index 0065e17572be6,10bf6d75bf9ee..14dd9cfaa9f76
--- a/drivers/tty/serial/max310x.c
+++ b/drivers/tty/serial/max310x.c
@@@ -237,9 -234,17 +237,17 @@@
  
  /* Misc definitions */
  #define MAX310X_FIFO_SIZE		(128)
 -#define MAX310x_REV_MASK		(0xf8)
 +#define MAX310x_REV_MASK		GENMASK(7, 3)
  #define MAX310X_WRITE_BIT		0x80
  
+ /* Port startup definitions */
+ #define MAX310X_PORT_STARTUP_WAIT_RETRIES	20 /* Number of retries */
+ #define MAX310X_PORT_STARTUP_WAIT_DELAY_MS	10 /* Delay between retries */
+ 
+ /* Crystal-related definitions */
+ #define MAX310X_XTAL_WAIT_RETRIES	20 /* Number of retries */
+ #define MAX310X_XTAL_WAIT_DELAY_MS	10 /* Delay between retries */
+ 
  /* MAX3107 specific */
  #define MAX3107_REV_ID			(0xa0)