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: [V2,3/5] usb: serial: f81534: add output pin control From: "Ji-Ze Hong \(Peter Hong\)" Message-Id: <1515032961-29131-3-git-send-email-hpeter+linux_kernel@gmail.com> Date: Thu, 4 Jan 2018 10:29:19 +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 ZykgPGhwZXRlcitsaW51eF9rZXJuZWxAZ21haWwuY29tPgotLS0KVjI6CgkxOiBGaXggZm9yIHNw YWNlIGJldHdlZW4gYnJhY2UuCgkyOiBSZW1haW4gdGhlIG9sZCBwaW4gY29udHJvbCBtZXRob2Qu CgogZHJpdmVycy91c2Ivc2VyaWFsL2Y4MTUzNC5jIHwgNjcgKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKystCiAxIGZpbGUgY2hhbmdlZCwgNjYgaW5zZXJ0aW9ucygr KSwgMSBkZWxldGlvbigtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvdXNiL3NlcmlhbC9mODE1MzQu YyBiL2RyaXZlcnMvdXNiL3NlcmlhbC9mODE1MzQuYwppbmRleCA4YTc3OGJjMWQ0OTIuLjdmMTc1 ZjM5YTE3MSAxMDA2NDQKLS0tIGEvZHJpdmVycy91c2Ivc2VyaWFsL2Y4MTUzNC5jCisrKyBiL2Ry aXZlcnMvdXNiL3NlcmlhbC9mODE1MzQuYwpAQCAtNTIsNiArNTIsNyBAQAogI2RlZmluZSBGODE1 MzRfQ1VTVE9NX05PX0NVU1RPTV9EQVRBCTB4ZmYKICNkZWZpbmUgRjgxNTM0X0NVU1RPTV9WQUxJ RF9UT0tFTgkweGYwCiAjZGVmaW5lIEY4MTUzNF9DT05GX09GRlNFVAkJMQorI2RlZmluZSBGODE1 MzRfQ09ORl9HUElPX09GRlNFVAkJNAogCiAjZGVmaW5lIEY4MTUzNF9NQVhfREFUQV9CTE9DSwkJ NjQKICNkZWZpbmUgRjgxNTM0X01BWF9CVVNfUkVUUlkJCTIwCkBAIC0xNjQsNiArMTY1LDIzIEBA IHN0cnVjdCBmODE1MzRfcG9ydF9wcml2YXRlIHsKIAl1OCBwaHlfbnVtOwogfTsKIAorc3RydWN0 IGY4MTUzNF9waW5fZGF0YSB7CisJY29uc3QgdTE2IHJlZ19hZGRyOworCWNvbnN0IHUxNiByZWdf bWFzazsKK307CisKK3N0cnVjdCBmODE1MzRfcG9ydF9vdXRfcGluIHsKKwlzdHJ1Y3QgZjgxNTM0 X3Bpbl9kYXRhIHBpblszXTsKK307CisKKy8qIFBpbiBvdXRwdXQgdmFsdWUgZm9yIE0yL00xL00w KFNEKSAqLworc3RhdGljIGNvbnN0IHN0cnVjdCBmODE1MzRfcG9ydF9vdXRfcGluIGY4MTUzNF9w b3J0X291dF9waW5zW10gPSB7CisJIHsgeyB7MHgyYWU4LCBCSVQoNyl9LCB7MHgyYTkwLCBCSVQo NSl9LCB7MHgyYTkwLCBCSVQoNCkgfSB9IH0sCisJIHsgeyB7MHgyYWU4LCBCSVQoNil9LCB7MHgy YWU4LCBCSVQoMCl9LCB7MHgyYWU4LCBCSVQoMykgfSB9IH0sCisJIHsgeyB7MHgyYTkwLCBCSVQo MCl9LCB7MHgyYWU4LCBCSVQoMil9LCB7MHgyYTgwLCBCSVQoNikgfSB9IH0sCisJIHsgeyB7MHgy YTkwLCBCSVQoMyl9LCB7MHgyYTkwLCBCSVQoMil9LCB7MHgyYTkwLCBCSVQoMSkgfSB9IH0sCit9 OworCiBzdGF0aWMgdTMyIGNvbnN0IGJhdWRyYXRlX3RhYmxlW10gPSB7MTE1MjAwLCA5MjE2MDAs IDExNTIwMDAsIDE1MDAwMDB9Owogc3RhdGljIHU4IGNvbnN0IGNsb2NrX3RhYmxlW10gPSB7Rjgx NTM0X0NMS18xXzg0Nl9NSFosIEY4MTUzNF9DTEtfMTRfNzdfTUhaLAogCQkJCUY4MTUzNF9DTEtf MThfNDZfTUhaLCBGODE1MzRfQ0xLXzI0X01IWn07CkBAIC0yNzMsNiArMjkxLDIyIEBAIHN0YXRp YyBpbnQgZjgxNTM0X2dldF9yZWdpc3RlcihzdHJ1Y3QgdXNiX3NlcmlhbCAqc2VyaWFsLCB1MTYg cmVnLCB1OCAqZGF0YSkKIAlyZXR1cm4gc3RhdHVzOwogfQogCitzdGF0aWMgaW50IGY4MTUzNF9z ZXRfbWFza19yZWdpc3RlcihzdHJ1Y3QgdXNiX3NlcmlhbCAqc2VyaWFsLCB1MTYgcmVnLAorCQkJ CQl1OCBtYXNrLCB1OCBkYXRhKQoreworCWludCBzdGF0dXM7CisJdTggdG1wOworCisJc3RhdHVz ID0gZjgxNTM0X2dldF9yZWdpc3RlcihzZXJpYWwsIHJlZywgJnRtcCk7CisJaWYgKHN0YXR1cykK KwkJcmV0dXJuIHN0YXR1czsKKworCXRtcCAmPSB+bWFzazsKKwl0bXAgfD0gKG1hc2sgJiBkYXRh KTsKKworCXJldHVybiBmODE1MzRfc2V0X3JlZ2lzdGVyKHNlcmlhbCwgcmVnLCB0bXApOworfQor CiBzdGF0aWMgaW50IGY4MTUzNF9zZXRfcG9ydF9yZWdpc3RlcihzdHJ1Y3QgdXNiX3NlcmlhbF9w b3J0ICpwb3J0LCB1MTYgcmVnLAogCQkJCQl1OCBkYXRhKQogewpAQCAtMTI3OCw2ICsxMzEyLDM3 IEBAIHN0YXRpYyB2b2lkIGY4MTUzNF9sc3Jfd29ya2VyKHN0cnVjdCB3b3JrX3N0cnVjdCAqd29y aykKIAkJZGV2X3dhcm4oJnBvcnQtPmRldiwgInJlYWQgTFNSIGZhaWxlZDogJWRcbiIsIHN0YXR1 cyk7CiB9CiAKK3N0YXRpYyBpbnQgZjgxNTM0X3NldF9wb3J0X291dHB1dF9waW4oc3RydWN0IHVz Yl9zZXJpYWxfcG9ydCAqcG9ydCkKK3sKKwlzdHJ1Y3QgZjgxNTM0X3NlcmlhbF9wcml2YXRlICpz ZXJpYWxfcHJpdjsKKwlzdHJ1Y3QgZjgxNTM0X3BvcnRfcHJpdmF0ZSAqcG9ydF9wcml2OworCXN0 cnVjdCB1c2Jfc2VyaWFsICpzZXJpYWw7CisJY29uc3Qgc3RydWN0IGY4MTUzNF9wb3J0X291dF9w aW4gKnBpbnM7CisJaW50IHN0YXR1czsKKwlpbnQgaTsKKwl1OCB2YWx1ZTsKKwl1OCBpZHg7CisK KwlzZXJpYWwgPSBwb3J0LT5zZXJpYWw7CisJc2VyaWFsX3ByaXYgPSB1c2JfZ2V0X3NlcmlhbF9k YXRhKHNlcmlhbCk7CisJcG9ydF9wcml2ID0gdXNiX2dldF9zZXJpYWxfcG9ydF9kYXRhKHBvcnQp OworCisJaWR4ID0gRjgxNTM0X0NPTkZfR1BJT19PRkZTRVQgKyBwb3J0X3ByaXYtPnBoeV9udW07 CisJdmFsdWUgPSBzZXJpYWxfcHJpdi0+Y29uZl9kYXRhW2lkeF07CisJcGlucyA9ICZmODE1MzRf cG9ydF9vdXRfcGluc1twb3J0X3ByaXYtPnBoeV9udW1dOworCisJZm9yIChpID0gMDsgaSA8IEFS UkFZX1NJWkUocGlucy0+cGluKTsgKytpKSB7CisJCXN0YXR1cyA9IGY4MTUzNF9zZXRfbWFza19y ZWdpc3RlcihzZXJpYWwsCisJCQkJcGlucy0+cGluW2ldLnJlZ19hZGRyLCBwaW5zLT5waW5baV0u cmVnX21hc2ssCisJCQkJdmFsdWUgJiBCSVQoaSkgPyBwaW5zLT5waW5baV0ucmVnX21hc2sgOiAw KTsKKwkJaWYgKHN0YXR1cykKKwkJCXJldHVybiBzdGF0dXM7CisJfQorCisJZGV2X2RiZygmcG9y dC0+ZGV2LCAiT3V0cHV0IHBpbiAoTTAvTTEvTTIpOiAlZFxuIiwgdmFsdWUpOworCXJldHVybiAw OworfQorCiBzdGF0aWMgaW50IGY4MTUzNF9wb3J0X3Byb2JlKHN0cnVjdCB1c2Jfc2VyaWFsX3Bv cnQgKnBvcnQpCiB7CiAJc3RydWN0IGY4MTUzNF9zZXJpYWxfcHJpdmF0ZSAqc2VyaWFsX3ByaXY7 CkBAIC0xMzM1LDcgKzE0MDAsNyBAQCBzdGF0aWMgaW50IGY4MTUzNF9wb3J0X3Byb2JlKHN0cnVj dCB1c2Jfc2VyaWFsX3BvcnQgKnBvcnQpCiAJCWJyZWFrOwogCX0KIAotCXJldHVybiAwOworCXJl dHVybiBmODE1MzRfc2V0X3BvcnRfb3V0cHV0X3Bpbihwb3J0KTsKIH0KIAogc3RhdGljIGludCBm ODE1MzRfcG9ydF9yZW1vdmUoc3RydWN0IHVzYl9zZXJpYWxfcG9ydCAqcG9ydCkK From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752204AbeADC3z (ORCPT + 1 other); Wed, 3 Jan 2018 21:29:55 -0500 Received: from mail-pl0-f68.google.com ([209.85.160.68]:36047 "EHLO mail-pl0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752090AbeADC3b (ORCPT ); Wed, 3 Jan 2018 21:29:31 -0500 X-Google-Smtp-Source: ACJfBotkHdkz3zJPVrY55n1J5Hb+BUDaUw+Y5VMGVHqv761X1V5FUbzWsJEOWuEqAUBTfE1NfTM+vQ== 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 V2 3/5] usb: serial: f81534: add output pin control Date: Thu, 4 Jan 2018 10:29:19 +0800 Message-Id: <1515032961-29131-3-git-send-email-hpeter+linux_kernel@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515032961-29131-1-git-send-email-hpeter+linux_kernel@gmail.com> References: <1515032961-29131-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) --- 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 8a778bc1d492..7f175f39a171 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 u16 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) { @@ -1278,6 +1312,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; @@ -1335,7 +1400,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