FreeCalypso > hg > fc-linux-patch

annotate 6.1/0001-USB-serial-ftdi_sio-pass-port-to-quirk-port_probe-fu.patch @ 14:2a6b7ed98d21 default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Mainline-tracking: good through 6.8
author Mychaela Falconia <falcon@freecalypso.org>
date Sun, 24 Mar 2024 23:07:59 +0000
parents d84895fc703b
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
1 From 9e0c4dc68a5ed2b2939ccf0694e3dfdd052c2e40 Mon Sep 17 00:00:00 2001
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
2 From: "Mychaela N. Falconia" <falcon@freecalypso.org>
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
3 Date: Fri, 2 Oct 2020 17:38:56 +0000
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
4 Subject: [PATCH 1/2] USB: serial: ftdi_sio: pass port to quirk port_probe
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
5 functions
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
6
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
7 The original code passed only the pointer to the ftdi_private struct
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
8 to quirk port_probe functions. However, some quirks may need to be
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
9 applied conditionally only to some channels of a multichannel FT2232x
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
10 or FT4232H device, and if a given quirk's port_probe function needs
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
11 to figure out which channel of a multichannel device is currently
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
12 being considered, it needs access to the port pointer passed to the
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
13 ftdi_sio_port_probe() function, so it can traverse USB data structures
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
14 from there.
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
15
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
16 Signed-off-by: Mychaela N. Falconia <falcon@freecalypso.org>
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
17 ---
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
18 drivers/usb/serial/ftdi_sio.c | 20 ++++++++++++--------
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
19 1 file changed, 12 insertions(+), 8 deletions(-)
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
20
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
21 diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
22 index 05e28a5ce42b..1587c22180c0 100644
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
23 --- a/drivers/usb/serial/ftdi_sio.c
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
24 +++ b/drivers/usb/serial/ftdi_sio.c
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
25 @@ -103,15 +103,15 @@ struct ftdi_private {
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
26 struct ftdi_quirk {
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
27 int (*probe)(struct usb_serial *);
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
28 /* Special settings for probed ports. */
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
29 - void (*port_probe)(struct ftdi_private *);
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
30 + void (*port_probe)(struct usb_serial_port *);
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
31 };
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
32
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
33 static int ftdi_jtag_probe(struct usb_serial *serial);
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
34 static int ftdi_NDI_device_setup(struct usb_serial *serial);
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
35 static int ftdi_stmclite_probe(struct usb_serial *serial);
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
36 static int ftdi_8u2232c_probe(struct usb_serial *serial);
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
37 -static void ftdi_USB_UIRT_setup(struct ftdi_private *priv);
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
38 -static void ftdi_HE_TIRA1_setup(struct ftdi_private *priv);
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
39 +static void ftdi_USB_UIRT_setup(struct usb_serial_port *port);
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
40 +static void ftdi_HE_TIRA1_setup(struct usb_serial_port *port);
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
41
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
42 static const struct ftdi_quirk ftdi_jtag_quirk = {
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
43 .probe = ftdi_jtag_probe,
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
44 @@ -2197,11 +2197,11 @@ static int ftdi_port_probe(struct usb_serial_port *port)
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
45
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
46 mutex_init(&priv->cfg_lock);
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
47
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
48 - if (quirk && quirk->port_probe)
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
49 - quirk->port_probe(priv);
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
50 -
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
51 usb_set_serial_port_data(port, priv);
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
52
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
53 + if (quirk && quirk->port_probe)
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
54 + quirk->port_probe(port);
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
55 +
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
56 result = ftdi_determine_type(port);
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
57 if (result)
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
58 goto err_free;
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
59 @@ -2229,8 +2229,10 @@ static int ftdi_port_probe(struct usb_serial_port *port)
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
60 /* Setup for the USB-UIRT device, which requires hardwired
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
61 * baudrate (38400 gets mapped to 312500) */
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
62 /* Called from usbserial:serial_probe */
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
63 -static void ftdi_USB_UIRT_setup(struct ftdi_private *priv)
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
64 +static void ftdi_USB_UIRT_setup(struct usb_serial_port *port)
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
65 {
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
66 + struct ftdi_private *priv = usb_get_serial_port_data(port);
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
67 +
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
68 priv->flags |= ASYNC_SPD_CUST;
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
69 priv->custom_divisor = 77;
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
70 priv->force_baud = 38400;
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
71 @@ -2239,8 +2241,10 @@ static void ftdi_USB_UIRT_setup(struct ftdi_private *priv)
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
72 /* Setup for the HE-TIRA1 device, which requires hardwired
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
73 * baudrate (38400 gets mapped to 100000) and RTS-CTS enabled. */
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
74
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
75 -static void ftdi_HE_TIRA1_setup(struct ftdi_private *priv)
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
76 +static void ftdi_HE_TIRA1_setup(struct usb_serial_port *port)
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
77 {
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
78 + struct ftdi_private *priv = usb_get_serial_port_data(port);
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
79 +
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
80 priv->flags |= ASYNC_SPD_CUST;
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
81 priv->custom_divisor = 240;
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
82 priv->force_baud = 38400;
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
83 --
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
84 2.9.0
d84895fc703b add 6.1
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff changeset
85