From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [V3,2/6] usb: serial: f81534: add auto RTS direction support From: "Ji-Ze Hong \(Peter Hong\)" Message-Id: <1515653240-5420-2-git-send-email-hpeter+linux_kernel@gmail.com> Date: Thu, 11 Jan 2018 14:47:16 +0800 To: johan@kernel.org Cc: gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, peter_hong@fintek.com.tw, "Ji-Ze Hong \(Peter Hong\)" List-ID: VGhlIEY4MTUzMi81MzQgaGFkIGF1dG8gUlRTIGRpcmVjdGlvbiBzdXBwb3J0IGZvciBSUzQ4NSBt b2RlLgpXZSdsbCByZWFkIGl0IGZyb20gaW50ZXJuYWwgRmxhc2ggd2l0aCBhZGRyZXNzIDB4MmYw MX4weDJmMDQgZm9yIDQgcG9ydHMuClRoZXJlIGFyZSA0IGNvbmRpdGlvbnMgYmVsb3c6CgkwOiBG ODE1MzRfUE9SVF9DT05GX1JTMjMyLgoJMTogRjgxNTM0X1BPUlRfQ09ORl9SUzQ4NS4KCTI6IHZh bHVlIGVycm9yLCBkZWZhdWx0IHRvIEY4MTUzNF9QT1JUX0NPTkZfUlMyMzIuCgkzOiBGODE1MzRf UE9SVF9DT05GX1JTNDg1X0lOVkVSVC4KCkY4MTUzMi81MzQgQ2xvY2sgcmVnaXN0ZXIgKG9mZnNl dCArMDhoKQoKQml0MDoJVUFSVCBFbmFibGUgKGFsd2F5cyBvbikKQml0Mi0xOglDbG9jayBzb3Vy Y2Ugc2VsZWN0b3IKCQkJMDA6IDEuODQ2TUh6LgoJCQkwMTogMTguNDZNSHouCgkJCTEwOiAyNE1I ei4KCQkJMTE6IDE0Ljc3TUh6LgpCaXQ0OglBdXRvIGRpcmVjdGlvbihSVFMpIGNvbnRyb2wgKFJU UyBwaW4gTG93IHdoZW4gVFgpCkJpdDU6CUludmVydCBkaXJlY3Rpb24oUlRTKSB3aGVuIEJpdDQg ZW5hYmxlZCAoUlRTIHBpbiBoaWdoIHdoZW4gVFgpCgpTaWduZWQtb2ZmLWJ5OiBKaS1aZSBIb25n IChQZXRlciBIb25nKSA8aHBldGVyK2xpbnV4X2tlcm5lbEBnbWFpbC5jb20+Ci0tLQpWMzoKCTE6 IGNoYW5nZSBzb21lIEJJVCgpIG9wZXJhdGlvbiB0byBHRU5NQVNLKCkuCgkyOiBjaGFuZ2Ugc29t ZSBkZXZfaW5mbygpIHRvIGRldl9kYmcoKS4KClYyOgoJMTogUmVhZCB0aGUgY29uZmlndXJlIGRh dGEgZnJvbSBmbGFzaCBhbmQgc2F2ZSBpdCB0byBzaGFkb3cgY2xvY2sKCSAgIHJlZ2lzdGVyLgoK IGRyaXZlcnMvdXNiL3NlcmlhbC9mODE1MzQuYyB8IDMwICsrKysrKysrKysrKysrKysrKysrKysr KysrKysrKwogMSBmaWxlIGNoYW5nZWQsIDMwIGluc2VydGlvbnMoKykKCmRpZmYgLS1naXQgYS9k cml2ZXJzL3VzYi9zZXJpYWwvZjgxNTM0LmMgYi9kcml2ZXJzL3VzYi9zZXJpYWwvZjgxNTM0LmMK aW5kZXggMTU2M2QzZjM0MzgxLi4yMjAxYmU1NzdkZDMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvdXNi L3NlcmlhbC9mODE1MzQuYworKysgYi9kcml2ZXJzL3VzYi9zZXJpYWwvZjgxNTM0LmMKQEAgLTk4 LDExICs5OCwxNiBAQAogCiAjZGVmaW5lIEY4MTUzNF9ERUZBVUxUX0JBVURfUkFURQk5NjAwCiAK KyNkZWZpbmUgRjgxNTM0X1BPUlRfQ09ORl9SUzIzMgkJMAorI2RlZmluZSBGODE1MzRfUE9SVF9D T05GX1JTNDg1CQlCSVQoMCkKKyNkZWZpbmUgRjgxNTM0X1BPUlRfQ09ORl9SUzQ4NV9JTlZFUlQJ R0VOTUFTSygxLCAwKQogI2RlZmluZSBGODE1MzRfUE9SVF9DT05GX0RJU0FCTEVfUE9SVAlCSVQo MykKICNkZWZpbmUgRjgxNTM0X1BPUlRfQ09ORl9OT1RfRVhJU1RfUE9SVAlCSVQoNykKICNkZWZp bmUgRjgxNTM0X1BPUlRfVU5BVkFJTEFCTEUJCVwKIAkoRjgxNTM0X1BPUlRfQ09ORl9ESVNBQkxF X1BPUlQgfCBGODE1MzRfUE9SVF9DT05GX05PVF9FWElTVF9QT1JUKQogCisjZGVmaW5lIEY4MTUz NF9VQVJUX01PREVfTUFTSwkJR0VOTUFTSygxLCAwKQorCiAjZGVmaW5lIEY4MTUzNF8xWF9SWFRS SUdHRVIJCTB4YzMKICNkZWZpbmUgRjgxNTM0XzhYX1JYVFJJR0dFUgkJMHhjZgogCkBAIC0xMTUs NiArMTIwLDggQEAKICAqCQkJMDE6IDE4LjQ2TUh6LgogICoJCQkxMDogMjRNSHouCiAgKgkJCTEx OiAxNC43N01Iei4KKyAqIEJpdDQ6CUF1dG8gZGlyZWN0aW9uKFJUUykgY29udHJvbCAoUlRTIHBp biBMb3cgd2hlbiBUWCkKKyAqIEJpdDU6CUludmVydCBkaXJlY3Rpb24oUlRTKSB3aGVuIEJpdDQg ZW5hYmxlZCAoUlRTIHBpbiBoaWdoIHdoZW4gVFgpCiAgKi8KIAogI2RlZmluZSBGODE1MzRfVUFS VF9FTgkJCUJJVCgwKQpAQCAtMTIzLDYgKzEzMCw4IEBACiAjZGVmaW5lIEY4MTUzNF9DTEtfMjRf TUhaCQlCSVQoMikKICNkZWZpbmUgRjgxNTM0X0NMS18xNF83N19NSFoJCUdFTk1BU0soMiwgMSkK ICNkZWZpbmUgRjgxNTM0X0NMS19NQVNLCQkJR0VOTUFTSygyLCAxKQorI2RlZmluZSBGODE1MzRf Q0xLX1JTNDg1X01PREUJCUJJVCg0KQorI2RlZmluZSBGODE1MzRfQ0xLX1JTNDg1X0lOVkVSVAkJ QklUKDUpCiAKIHN0YXRpYyBjb25zdCBzdHJ1Y3QgdXNiX2RldmljZV9pZCBmODE1MzRfaWRfdGFi bGVbXSA9IHsKIAl7IFVTQl9ERVZJQ0UoRklOVEVLX1ZFTkRPUl9JRF8xLCBGSU5URUtfREVWSUNF X0lEKSB9LApAQCAtMTI3NCw5ICsxMjgzLDEyIEBAIHN0YXRpYyB2b2lkIGY4MTUzNF9sc3Jfd29y a2VyKHN0cnVjdCB3b3JrX3N0cnVjdCAqd29yaykKIAogc3RhdGljIGludCBmODE1MzRfcG9ydF9w cm9iZShzdHJ1Y3QgdXNiX3NlcmlhbF9wb3J0ICpwb3J0KQogeworCXN0cnVjdCBmODE1MzRfc2Vy aWFsX3ByaXZhdGUgKnNlcmlhbF9wcml2OwogCXN0cnVjdCBmODE1MzRfcG9ydF9wcml2YXRlICpw b3J0X3ByaXY7CiAJaW50IHJldDsKKwl1OCB2YWx1ZTsKIAorCXNlcmlhbF9wcml2ID0gdXNiX2dl dF9zZXJpYWxfZGF0YShwb3J0LT5zZXJpYWwpOwogCXBvcnRfcHJpdiA9IGRldm1fa3phbGxvYygm cG9ydC0+ZGV2LCBzaXplb2YoKnBvcnRfcHJpdiksIEdGUF9LRVJORUwpOwogCWlmICghcG9ydF9w cml2KQogCQlyZXR1cm4gLUVOT01FTTsKQEAgLTEzMDksNiArMTMyMSwyNCBAQCBzdGF0aWMgaW50 IGY4MTUzNF9wb3J0X3Byb2JlKHN0cnVjdCB1c2Jfc2VyaWFsX3BvcnQgKnBvcnQpCiAJaWYgKHJl dCkKIAkJcmV0dXJuIHJldDsKIAorCXZhbHVlID0gc2VyaWFsX3ByaXYtPmNvbmZfZGF0YVtwb3J0 X3ByaXYtPnBoeV9udW1dOworCXN3aXRjaCAodmFsdWUgJiBGODE1MzRfVUFSVF9NT0RFX01BU0sp IHsKKwljYXNlIEY4MTUzNF9QT1JUX0NPTkZfUlM0ODVfSU5WRVJUOgorCQlwb3J0X3ByaXYtPnNo YWRvd19jbGsgfD0gRjgxNTM0X0NMS19SUzQ4NV9NT0RFIHwKKwkJCQkJRjgxNTM0X0NMS19SUzQ4 NV9JTlZFUlQ7CisJCWRldl9kYmcoJnBvcnQtPmRldiwgIlJTNDg1IGludmVydCBtb2RlLlxuIik7 CisJCWJyZWFrOworCWNhc2UgRjgxNTM0X1BPUlRfQ09ORl9SUzQ4NToKKwkJcG9ydF9wcml2LT5z aGFkb3dfY2xrIHw9IEY4MTUzNF9DTEtfUlM0ODVfTU9ERTsKKwkJZGV2X2RiZygmcG9ydC0+ZGV2 LCAiUlM0ODUgbW9kZS5cbiIpOworCQlicmVhazsKKworCWRlZmF1bHQ6CisJY2FzZSBGODE1MzRf UE9SVF9DT05GX1JTMjMyOgorCQlkZXZfZGJnKCZwb3J0LT5kZXYsICJSUzIzMiBtb2RlLlxuIik7 CisJCWJyZWFrOworCX0KKwogCXJldHVybiAwOwogfQogCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932499AbeAKGsq (ORCPT + 1 other); Thu, 11 Jan 2018 01:48:46 -0500 Received: from mail-pf0-f194.google.com ([209.85.192.194]:34785 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932297AbeAKGrY (ORCPT ); Thu, 11 Jan 2018 01:47:24 -0500 X-Google-Smtp-Source: ACJfBot9vuuVN38Ex2fnlfvF6FyJYdLDMSZBfQpKtjtKut118hFhS0f8LTuZ1PIV80tWpaR4cGkzPA== 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, peter_hong@fintek.com.tw, "Ji-Ze Hong (Peter Hong)" Subject: [PATCH V3 2/6] usb: serial: f81534: add auto RTS direction support Date: Thu, 11 Jan 2018 14:47:16 +0800 Message-Id: <1515653240-5420-2-git-send-email-hpeter+linux_kernel@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515653240-5420-1-git-send-email-hpeter+linux_kernel@gmail.com> References: <1515653240-5420-1-git-send-email-hpeter+linux_kernel@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: 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) --- V3: 1: change some BIT() operation to GENMASK(). 2: change some dev_info() to dev_dbg(). V2: 1: Read the configure data from flash and save it to shadow clock register. drivers/usb/serial/f81534.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/drivers/usb/serial/f81534.c b/drivers/usb/serial/f81534.c index 1563d3f34381..2201be577dd3 100644 --- a/drivers/usb/serial/f81534.c +++ b/drivers/usb/serial/f81534.c @@ -98,11 +98,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 GENMASK(1, 0) #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 GENMASK(1, 0) + #define F81534_1X_RXTRIGGER 0xc3 #define F81534_8X_RXTRIGGER 0xcf @@ -115,6 +120,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_UART_EN BIT(0) @@ -123,6 +130,8 @@ #define F81534_CLK_24_MHZ BIT(2) #define F81534_CLK_14_77_MHZ GENMASK(2, 1) #define F81534_CLK_MASK GENMASK(2, 1) +#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) }, @@ -1274,9 +1283,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; @@ -1309,6 +1321,24 @@ 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: + port_priv->shadow_clk |= F81534_CLK_RS485_MODE | + F81534_CLK_RS485_INVERT; + dev_dbg(&port->dev, "RS485 invert mode.\n"); + break; + case F81534_PORT_CONF_RS485: + port_priv->shadow_clk |= F81534_CLK_RS485_MODE; + dev_dbg(&port->dev, "RS485 mode.\n"); + break; + + default: + case F81534_PORT_CONF_RS232: + dev_dbg(&port->dev, "RS232 mode.\n"); + break; + } + return 0; } -- 2.7.4