From: Grigori Goronzy <greg@chown.ath.cx>
To: Johan Hovold <johan@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
Grigori Goronzy <greg@chown.ath.cx>
Subject: [PATCH v3 02/13] USB: ch341: add LCR register definitions
Date: Mon, 11 Apr 2016 01:43:42 +0200 [thread overview]
Message-ID: <1460331833-19836-3-git-send-email-greg@chown.ath.cx> (raw)
In-Reply-To: <1460331833-19836-1-git-send-email-greg@chown.ath.cx>
BREAK2 seems to be a misnomer, the register configures various aspects
of the UART configuration.
Signed-off-by: Grigori Goronzy <greg@chown.ath.cx>
---
drivers/usb/serial/ch341.c | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/drivers/usb/serial/ch341.c b/drivers/usb/serial/ch341.c
index 63df8ce..1ab4384 100644
--- a/drivers/usb/serial/ch341.c
+++ b/drivers/usb/serial/ch341.c
@@ -64,10 +64,19 @@
#define CH341_REQ_WRITE_REG 0x9A
#define CH341_REQ_READ_REG 0x95
#define CH341_REG_BREAK1 0x05
-#define CH341_REG_BREAK2 0x18
+#define CH341_REG_LCR 0x18
#define CH341_NBREAK_BITS_REG1 0x01
-#define CH341_NBREAK_BITS_REG2 0x40
+#define CH341_LCR_ENABLE_RX 0x80
+#define CH341_LCR_ENABLE_TX 0x40
+#define CH341_LCR_MARK_SPACE 0x20
+#define CH341_LCR_PAR_EVEN 0x10
+#define CH341_LCR_ENABLE_PAR 0x08
+#define CH341_LCR_STOP_BITS_2 0x04
+#define CH341_LCR_CS8 0x03
+#define CH341_LCR_CS7 0x02
+#define CH341_LCR_CS6 0x01
+#define CH341_LCR_CS5 0x00
static const struct usb_device_id id_table[] = {
{ USB_DEVICE(0x4348, 0x5523) },
@@ -370,7 +379,7 @@ static void ch341_set_termios(struct tty_struct *tty,
static void ch341_break_ctl(struct tty_struct *tty, int break_state)
{
const uint16_t ch341_break_reg =
- CH341_REG_BREAK1 | ((uint16_t) CH341_REG_BREAK2 << 8);
+ CH341_REG_BREAK1 | ((uint16_t) CH341_REG_LCR << 8);
struct usb_serial_port *port = tty->driver_data;
int r;
uint16_t reg_contents;
@@ -392,11 +401,11 @@ static void ch341_break_ctl(struct tty_struct *tty, int break_state)
if (break_state != 0) {
dev_dbg(&port->dev, "%s - Enter break state requested\n", __func__);
break_reg[0] &= ~CH341_NBREAK_BITS_REG1;
- break_reg[1] &= ~CH341_NBREAK_BITS_REG2;
+ break_reg[1] &= ~CH341_LCR_ENABLE_TX;
} else {
dev_dbg(&port->dev, "%s - Leave break state requested\n", __func__);
break_reg[0] |= CH341_NBREAK_BITS_REG1;
- break_reg[1] |= CH341_NBREAK_BITS_REG2;
+ break_reg[1] |= CH341_LCR_ENABLE_TX;
}
dev_dbg(&port->dev, "%s - New ch341 break register contents - reg1: %x, reg2: %x\n",
__func__, break_reg[0], break_reg[1]);
--
1.9.1
next prev parent reply other threads:[~2016-04-10 23:44 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-10 23:43 Major improvements to the ch341 driver v3 Grigori Goronzy
2016-04-10 23:43 ` [PATCH v3 01/13] USB: ch341: fix error handling on resume Grigori Goronzy
2016-04-10 23:43 ` Grigori Goronzy [this message]
2016-04-10 23:43 ` [PATCH v3 03/13] USB: ch341: add definitions for modem control Grigori Goronzy
2016-04-10 23:43 ` [PATCH v3 04/13] USB: ch341: fix USB buffer allocations Grigori Goronzy
2016-04-10 23:43 ` [PATCH v3 05/13] USB: ch341: reinitialize chip on reconfiguration Grigori Goronzy
2016-04-10 23:43 ` [PATCH v3 06/13] USB: ch341: add support for parity, frame length, stop bits Grigori Goronzy
2016-04-11 17:25 ` Karl Palsson
2016-04-11 18:25 ` Grigori Goronzy
2016-04-10 23:43 ` [PATCH v3 07/13] USB: ch341: add debug output for chip version Grigori Goronzy
2016-04-10 23:43 ` [PATCH v3 08/13] USB: ch341: add support for RTS/CTS flow control Grigori Goronzy
2016-04-11 1:27 ` kbuild test robot
2016-04-10 23:43 ` [PATCH v3 09/13] USB: ch341: fix coding style Grigori Goronzy
2016-04-10 23:43 ` [PATCH v3 10/13] USB: ch341: clean up messages Grigori Goronzy
2016-04-10 23:43 ` [PATCH v3 11/13] USB: ch341: improve B0 handling Grigori Goronzy
2016-04-10 23:43 ` [PATCH v3 12/13] USB: ch341: get rid of default configuration Grigori Goronzy
2016-04-10 23:43 ` [PATCH v3 13/13] USB: ch341: implement tx_empty callback Grigori Goronzy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1460331833-19836-3-git-send-email-greg@chown.ath.cx \
--to=greg@chown.ath.cx \
--cc=gregkh@linuxfoundation.org \
--cc=johan@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®