Received: by 10.223.164.202 with SMTP id h10csp1617331wrb; Thu, 16 Nov 2017 01:05:33 -0800 (PST) X-Google-Smtp-Source: AGs4zMYno4yTNV8icC/wBtXsnpVYChsR/KknRKdGZmwVODoITVfyTo4cA2xEFTH+FeMQnKY4swTU X-Received: by 10.98.141.150 with SMTP id p22mr1080270pfk.207.1510823133132; Thu, 16 Nov 2017 01:05:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510823133; cv=none; d=google.com; s=arc-20160816; b=eH9soiD4eC0cF8u6CiKhfPgzNAObvzJORmH1P5M1EieBgrE9Cx93yfYgcbTD8WKKpu ev7EA89JaUCuDC2H35iZTiu+OB4XaqgKeuRcvOic6iNJp8khOV31No0o1TIyf++sVNLE SoI63Kuq8PQYlKePj4lYTkFULrYWxLcInkLkYC4ufEoaQoBIvx96DD0+8DtEQmmcVNhv dzymuhbgwXazI+RJzgbNoTynK7f153p/kY4H8+5ZOnxUIXTBgKMC5ZD5bSaIG7ahMqA9 1pDPxMLGawZbHv6Kr2U4oIRx4bVibk5cuV6x2EQyLl2WCSXdp2I1HKSOIpdcGAtui/oA +K5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=CLKHOa/BndyT2SLDgijf2L4fYBeoNzTV7AavVD3yKfM=; b=PaU2lwtUWx58r/QjwLLIyuv25ZnnYw0NjxaXtwjEQs1yI3wdGxnWFFDm5TYBl/rxMG 1cpxMxQCGwU8CSD6neXQRAfHofAWfJl1ENme0PsstXu1NroxSENXL9YPVkTUnXI8fvnp ukixxPrtVbILBOfCvUL01s1kMskLBxVromraQwfvPidGTTwefu2FktVf0pDxQdhL7nD4 9tW81EpmY6eLA59FQubpa5x4nLG2IjXaWaXLAw599iDSw2ItQp+jLXxdshTlf6ZfOx0j j7ghdcszt9r1xmZ0MdNPGbbDkxdhPX9BmiJhGZvjxM8IyHkovVLE3hHmWkJe5gxeVwPl 06Dg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=cn0jiMos; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h12si588776pfi.247.2017.11.16.01.05.20; Thu, 16 Nov 2017 01:05:33 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=cn0jiMos; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759367AbdKPHrM (ORCPT + 91 others); Thu, 16 Nov 2017 02:47:12 -0500 Received: from mail-pg0-f66.google.com ([74.125.83.66]:54884 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758949AbdKPHqX (ORCPT ); Thu, 16 Nov 2017 02:46:23 -0500 Received: by mail-pg0-f66.google.com with SMTP id c123so11989164pga.11; Wed, 15 Nov 2017 23:46:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=CLKHOa/BndyT2SLDgijf2L4fYBeoNzTV7AavVD3yKfM=; b=cn0jiMosidNsV3U9nvIkfVaWqMxzP4xixU7Gj6zuaZLnyzv13soAOkBSgS1nErvf+C L6ord6kbT1eutl2okF9kF5XIWWbHRJQgVF/P6eCnwIfGuyXW57AeEUdZVM4RG4ws882k pZDZ6XWBxUmrvadDHMeFn06Jxk5BpMGcC1jbervVW+OJXv6vKYx9NiUiboFDMDmvE2i1 1kBF9pWqs23OZNCDupN34oiMOXkxmW/loBIn0RIncOwmmK/INBEqf7XhE0lGzTGhQdKL S+nkpBMCGA1bjkGCAF+l4BPcDMjOjrtTJOBgk21HpkX2G16WSxGz6EibaBJUD5ZtoaHt aX4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=CLKHOa/BndyT2SLDgijf2L4fYBeoNzTV7AavVD3yKfM=; b=rVUnNpJtnyuO8fsgxY1Jw31mCiom5g68e4bR06v4c+V/FDiQjyLby/Zc5jCArrvpG7 y1By8alV25SrT4LaoC8dNSBpYvYxy6QYbyg4StE9NqaK2UU2pBMJqU8f6IPL75G5M1p+ U3TBesCt+zPKMYZkZJ4JAnOdwL0zdt35nvyGXCr7XJveESPp9DyOg75MmNAKgHK8tN1b vahLaa2ccQinfozqjxhUWqIKAwlIz2L6M6DDqrfvP8ZhW+QG/r17Ud9tp0NyaSv5DQko Y6SwP3mZR6lXzOvPJo4ioxTtubn6LdNHdzJLGuVerXLvkUcdSYJzdDvxHjkLqvo2b3iK nrCA== X-Gm-Message-State: AJaThX6D4PH86fZtDI2kgmIObalhwIbZoFN4iLirvmKOUBYXPiXOS+2A oVlcZfbfLqMeYA8mLmNSNodoLLj2 X-Received: by 10.101.81.6 with SMTP id f6mr866013pgq.64.1510818383024; Wed, 15 Nov 2017 23:46:23 -0800 (PST) Received: from localhost (59-120-186-245.HINET-IP.hinet.net. [59.120.186.245]) by smtp.gmail.com with ESMTPSA id d28sm1499241pfb.105.2017.11.15.23.46.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Nov 2017 23:46:22 -0800 (PST) From: "Ji-Ze Hong (Peter Hong)" X-Google-Original-From: "Ji-Ze Hong (Peter Hong)" To: johan@kernel.org Cc: gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, "Ji-Ze Hong (Peter Hong)" Subject: [PATCH V1 2/4] usb: serial: f81534: add auto RTS direction support Date: Thu, 16 Nov 2017 15:46:07 +0800 Message-Id: <1510818369-10323-2-git-send-email-hpeter+linux_kernel@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1510818369-10323-1-git-send-email-hpeter+linux_kernel@gmail.com> References: <1510818369-10323-1-git-send-email-hpeter+linux_kernel@gmail.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The F81532/534 had auto RTS direction support for RS485 mode. We'll read it from internal Flash with address 0x2f01~0x2f04 for 4 ports. There are 4 conditions below: 0: F81534_PORT_CONF_RS232. 1: F81534_PORT_CONF_RS485. 2: value error, default to F81534_PORT_CONF_RS232. 3: F81534_PORT_CONF_RS485_INVERT. F81532/534 Clock register (offset +08h) Bit0: UART Enable (always on) Bit2-1: Clock source selector 00: 1.846MHz. 01: 18.46MHz. 10: 24MHz. 11: 14.77MHz. Bit4: Auto direction(RTS) control (RTS pin Low when TX) Bit5: Invert direction(RTS) when Bit4 enabled (RTS pin high when TX) Signed-off-by: Ji-Ze Hong (Peter Hong) --- drivers/usb/serial/f81534.c | 54 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 52 insertions(+), 2 deletions(-) diff --git a/drivers/usb/serial/f81534.c b/drivers/usb/serial/f81534.c index 76c676ef5f0d..b2d10309c335 100644 --- a/drivers/usb/serial/f81534.c +++ b/drivers/usb/serial/f81534.c @@ -102,11 +102,16 @@ #define F81534_DEFAULT_BAUD_RATE 9600 +#define F81534_PORT_CONF_RS232 0 +#define F81534_PORT_CONF_RS485 BIT(0) +#define F81534_PORT_CONF_RS485_INVERT (BIT(0) | BIT(1)) #define F81534_PORT_CONF_DISABLE_PORT BIT(3) #define F81534_PORT_CONF_NOT_EXIST_PORT BIT(7) #define F81534_PORT_UNAVAILABLE \ (F81534_PORT_CONF_DISABLE_PORT | F81534_PORT_CONF_NOT_EXIST_PORT) +#define F81534_UART_MODE_MASK (BIT(0) | BIT(1)) + #define F81534_1X_RXTRIGGER 0xc3 #define F81534_8X_RXTRIGGER 0xcf @@ -119,6 +124,8 @@ * 01: 18.46MHz. * 10: 24MHz. * 11: 14.77MHz. + * Bit4: Auto direction(RTS) control (RTS pin Low when TX) + * Bit5: Invert direction(RTS) when Bit4 enabled (RTS pin high when TX) */ #define F81534_CLK_1_846_MHZ BIT(0) @@ -126,6 +133,9 @@ #define F81534_CLK_24_MHZ (BIT(0) | BIT(2)) #define F81534_CLK_14_77_MHZ (BIT(0) | BIT(1) | BIT(2)) +#define F81534_CLK_RS485_MODE BIT(4) +#define F81534_CLK_RS485_INVERT BIT(5) + static const struct usb_device_id f81534_id_table[] = { { USB_DEVICE(FINTEK_VENDOR_ID_1, FINTEK_DEVICE_ID) }, { USB_DEVICE(FINTEK_VENDOR_ID_2, FINTEK_DEVICE_ID) }, @@ -485,16 +495,20 @@ static int f81534_set_port_config(struct usb_serial_port *port, struct tty_struct *tty, u32 baudrate, u32 old_baudrate, u8 lcr) { struct f81534_port_private *port_priv = usb_get_serial_port_data(port); + struct f81534_serial_private *serial_priv; u32 divisor; int status; int idx; u8 value; + u8 tmp; static u32 const baudrate_table[] = {115200, 921600, 1152000, 1500000}; static u8 const clock_table[] = {F81534_CLK_1_846_MHZ, F81534_CLK_14_77_MHZ, F81534_CLK_18_46_MHZ, F81534_CLK_24_MHZ}; + serial_priv = usb_get_serial_data(port->serial); + do { for (idx = 0; idx < ARRAY_SIZE(baudrate_table); ++idx) { if (baudrate <= baudrate_table[idx] && @@ -520,8 +534,25 @@ static int f81534_set_port_config(struct usb_serial_port *port, } while (1); port_priv->baud_base = baudrate_table[idx]; - status = f81534_set_port_register(port, F81534_CLOCK_REG, - clock_table[idx]); + tmp = serial_priv->conf_data[port_priv->phy_num]; + + switch (tmp & F81534_UART_MODE_MASK) { + case F81534_PORT_CONF_RS485_INVERT: + value = F81534_CLK_RS485_MODE | F81534_CLK_RS485_INVERT; + break; + case F81534_PORT_CONF_RS485: + value = F81534_CLK_RS485_MODE; + break; + + default: + /* fall through, default RS232 Mode */ + case F81534_PORT_CONF_RS232: + value = 0; + break; + } + + value |= clock_table[idx]; + status = f81534_set_port_register(port, F81534_CLOCK_REG, value); if (status) { dev_err(&port->dev, "CLOCK_REG setting failed\n"); return status; @@ -1270,9 +1301,12 @@ static void f81534_lsr_worker(struct work_struct *work) static int f81534_port_probe(struct usb_serial_port *port) { + struct f81534_serial_private *serial_priv; struct f81534_port_private *port_priv; int ret; + u8 value; + serial_priv = usb_get_serial_data(port->serial); port_priv = devm_kzalloc(&port->dev, sizeof(*port_priv), GFP_KERNEL); if (!port_priv) return -ENOMEM; @@ -1304,6 +1338,22 @@ static int f81534_port_probe(struct usb_serial_port *port) if (ret) return ret; + value = serial_priv->conf_data[port_priv->phy_num]; + switch (value & F81534_UART_MODE_MASK) { + case F81534_PORT_CONF_RS485_INVERT: + dev_info(&port->dev, "RS485 invert mode.\n"); + break; + case F81534_PORT_CONF_RS485: + dev_info(&port->dev, "RS485 mode.\n"); + break; + + default: + /* fall through, default RS232 Mode */ + case F81534_PORT_CONF_RS232: + dev_info(&port->dev, "RS232 mode.\n"); + break; + } + return 0; } -- 2.7.4 From 1584205627008771636@xxx Thu Nov 16 07:10:18 +0000 2017 X-GM-THRID: 1584144460908342567 X-Gmail-Labels: Inbox,Category Forums,HistoricalUnread