From mboxrd@z Thu Jan 1 00:00:00 1970 From: Johan Hovold Subject: [PATCH 2/2] USB: serial: ftdi_sio: add support for FT232R CBUS gpios Date: Sun, 30 Sep 2018 14:27:03 +0200 Message-ID: <20180930122703.7115-3-johan@kernel.org> References: <20180930122703.7115-1-johan@kernel.org> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Return-path: In-Reply-To: <20180930122703.7115-1-johan@kernel.org> Sender: linux-kernel-owner@vger.kernel.org To: linux-usb@vger.kernel.org Cc: Karoly Pados , Loic Poulain , Linus Walleij , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold List-Id: linux-gpio@vger.kernel.org Enable support for cbus gpios on FT232R. The cbus configuration is stored in one word in the EEPROM at offset 0x0a (byte-offset 0x14) with the mux config for CBUS0, CBUS1, CBUS2 and CBUS3 in bits 0..3, 4..7, 8..11 and 12..15, respectively. Tested using FT232RL by configuring one cbus pin at a time. Signed-off-by: Johan Hovold --- drivers/usb/serial/ftdi_sio.c | 40 +++++++++++++++++++++++++++++++++-- drivers/usb/serial/ftdi_sio.h | 3 ++- 2 files changed, 40 insertions(+), 3 deletions(-) diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index be50b2a200aa..f1eb20acb3bb 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c @@ -2007,7 +2007,40 @@ static int ftdi_read_eeprom(struct usb_serial *serial, void *dst, u16 addr, return 0; } -static int ftx_gpioconf_init(struct usb_serial_port *port) +static int ftdi_gpio_init_ft232r(struct usb_serial_port *port) +{ + struct ftdi_private *priv = usb_get_serial_port_data(port); + u16 cbus_config; + u8 *buf; + int ret; + int i; + + buf = kmalloc(2, GFP_KERNEL); + if (!buf) + return -ENOMEM; + + ret = ftdi_read_eeprom(port->serial, buf, 0x14, 2); + if (ret < 0) + goto out_free; + + cbus_config = le16_to_cpup((__le16 *)buf); + dev_dbg(&port->dev, "cbus_config = 0x%04x\n", cbus_config); + + priv->gc.ngpio = 4; + + priv->gpio_altfunc = 0xff; + for (i = 0; i < priv->gc.ngpio; ++i) { + if ((cbus_config & 0xf) == FTDI_FT232R_CBUS_MUX_GPIO) + priv->gpio_altfunc &= ~BIT(i); + cbus_config >>= 4; + } +out_free: + kfree(buf); + + return ret; +} + +static int ftdi_gpio_init_ftx(struct usb_serial_port *port) { struct ftdi_private *priv = usb_get_serial_port_data(port); struct usb_serial *serial = port->serial; @@ -2049,8 +2082,11 @@ static int ftdi_gpio_init(struct usb_serial_port *port) int result; switch (priv->chip_type) { + case FT232RL: + result = ftdi_gpio_init_ft232r(port); + break; case FTX: - result = ftx_gpioconf_init(port); + result = ftdi_gpio_init_ftx(port); break; default: return 0; diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h index 6cfe682f8348..a79a1325b4d9 100644 --- a/drivers/usb/serial/ftdi_sio.h +++ b/drivers/usb/serial/ftdi_sio.h @@ -457,7 +457,8 @@ enum ftdi_sio_baudrate { #define FTDI_SIO_READ_EEPROM_REQUEST_TYPE 0xc0 #define FTDI_SIO_READ_EEPROM_REQUEST FTDI_SIO_READ_EEPROM -#define FTDI_FTX_CBUS_MUX_GPIO 8 +#define FTDI_FTX_CBUS_MUX_GPIO 0x8 +#define FTDI_FT232R_CBUS_MUX_GPIO 0xa /* Descriptors returned by the device -- 2.19.0 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: [2/2] USB: serial: ftdi_sio: add support for FT232R CBUS gpios From: Johan Hovold Message-Id: <20180930122703.7115-3-johan@kernel.org> Date: Sun, 30 Sep 2018 14:27:03 +0200 To: linux-usb@vger.kernel.org Cc: Karoly Pados , Loic Poulain , Linus Walleij , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold List-ID: RW5hYmxlIHN1cHBvcnQgZm9yIGNidXMgZ3Bpb3Mgb24gRlQyMzJSLiBUaGUgY2J1cyBjb25maWd1 cmF0aW9uIGlzCnN0b3JlZCBpbiBvbmUgd29yZCBpbiB0aGUgRUVQUk9NIGF0IG9mZnNldCAweDBh IChieXRlLW9mZnNldCAweDE0KSB3aXRoCnRoZSBtdXggY29uZmlnIGZvciBDQlVTMCwgQ0JVUzEs IENCVVMyIGFuZCBDQlVTMyBpbiBiaXRzIDAuLjMsIDQuLjcsCjguLjExIGFuZCAxMi4uMTUsIHJl c3BlY3RpdmVseS4KClRlc3RlZCB1c2luZyBGVDIzMlJMIGJ5IGNvbmZpZ3VyaW5nIG9uZSBjYnVz IHBpbiBhdCBhIHRpbWUuCgpTaWduZWQtb2ZmLWJ5OiBKb2hhbiBIb3ZvbGQgPGpvaGFuQGtlcm5l bC5vcmc+Ci0tLQogZHJpdmVycy91c2Ivc2VyaWFsL2Z0ZGlfc2lvLmMgfCA0MCArKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKystLQogZHJpdmVycy91c2Ivc2VyaWFsL2Z0ZGlfc2lvLmgg fCAgMyArKy0KIDIgZmlsZXMgY2hhbmdlZCwgNDAgaW5zZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL3VzYi9zZXJpYWwvZnRkaV9zaW8uYyBiL2RyaXZlcnMv dXNiL3NlcmlhbC9mdGRpX3Npby5jCmluZGV4IGJlNTBiMmEyMDBhYS4uZjFlYjIwYWNiM2JiIDEw MDY0NAotLS0gYS9kcml2ZXJzL3VzYi9zZXJpYWwvZnRkaV9zaW8uYworKysgYi9kcml2ZXJzL3Vz Yi9zZXJpYWwvZnRkaV9zaW8uYwpAQCAtMjAwNyw3ICsyMDA3LDQwIEBAIHN0YXRpYyBpbnQgZnRk aV9yZWFkX2VlcHJvbShzdHJ1Y3QgdXNiX3NlcmlhbCAqc2VyaWFsLCB2b2lkICpkc3QsIHUxNiBh ZGRyLAogCXJldHVybiAwOwogfQogCi1zdGF0aWMgaW50IGZ0eF9ncGlvY29uZl9pbml0KHN0cnVj dCB1c2Jfc2VyaWFsX3BvcnQgKnBvcnQpCitzdGF0aWMgaW50IGZ0ZGlfZ3Bpb19pbml0X2Z0MjMy cihzdHJ1Y3QgdXNiX3NlcmlhbF9wb3J0ICpwb3J0KQoreworCXN0cnVjdCBmdGRpX3ByaXZhdGUg KnByaXYgPSB1c2JfZ2V0X3NlcmlhbF9wb3J0X2RhdGEocG9ydCk7CisJdTE2IGNidXNfY29uZmln OworCXU4ICpidWY7CisJaW50IHJldDsKKwlpbnQgaTsKKworCWJ1ZiA9IGttYWxsb2MoMiwgR0ZQ X0tFUk5FTCk7CisJaWYgKCFidWYpCisJCXJldHVybiAtRU5PTUVNOworCisJcmV0ID0gZnRkaV9y ZWFkX2VlcHJvbShwb3J0LT5zZXJpYWwsIGJ1ZiwgMHgxNCwgMik7CisJaWYgKHJldCA8IDApCisJ CWdvdG8gb3V0X2ZyZWU7CisKKwljYnVzX2NvbmZpZyA9IGxlMTZfdG9fY3B1cCgoX19sZTE2ICop YnVmKTsKKwlkZXZfZGJnKCZwb3J0LT5kZXYsICJjYnVzX2NvbmZpZyA9IDB4JTA0eFxuIiwgY2J1 c19jb25maWcpOworCisJcHJpdi0+Z2MubmdwaW8gPSA0OworCisJcHJpdi0+Z3Bpb19hbHRmdW5j ID0gMHhmZjsKKwlmb3IgKGkgPSAwOyBpIDwgcHJpdi0+Z2MubmdwaW87ICsraSkgeworCQlpZiAo KGNidXNfY29uZmlnICYgMHhmKSA9PSBGVERJX0ZUMjMyUl9DQlVTX01VWF9HUElPKQorCQkJcHJp di0+Z3Bpb19hbHRmdW5jICY9IH5CSVQoaSk7CisJCWNidXNfY29uZmlnID4+PSA0OworCX0KK291 dF9mcmVlOgorCWtmcmVlKGJ1Zik7CisKKwlyZXR1cm4gcmV0OworfQorCitzdGF0aWMgaW50IGZ0 ZGlfZ3Bpb19pbml0X2Z0eChzdHJ1Y3QgdXNiX3NlcmlhbF9wb3J0ICpwb3J0KQogewogCXN0cnVj dCBmdGRpX3ByaXZhdGUgKnByaXYgPSB1c2JfZ2V0X3NlcmlhbF9wb3J0X2RhdGEocG9ydCk7CiAJ c3RydWN0IHVzYl9zZXJpYWwgKnNlcmlhbCA9IHBvcnQtPnNlcmlhbDsKQEAgLTIwNDksOCArMjA4 MiwxMSBAQCBzdGF0aWMgaW50IGZ0ZGlfZ3Bpb19pbml0KHN0cnVjdCB1c2Jfc2VyaWFsX3BvcnQg KnBvcnQpCiAJaW50IHJlc3VsdDsKIAogCXN3aXRjaCAocHJpdi0+Y2hpcF90eXBlKSB7CisJY2Fz ZSBGVDIzMlJMOgorCQlyZXN1bHQgPSBmdGRpX2dwaW9faW5pdF9mdDIzMnIocG9ydCk7CisJCWJy ZWFrOwogCWNhc2UgRlRYOgotCQlyZXN1bHQgPSBmdHhfZ3Bpb2NvbmZfaW5pdChwb3J0KTsKKwkJ cmVzdWx0ID0gZnRkaV9ncGlvX2luaXRfZnR4KHBvcnQpOwogCQlicmVhazsKIAlkZWZhdWx0Ogog CQlyZXR1cm4gMDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvdXNiL3NlcmlhbC9mdGRpX3Npby5oIGIv ZHJpdmVycy91c2Ivc2VyaWFsL2Z0ZGlfc2lvLmgKaW5kZXggNmNmZTY4MmY4MzQ4Li5hNzlhMTMy NWI0ZDkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvdXNiL3NlcmlhbC9mdGRpX3Npby5oCisrKyBiL2Ry aXZlcnMvdXNiL3NlcmlhbC9mdGRpX3Npby5oCkBAIC00NTcsNyArNDU3LDggQEAgZW51bSBmdGRp X3Npb19iYXVkcmF0ZSB7CiAjZGVmaW5lIEZURElfU0lPX1JFQURfRUVQUk9NX1JFUVVFU1RfVFlQ RSAweGMwCiAjZGVmaW5lIEZURElfU0lPX1JFQURfRUVQUk9NX1JFUVVFU1QgRlRESV9TSU9fUkVB RF9FRVBST00KIAotI2RlZmluZSBGVERJX0ZUWF9DQlVTX01VWF9HUElPCQk4CisjZGVmaW5lIEZU RElfRlRYX0NCVVNfTVVYX0dQSU8JCTB4OAorI2RlZmluZSBGVERJX0ZUMjMyUl9DQlVTX01VWF9H UElPCTB4YQogCiAKIC8qIERlc2NyaXB0b3JzIHJldHVybmVkIGJ5IHRoZSBkZXZpY2UK