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,3/6] usb: serial: f81534: add output pin control From: "Ji-Ze Hong \(Peter Hong\)" Message-Id: <1515653240-5420-3-git-send-email-hpeter+linux_kernel@gmail.com> Date: Thu, 11 Jan 2018 14:47:17 +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: VGhlIEY4MTUzMi81MzQgaGFkIDMgb3V0cHV0IHBpbiAoTTAvU0QsIE0xLCBNMikgd2l0aCBvcGVu LWRyYWluIG1vZGUgdG8KY29udHJvbCB0cmFuc2NlaXZlci4gV2UnbGwgcmVhZCBpdCBmcm9tIGlu dGVybmFsIEZsYXNoIHdpdGggYWRkcmVzcwoweDJmMDV+MHgyZjA4IGZvciA0IHBvcnRzLiBUaGUg dmFsdWUgaXMgcmFuZ2UgZnJvbSAwIHRvIDcuIFRoZSBNMC9TRCBpcwpNU0Igb2YgdGhpcyB2YWx1 ZS4gRm9yIGEgZXhhbXBsZXMsIElmIHJlYWQgdmFsdWUgaXMgNiwgd2UnbGwgd3JpdGUgTTAvU0Qs Ck0xLCBNMiBhcyAxLCAxLCAwLgoKU2lnbmVkLW9mZi1ieTogSmktWmUgSG9uZyAoUGV0ZXIgSG9u ZykgPGhwZXRlcitsaW51eF9rZXJuZWxAZ21haWwuY29tPgotLS0KVjM6CgkxOiBjaGFuZ2UgcmVn X21hc2sgdHlwZSBmcm9tIHUxNiB0byB1OC4KCTI6IGNoYW5nZSBzcGFjZSBhcm91bmQgInsiICYg In0iLgoKVjI6CgkxOiBGaXggZm9yIHNwYWNlIGJldHdlZW4gYnJhY2UuCgkyOiBSZW1haW4gdGhl IG9sZCBwaW4gY29udHJvbCBtZXRob2QuCgogZHJpdmVycy91c2Ivc2VyaWFsL2Y4MTUzNC5jIHwg NjcgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKystCiAxIGZpbGUg Y2hhbmdlZCwgNjYgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbigtKQoKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvdXNiL3NlcmlhbC9mODE1MzQuYyBiL2RyaXZlcnMvdXNiL3NlcmlhbC9mODE1MzQuYwpp bmRleCAyMjAxYmU1NzdkZDMuLmU3ZGQwMTMxMGYyMCAxMDA2NDQKLS0tIGEvZHJpdmVycy91c2Iv c2VyaWFsL2Y4MTUzNC5jCisrKyBiL2RyaXZlcnMvdXNiL3NlcmlhbC9mODE1MzQuYwpAQCAtNTIs NiArNTIsNyBAQAogI2RlZmluZSBGODE1MzRfQ1VTVE9NX05PX0NVU1RPTV9EQVRBCTB4ZmYKICNk ZWZpbmUgRjgxNTM0X0NVU1RPTV9WQUxJRF9UT0tFTgkweGYwCiAjZGVmaW5lIEY4MTUzNF9DT05G X09GRlNFVAkJMQorI2RlZmluZSBGODE1MzRfQ09ORl9HUElPX09GRlNFVAkJNAogCiAjZGVmaW5l IEY4MTUzNF9NQVhfREFUQV9CTE9DSwkJNjQKICNkZWZpbmUgRjgxNTM0X01BWF9CVVNfUkVUUlkJ CTIwCkBAIC0xNjQsNiArMTY1LDIzIEBAIHN0cnVjdCBmODE1MzRfcG9ydF9wcml2YXRlIHsKIAl1 OCBwaHlfbnVtOwogfTsKIAorc3RydWN0IGY4MTUzNF9waW5fZGF0YSB7CisJY29uc3QgdTE2IHJl Z19hZGRyOworCWNvbnN0IHU4IHJlZ19tYXNrOworfTsKKworc3RydWN0IGY4MTUzNF9wb3J0X291 dF9waW4geworCXN0cnVjdCBmODE1MzRfcGluX2RhdGEgcGluWzNdOworfTsKKworLyogUGluIG91 dHB1dCB2YWx1ZSBmb3IgTTIvTTEvTTAoU0QpICovCitzdGF0aWMgY29uc3Qgc3RydWN0IGY4MTUz NF9wb3J0X291dF9waW4gZjgxNTM0X3BvcnRfb3V0X3BpbnNbXSA9IHsKKwkgeyB7IHsgMHgyYWU4 LCBCSVQoNykgfSwgeyAweDJhOTAsIEJJVCg1KSB9LCB7IDB4MmE5MCwgQklUKDQpIH0gfSB9LAor CSB7IHsgeyAweDJhZTgsIEJJVCg2KSB9LCB7IDB4MmFlOCwgQklUKDApIH0sIHsgMHgyYWU4LCBC SVQoMykgfSB9IH0sCisJIHsgeyB7IDB4MmE5MCwgQklUKDApIH0sIHsgMHgyYWU4LCBCSVQoMikg fSwgeyAweDJhODAsIEJJVCg2KSB9IH0gfSwKKwkgeyB7IHsgMHgyYTkwLCBCSVQoMykgfSwgeyAw eDJhOTAsIEJJVCgyKSB9LCB7IDB4MmE5MCwgQklUKDEpIH0gfSB9LAorfTsKKwogc3RhdGljIHUz MiBjb25zdCBiYXVkcmF0ZV90YWJsZVtdID0geyAxMTUyMDAsIDkyMTYwMCwgMTE1MjAwMCwgMTUw MDAwMCB9Owogc3RhdGljIHU4IGNvbnN0IGNsb2NrX3RhYmxlW10gPSB7IEY4MTUzNF9DTEtfMV84 NDZfTUhaLCBGODE1MzRfQ0xLXzE0Xzc3X01IWiwKIAkJCQlGODE1MzRfQ0xLXzE4XzQ2X01IWiwg RjgxNTM0X0NMS18yNF9NSFogfTsKQEAgLTI3Myw2ICsyOTEsMjIgQEAgc3RhdGljIGludCBmODE1 MzRfZ2V0X3JlZ2lzdGVyKHN0cnVjdCB1c2Jfc2VyaWFsICpzZXJpYWwsIHUxNiByZWcsIHU4ICpk YXRhKQogCXJldHVybiBzdGF0dXM7CiB9CiAKK3N0YXRpYyBpbnQgZjgxNTM0X3NldF9tYXNrX3Jl Z2lzdGVyKHN0cnVjdCB1c2Jfc2VyaWFsICpzZXJpYWwsIHUxNiByZWcsCisJCQkJCXU4IG1hc2ss IHU4IGRhdGEpCit7CisJaW50IHN0YXR1czsKKwl1OCB0bXA7CisKKwlzdGF0dXMgPSBmODE1MzRf Z2V0X3JlZ2lzdGVyKHNlcmlhbCwgcmVnLCAmdG1wKTsKKwlpZiAoc3RhdHVzKQorCQlyZXR1cm4g c3RhdHVzOworCisJdG1wICY9IH5tYXNrOworCXRtcCB8PSAobWFzayAmIGRhdGEpOworCisJcmV0 dXJuIGY4MTUzNF9zZXRfcmVnaXN0ZXIoc2VyaWFsLCByZWcsIHRtcCk7Cit9CisKIHN0YXRpYyBp bnQgZjgxNTM0X3NldF9wb3J0X3JlZ2lzdGVyKHN0cnVjdCB1c2Jfc2VyaWFsX3BvcnQgKnBvcnQs IHUxNiByZWcsCiAJCQkJCXU4IGRhdGEpCiB7CkBAIC0xMjgxLDYgKzEzMTUsMzcgQEAgc3RhdGlj IHZvaWQgZjgxNTM0X2xzcl93b3JrZXIoc3RydWN0IHdvcmtfc3RydWN0ICp3b3JrKQogCQlkZXZf d2FybigmcG9ydC0+ZGV2LCAicmVhZCBMU1IgZmFpbGVkOiAlZFxuIiwgc3RhdHVzKTsKIH0KIAor c3RhdGljIGludCBmODE1MzRfc2V0X3BvcnRfb3V0cHV0X3BpbihzdHJ1Y3QgdXNiX3NlcmlhbF9w b3J0ICpwb3J0KQoreworCXN0cnVjdCBmODE1MzRfc2VyaWFsX3ByaXZhdGUgKnNlcmlhbF9wcml2 OworCXN0cnVjdCBmODE1MzRfcG9ydF9wcml2YXRlICpwb3J0X3ByaXY7CisJc3RydWN0IHVzYl9z ZXJpYWwgKnNlcmlhbDsKKwljb25zdCBzdHJ1Y3QgZjgxNTM0X3BvcnRfb3V0X3BpbiAqcGluczsK KwlpbnQgc3RhdHVzOworCWludCBpOworCXU4IHZhbHVlOworCXU4IGlkeDsKKworCXNlcmlhbCA9 IHBvcnQtPnNlcmlhbDsKKwlzZXJpYWxfcHJpdiA9IHVzYl9nZXRfc2VyaWFsX2RhdGEoc2VyaWFs KTsKKwlwb3J0X3ByaXYgPSB1c2JfZ2V0X3NlcmlhbF9wb3J0X2RhdGEocG9ydCk7CisKKwlpZHgg PSBGODE1MzRfQ09ORl9HUElPX09GRlNFVCArIHBvcnRfcHJpdi0+cGh5X251bTsKKwl2YWx1ZSA9 IHNlcmlhbF9wcml2LT5jb25mX2RhdGFbaWR4XTsKKwlwaW5zID0gJmY4MTUzNF9wb3J0X291dF9w aW5zW3BvcnRfcHJpdi0+cGh5X251bV07CisKKwlmb3IgKGkgPSAwOyBpIDwgQVJSQVlfU0laRShw aW5zLT5waW4pOyArK2kpIHsKKwkJc3RhdHVzID0gZjgxNTM0X3NldF9tYXNrX3JlZ2lzdGVyKHNl cmlhbCwKKwkJCQlwaW5zLT5waW5baV0ucmVnX2FkZHIsIHBpbnMtPnBpbltpXS5yZWdfbWFzaywK KwkJCQl2YWx1ZSAmIEJJVChpKSA/IHBpbnMtPnBpbltpXS5yZWdfbWFzayA6IDApOworCQlpZiAo c3RhdHVzKQorCQkJcmV0dXJuIHN0YXR1czsKKwl9CisKKwlkZXZfZGJnKCZwb3J0LT5kZXYsICJP dXRwdXQgcGluIChNMC9NMS9NMik6ICVkXG4iLCB2YWx1ZSk7CisJcmV0dXJuIDA7Cit9CisKIHN0 YXRpYyBpbnQgZjgxNTM0X3BvcnRfcHJvYmUoc3RydWN0IHVzYl9zZXJpYWxfcG9ydCAqcG9ydCkK IHsKIAlzdHJ1Y3QgZjgxNTM0X3NlcmlhbF9wcml2YXRlICpzZXJpYWxfcHJpdjsKQEAgLTEzMzks NyArMTQwNCw3IEBAIHN0YXRpYyBpbnQgZjgxNTM0X3BvcnRfcHJvYmUoc3RydWN0IHVzYl9zZXJp YWxfcG9ydCAqcG9ydCkKIAkJYnJlYWs7CiAJfQogCi0JcmV0dXJuIDA7CisJcmV0dXJuIGY4MTUz NF9zZXRfcG9ydF9vdXRwdXRfcGluKHBvcnQpOwogfQogCiBzdGF0aWMgaW50IGY4MTUzNF9wb3J0 X3JlbW92ZShzdHJ1Y3QgdXNiX3NlcmlhbF9wb3J0ICpwb3J0KQo= From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932461AbeAKGs2 (ORCPT + 1 other); Thu, 11 Jan 2018 01:48:28 -0500 Received: from mail-pf0-f195.google.com ([209.85.192.195]:32844 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932361AbeAKGr0 (ORCPT ); Thu, 11 Jan 2018 01:47:26 -0500 X-Google-Smtp-Source: ACJfBotTb2owIg+K/t/86O+JYu8exea1tuB8wZWP5W6Rb8pobahNqIkEO0ExABF8PpUfqOz/QZlwxw== 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 3/6] usb: serial: f81534: add output pin control Date: Thu, 11 Jan 2018 14:47:17 +0800 Message-Id: <1515653240-5420-3-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 3 output pin (M0/SD, M1, M2) with open-drain mode to control transceiver. We'll read it from internal Flash with address 0x2f05~0x2f08 for 4 ports. The value is range from 0 to 7. The M0/SD is MSB of this value. For a examples, If read value is 6, we'll write M0/SD, M1, M2 as 1, 1, 0. Signed-off-by: Ji-Ze Hong (Peter Hong) --- V3: 1: change reg_mask type from u16 to u8. 2: change space around "{" & "}". V2: 1: Fix for space between brace. 2: Remain the old pin control method. drivers/usb/serial/f81534.c | 67 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 66 insertions(+), 1 deletion(-) diff --git a/drivers/usb/serial/f81534.c b/drivers/usb/serial/f81534.c index 2201be577dd3..e7dd01310f20 100644 --- a/drivers/usb/serial/f81534.c +++ b/drivers/usb/serial/f81534.c @@ -52,6 +52,7 @@ #define F81534_CUSTOM_NO_CUSTOM_DATA 0xff #define F81534_CUSTOM_VALID_TOKEN 0xf0 #define F81534_CONF_OFFSET 1 +#define F81534_CONF_GPIO_OFFSET 4 #define F81534_MAX_DATA_BLOCK 64 #define F81534_MAX_BUS_RETRY 20 @@ -164,6 +165,23 @@ struct f81534_port_private { u8 phy_num; }; +struct f81534_pin_data { + const u16 reg_addr; + const u8 reg_mask; +}; + +struct f81534_port_out_pin { + struct f81534_pin_data pin[3]; +}; + +/* Pin output value for M2/M1/M0(SD) */ +static const struct f81534_port_out_pin f81534_port_out_pins[] = { + { { { 0x2ae8, BIT(7) }, { 0x2a90, BIT(5) }, { 0x2a90, BIT(4) } } }, + { { { 0x2ae8, BIT(6) }, { 0x2ae8, BIT(0) }, { 0x2ae8, BIT(3) } } }, + { { { 0x2a90, BIT(0) }, { 0x2ae8, BIT(2) }, { 0x2a80, BIT(6) } } }, + { { { 0x2a90, BIT(3) }, { 0x2a90, BIT(2) }, { 0x2a90, BIT(1) } } }, +}; + 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 }; @@ -273,6 +291,22 @@ static int f81534_get_register(struct usb_serial *serial, u16 reg, u8 *data) return status; } +static int f81534_set_mask_register(struct usb_serial *serial, u16 reg, + u8 mask, u8 data) +{ + int status; + u8 tmp; + + status = f81534_get_register(serial, reg, &tmp); + if (status) + return status; + + tmp &= ~mask; + tmp |= (mask & data); + + return f81534_set_register(serial, reg, tmp); +} + static int f81534_set_port_register(struct usb_serial_port *port, u16 reg, u8 data) { @@ -1281,6 +1315,37 @@ static void f81534_lsr_worker(struct work_struct *work) dev_warn(&port->dev, "read LSR failed: %d\n", status); } +static int f81534_set_port_output_pin(struct usb_serial_port *port) +{ + struct f81534_serial_private *serial_priv; + struct f81534_port_private *port_priv; + struct usb_serial *serial; + const struct f81534_port_out_pin *pins; + int status; + int i; + u8 value; + u8 idx; + + serial = port->serial; + serial_priv = usb_get_serial_data(serial); + port_priv = usb_get_serial_port_data(port); + + idx = F81534_CONF_GPIO_OFFSET + port_priv->phy_num; + value = serial_priv->conf_data[idx]; + pins = &f81534_port_out_pins[port_priv->phy_num]; + + for (i = 0; i < ARRAY_SIZE(pins->pin); ++i) { + status = f81534_set_mask_register(serial, + pins->pin[i].reg_addr, pins->pin[i].reg_mask, + value & BIT(i) ? pins->pin[i].reg_mask : 0); + if (status) + return status; + } + + dev_dbg(&port->dev, "Output pin (M0/M1/M2): %d\n", value); + return 0; +} + static int f81534_port_probe(struct usb_serial_port *port) { struct f81534_serial_private *serial_priv; @@ -1339,7 +1404,7 @@ static int f81534_port_probe(struct usb_serial_port *port) break; } - return 0; + return f81534_set_port_output_pin(port); } static int f81534_port_remove(struct usb_serial_port *port) -- 2.7.4