lkml.org 
[lkml]   [2016]   [Apr]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 02/13] USB: ch341: add LCR register definitions
    Date
    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
    \
     
     \ /
      Last update: 2016-04-11 02:01    [W:3.384 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site