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: [V4,2/3] USB: serial: f81232: add high baud rate support From: "Ji-Ze Hong \(Peter Hong\)" Message-Id: <1554182797-12815-2-git-send-email-hpeter+linux_kernel@gmail.com> Date: Tue, 2 Apr 2019 13:26:36 +0800 To: peter_hong@fintek.com.tw, johan@kernel.org, gregkh@linuxfoundation.org Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, "Ji-Ze Hong \(Peter Hong\)" List-ID: VGhlIEY4MTIzMiBoYWQgNCBjbG9ja3NvdXJjZSAxLjg0Ni8xOC40Ni8xNC43Ny8yNE1IeiBhbmQg YmF1ZCByYXRlcwpjYW4gYmUgdXAgdG8gMS41TWJpdHMgd2l0aCAyNE1Iei4KCkY4MTIzMiBDbG9j ayByZWdpc3RlcnMgKDEwNmgpCgpCaXQxLTA6ICAgICBDbG9jayBzb3VyY2Ugc2VsZWN0b3IKICAg ICAgICAgICAgICAgICAgICAwMDogMS44NDZNSHouCiAgICAgICAgICAgICAgICAgICAgMDE6IDE4 LjQ2TUh6LgogICAgICAgICAgICAgICAgICAgIDEwOiAyNE1Iei4KICAgICAgICAgICAgICAgICAg ICAxMTogMTQuNzdNSHouCgpTaWduZWQtb2ZmLWJ5OiBKaS1aZSBIb25nIChQZXRlciBIb25nKSA8 aHBldGVyK2xpbnV4X2tlcm5lbEBnbWFpbC5jb20+Ci0tLQp2NDoKCTE6IG5vIGNoYW5nZQoKdjM6 CgkxOiBjaGFuZ2UgdGhlIGJhdWRfYmFzZSBpbiBmODEyMzJfZ2V0X3NlcmlhbF9pbmZvKCkKCiBk cml2ZXJzL3VzYi9zZXJpYWwvZjgxMjMyLmMgfCAxMDUgKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA5NCBpbnNlcnRpb25zKCspLCAx MSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL3VzYi9zZXJpYWwvZjgxMjMyLmMg Yi9kcml2ZXJzL3VzYi9zZXJpYWwvZjgxMjMyLmMKaW5kZXggOTM0NWYxMzI3NGU5Li4zN2RhMzQ1 YWNhZmQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvdXNiL3NlcmlhbC9mODEyMzIuYworKysgYi9kcml2 ZXJzL3VzYi9zZXJpYWwvZjgxMjMyLmMKQEAgLTI4LDcgKzI4LDggQEAgc3RhdGljIGNvbnN0IHN0 cnVjdCB1c2JfZGV2aWNlX2lkIGlkX3RhYmxlW10gPSB7CiBNT0RVTEVfREVWSUNFX1RBQkxFKHVz YiwgaWRfdGFibGUpOwogCiAvKiBNYXhpbXVtIGJhdWRyYXRlIGZvciBGODEyMzIgKi8KLSNkZWZp bmUgRjgxMjMyX01BWF9CQVVEUkFURQkJMTE1MjAwCisjZGVmaW5lIEY4MTIzMl9NQVhfQkFVRFJB VEUJCTE1MDAwMDAKKyNkZWZpbmUgRjgxMjMyX0RFRl9CQVVEUkFURQkJOTYwMAogCiAvKiBVU0Ig Q29udHJvbCBFUCBwYXJhbWV0ZXIgKi8KICNkZWZpbmUgRjgxMjMyX1JFR0lTVEVSX1JFUVVFU1QJ CTB4YTAKQEAgLTQ0LDE5ICs0NSw0MyBAQCBNT0RVTEVfREVWSUNFX1RBQkxFKHVzYiwgaWRfdGFi bGUpOwogI2RlZmluZSBMSU5FX1NUQVRVU19SRUdJU1RFUgkJKDB4MDUgKyBTRVJJQUxfQkFTRV9B RERSRVNTKQogI2RlZmluZSBNT0RFTV9TVEFUVVNfUkVHSVNURVIJCSgweDA2ICsgU0VSSUFMX0JB U0VfQUREUkVTUykKIAorLyoKKyAqIEY4MTIzMiBDbG9jayByZWdpc3RlcnMgKDEwNmgpCisgKgor ICogQml0MS0wOglDbG9jayBzb3VyY2Ugc2VsZWN0b3IKKyAqCQkJMDA6IDEuODQ2TUh6LgorICoJ CQkwMTogMTguNDZNSHouCisgKgkJCTEwOiAyNE1Iei4KKyAqCQkJMTE6IDE0Ljc3TUh6LgorICov CisjZGVmaW5lIEY4MTIzMl9DTEtfUkVHSVNURVIJCTB4MTA2CisjZGVmaW5lIEY4MTIzMl9DTEtf MV84NDZfTUhaCQkwCisjZGVmaW5lIEY4MTIzMl9DTEtfMThfNDZfTUhaCQlCSVQoMCkKKyNkZWZp bmUgRjgxMjMyX0NMS18yNF9NSFoJCUJJVCgxKQorI2RlZmluZSBGODEyMzJfQ0xLXzE0Xzc3X01I WgkJKEJJVCgxKSB8IEJJVCgwKSkKKyNkZWZpbmUgRjgxMjMyX0NMS19NQVNLCQkJR0VOTUFTSygx LCAwKQorCiBzdHJ1Y3QgZjgxMjMyX3ByaXZhdGUgewogCXN0cnVjdCBtdXRleCBsb2NrOwogCXU4 IG1vZGVtX2NvbnRyb2w7CiAJdTggbW9kZW1fc3RhdHVzOworCXNwZWVkX3QgYmF1ZF9iYXNlOwog CWJvb2wgbHNyX3dvcmtfcmVzY2hlZDsKIAlzdHJ1Y3Qgd29ya19zdHJ1Y3QgbHNyX3dvcms7CiAJ c3RydWN0IHdvcmtfc3RydWN0IGludGVycnVwdF93b3JrOwogCXN0cnVjdCB1c2Jfc2VyaWFsX3Bv cnQgKnBvcnQ7CiB9OwogCi1zdGF0aWMgaW50IGNhbGNfYmF1ZF9kaXZpc29yKHNwZWVkX3QgYmF1 ZHJhdGUpCitzdGF0aWMgdTMyIGNvbnN0IGJhdWRyYXRlX3RhYmxlW10gPSB7IDExNTIwMCwgOTIx NjAwLCAxMTUyMDAwLCAxNTAwMDAwIH07CitzdGF0aWMgdTggY29uc3QgY2xvY2tfdGFibGVbXSA9 IHsgRjgxMjMyX0NMS18xXzg0Nl9NSFosIEY4MTIzMl9DTEtfMTRfNzdfTUhaLAorCQkJCUY4MTIz Ml9DTEtfMThfNDZfTUhaLCBGODEyMzJfQ0xLXzI0X01IWiB9OworCitzdGF0aWMgaW50IGNhbGNf YmF1ZF9kaXZpc29yKHNwZWVkX3QgYmF1ZHJhdGUsIHNwZWVkX3QgY2xvY2tyYXRlKQogewotCXJl dHVybiBESVZfUk9VTkRfQ0xPU0VTVChGODEyMzJfTUFYX0JBVURSQVRFLCBiYXVkcmF0ZSk7CisJ aWYgKCFiYXVkcmF0ZSkKKwkJcmV0dXJuIDA7CisKKwlyZXR1cm4gRElWX1JPVU5EX0NMT1NFU1Qo Y2xvY2tyYXRlLCBiYXVkcmF0ZSk7CiB9CiAKIHN0YXRpYyBpbnQgZjgxMjMyX2dldF9yZWdpc3Rl cihzdHJ1Y3QgdXNiX3NlcmlhbF9wb3J0ICpwb3J0LCB1MTYgcmVnLCB1OCAqdmFsKQpAQCAtMTMw LDYgKzE1NSwyMSBAQCBzdGF0aWMgaW50IGY4MTIzMl9zZXRfcmVnaXN0ZXIoc3RydWN0IHVzYl9z ZXJpYWxfcG9ydCAqcG9ydCwgdTE2IHJlZywgdTggdmFsKQogCXJldHVybiBzdGF0dXM7CiB9CiAK K3N0YXRpYyBpbnQgZjgxMjMyX3NldF9tYXNrX3JlZ2lzdGVyKHN0cnVjdCB1c2Jfc2VyaWFsX3Bv cnQgKnBvcnQsIHUxNiByZWcsCisJCQkJCXU4IG1hc2ssIHU4IHZhbCkKK3sKKwlpbnQgc3RhdHVz OworCXU4IHRtcDsKKworCXN0YXR1cyA9IGY4MTIzMl9nZXRfcmVnaXN0ZXIocG9ydCwgcmVnLCAm dG1wKTsKKwlpZiAoc3RhdHVzKQorCQlyZXR1cm4gc3RhdHVzOworCisJdG1wID0gKHRtcCAmIH5t YXNrKSB8ICh2YWwgJiBtYXNrKTsKKworCXJldHVybiBmODEyMzJfc2V0X3JlZ2lzdGVyKHBvcnQs IHJlZywgdG1wKTsKK30KKwogc3RhdGljIHZvaWQgZjgxMjMyX3JlYWRfbXNyKHN0cnVjdCB1c2Jf c2VyaWFsX3BvcnQgKnBvcnQpCiB7CiAJaW50IHN0YXR1czsKQEAgLTM0NywxMyArMzg3LDUzIEBA IHN0YXRpYyB2b2lkIGY4MTIzMl9icmVha19jdGwoc3RydWN0IHR0eV9zdHJ1Y3QgKnR0eSwgaW50 IGJyZWFrX3N0YXRlKQogCSAqLwogfQogCi1zdGF0aWMgdm9pZCBmODEyMzJfc2V0X2JhdWRyYXRl KHN0cnVjdCB1c2Jfc2VyaWFsX3BvcnQgKnBvcnQsIHNwZWVkX3QgYmF1ZHJhdGUpCitzdGF0aWMg aW50IGY4MTIzMl9maW5kX2NsayhzcGVlZF90IGJhdWRyYXRlKQoreworCWludCBpZHg7CisKKwlm b3IgKGlkeCA9IDA7IGlkeCA8IEFSUkFZX1NJWkUoYmF1ZHJhdGVfdGFibGUpOyArK2lkeCkgewor CQlpZiAoYmF1ZHJhdGUgPD0gYmF1ZHJhdGVfdGFibGVbaWR4XSAmJgorCQkJCWJhdWRyYXRlX3Rh YmxlW2lkeF0gJSBiYXVkcmF0ZSA9PSAwKQorCQkJcmV0dXJuIGlkeDsKKwl9CisKKwlyZXR1cm4g LUVJTlZBTDsKK30KKworc3RhdGljIHZvaWQgZjgxMjMyX3NldF9iYXVkcmF0ZShzdHJ1Y3QgdHR5 X3N0cnVjdCAqdHR5LAorCQkJCXN0cnVjdCB1c2Jfc2VyaWFsX3BvcnQgKnBvcnQsIHNwZWVkX3Qg YmF1ZHJhdGUsCisJCQkJc3BlZWRfdCBvbGRfYmF1ZHJhdGUpCiB7CisJc3RydWN0IGY4MTIzMl9w cml2YXRlICpwcml2ID0gdXNiX2dldF9zZXJpYWxfcG9ydF9kYXRhKHBvcnQpOwogCXU4IGxjcjsK IAlpbnQgZGl2aXNvcjsKIAlpbnQgc3RhdHVzID0gMDsKKwlpbnQgaTsKKwlpbnQgaWR4OworCXNw ZWVkX3QgYmF1ZF9saXN0W10gPSB7YmF1ZHJhdGUsIG9sZF9iYXVkcmF0ZSwgRjgxMjMyX0RFRl9C QVVEUkFURX07CisKKwlmb3IgKGkgPSAwOyBpIDwgQVJSQVlfU0laRShiYXVkX2xpc3QpOyArK2kp IHsKKwkJaWR4ID0gZjgxMjMyX2ZpbmRfY2xrKGJhdWRfbGlzdFtpXSk7CisJCWlmIChpZHggPj0g MCkgeworCQkJYmF1ZHJhdGUgPSBiYXVkX2xpc3RbaV07CisJCQl0dHlfZW5jb2RlX2JhdWRfcmF0 ZSh0dHksIGJhdWRyYXRlLCBiYXVkcmF0ZSk7CisJCQlicmVhazsKKwkJfQorCX0KIAotCWRpdmlz b3IgPSBjYWxjX2JhdWRfZGl2aXNvcihiYXVkcmF0ZSk7CisJaWYgKGlkeCA8IDApCisJCXJldHVy bjsKKworCXByaXYtPmJhdWRfYmFzZSA9IGJhdWRyYXRlX3RhYmxlW2lkeF07CisJZGl2aXNvciA9 IGNhbGNfYmF1ZF9kaXZpc29yKGJhdWRyYXRlLCBwcml2LT5iYXVkX2Jhc2UpOworCisJc3RhdHVz ID0gZjgxMjMyX3NldF9tYXNrX3JlZ2lzdGVyKHBvcnQsIEY4MTIzMl9DTEtfUkVHSVNURVIsCisJ CQlGODEyMzJfQ0xLX01BU0ssIGNsb2NrX3RhYmxlW2lkeF0pOworCWlmIChzdGF0dXMpIHsKKwkJ ZGV2X2VycigmcG9ydC0+ZGV2LCAiJXMgZmFpbGVkIHRvIHNldCBDTEtfUkVHOiAlZFxuIiwKKwkJ CV9fZnVuY19fLCBzdGF0dXMpOworCQlyZXR1cm47CisJfQogCiAJc3RhdHVzID0gZjgxMjMyX2dl dF9yZWdpc3Rlcihwb3J0LCBMSU5FX0NPTlRST0xfUkVHSVNURVIsCiAJCQkgJmxjcik7IC8qIGdl dCBMQ1IgKi8KQEAgLTQ0Myw2ICs1MjMsNyBAQCBzdGF0aWMgdm9pZCBmODEyMzJfc2V0X3Rlcm1p b3Moc3RydWN0IHR0eV9zdHJ1Y3QgKnR0eSwKIAl1OCBuZXdfbGNyID0gMDsKIAlpbnQgc3RhdHVz ID0gMDsKIAlzcGVlZF90IGJhdWRyYXRlOworCXNwZWVkX3Qgb2xkX2JhdWQ7CiAKIAkvKiBEb24n dCBjaGFuZ2UgYW55dGhpbmcgaWYgbm90aGluZyBoYXMgY2hhbmdlZCAqLwogCWlmIChvbGRfdGVy bWlvcyAmJiAhdHR5X3Rlcm1pb3NfaHdfY2hhbmdlKCZ0dHktPnRlcm1pb3MsIG9sZF90ZXJtaW9z KSkKQEAgLTQ1NSwxMSArNTM2LDEyIEBAIHN0YXRpYyB2b2lkIGY4MTIzMl9zZXRfdGVybWlvcyhz dHJ1Y3QgdHR5X3N0cnVjdCAqdHR5LAogCiAJYmF1ZHJhdGUgPSB0dHlfZ2V0X2JhdWRfcmF0ZSh0 dHkpOwogCWlmIChiYXVkcmF0ZSA+IDApIHsKLQkJaWYgKGJhdWRyYXRlID4gRjgxMjMyX01BWF9C QVVEUkFURSkgewotCQkJYmF1ZHJhdGUgPSBGODEyMzJfTUFYX0JBVURSQVRFOwotCQkJdHR5X2Vu Y29kZV9iYXVkX3JhdGUodHR5LCBiYXVkcmF0ZSwgYmF1ZHJhdGUpOwotCQl9Ci0JCWY4MTIzMl9z ZXRfYmF1ZHJhdGUocG9ydCwgYmF1ZHJhdGUpOworCQlpZiAob2xkX3Rlcm1pb3MpCisJCQlvbGRf YmF1ZCA9IHR0eV90ZXJtaW9zX2JhdWRfcmF0ZShvbGRfdGVybWlvcyk7CisJCWVsc2UKKwkJCW9s ZF9iYXVkID0gRjgxMjMyX0RFRl9CQVVEUkFURTsKKworCQlmODEyMzJfc2V0X2JhdWRyYXRlKHR0 eSwgcG9ydCwgYmF1ZHJhdGUsIG9sZF9iYXVkKTsKIAl9CiAKIAlpZiAoQ19QQVJFTkIodHR5KSkg ewpAQCAtNTk1LDExICs2NzcsMTIgQEAgc3RhdGljIGludCBmODEyMzJfZ2V0X3NlcmlhbF9pbmZv KHN0cnVjdCB0dHlfc3RydWN0ICp0dHksCiAJCXN0cnVjdCBzZXJpYWxfc3RydWN0ICpzcykKIHsK IAlzdHJ1Y3QgdXNiX3NlcmlhbF9wb3J0ICpwb3J0ID0gdHR5LT5kcml2ZXJfZGF0YTsKKwlzdHJ1 Y3QgZjgxMjMyX3ByaXZhdGUgKnByaXYgPSB1c2JfZ2V0X3NlcmlhbF9wb3J0X2RhdGEocG9ydCk7 CiAKIAlzcy0+dHlwZSA9IFBPUlRfMTY1NTBBOwogCXNzLT5saW5lID0gcG9ydC0+bWlub3I7CiAJ c3MtPnBvcnQgPSBwb3J0LT5wb3J0X251bWJlcjsKLQlzcy0+YmF1ZF9iYXNlID0gRjgxMjMyX01B WF9CQVVEUkFURTsKKwlzcy0+YmF1ZF9iYXNlID0gcHJpdi0+YmF1ZF9iYXNlOwogCXJldHVybiAw OwogfQogCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,UNWANTED_LANGUAGE_BODY,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5CBB4C43381 for ; Tue, 2 Apr 2019 05:26:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 248712075E for ; Tue, 2 Apr 2019 05:26:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="JqquHcuu" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729080AbfDBF0r (ORCPT ); Tue, 2 Apr 2019 01:26:47 -0400 Received: from mail-pl1-f193.google.com ([209.85.214.193]:38517 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729053AbfDBF0o (ORCPT ); Tue, 2 Apr 2019 01:26:44 -0400 Received: by mail-pl1-f193.google.com with SMTP id g37so5648938plb.5; Mon, 01 Apr 2019 22:26:43 -0700 (PDT) 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=JVmvhszg/IlpphY6sOI/mqVJcGPvg3zwec1mZcbaldU=; b=JqquHcuuXCIOUA64kXyQ1y75S/NJQuobaYc5pn00n/ZeDbhiKFE1gSx0cSeBtSNnuP tNp5D4/k1HZL8b/D3FzAzZ0Lwo1T0Z3EpTaWbVDeSkwy66n7uwAy+KrnISJltUPxvK/e Oy+GyGG1FnzqNlRojrHblkXktRC8oVAaYdRFVQYo0IP3ggPcgswH5TZmT90+EGvNiUUt ApygfY7fm0vhBQM+EircYebp8UJMzyZ3PJpUpup0/neMC8kRAQbleIjbYf7sAL3rL7tq T1AT1skaozIgeJn2Od4PPzuWKklC+a8H87UrpxLGsFtVVdkfD2GxsRw5byWbPwGEF/ij MCFw== 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=JVmvhszg/IlpphY6sOI/mqVJcGPvg3zwec1mZcbaldU=; b=VjduBqd8gr8qfTy23jHvXJoMi32SxDuLLuZv7QTF1MrUcBKIV4/RUxYcmjbLPr4Q05 1vNK9uiOERSu8Om4w51mWmtpZqIA22oeTZOgZzXzP/Y1TewJvps+K7lw8YUaDxQTKg8r JuX6Cl2D7Qgzh9P2xHkQx4htrUrGKYdtHJZeekyRWOm3Ck+rMZJL2hee+sbgleLe1f84 ppJfjk+Mn/lP0kYWRkycY5fX34MwTijBqbq+iquIhNMuW/R8w7ZhIIE2kjtnxtxN5Tu1 VF6FVfX/UF0ENYudU9KjcxAGE+PyrhWktQbvBroHLS4ll5xddBOfgolgdq44dx5oPMkw lckw== X-Gm-Message-State: APjAAAU108jRh1vMw9RaQC58wMlqChfKg5ME8aG6mKxI6L6ItzliTel3 E2ARyXCgp08/lPlbRTiz+Ko= X-Google-Smtp-Source: APXvYqzC1qVZVGZtSVr69n6t2v282eu9gXnE/zPUBDptJs6C9eaeYoSVTsbonPe8d3GECQvYu49bBg== X-Received: by 2002:a17:902:e709:: with SMTP id co9mr45214040plb.86.1554182803305; Mon, 01 Apr 2019 22:26:43 -0700 (PDT) Received: from localhost (59-120-186-245.HINET-IP.hinet.net. [59.120.186.245]) by smtp.gmail.com with ESMTPSA id b9sm4331978pfd.32.2019.04.01.22.26.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Apr 2019 22:26:42 -0700 (PDT) From: "Ji-Ze Hong (Peter Hong)" X-Google-Original-From: "Ji-Ze Hong (Peter Hong)" To: peter_hong@fintek.com.tw, johan@kernel.org, gregkh@linuxfoundation.org Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, "Ji-Ze Hong (Peter Hong)" Subject: [PATCH V4 2/3] USB: serial: f81232: add high baud rate support Date: Tue, 2 Apr 2019 13:26:36 +0800 Message-Id: <1554182797-12815-2-git-send-email-hpeter+linux_kernel@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1554182797-12815-1-git-send-email-hpeter+linux_kernel@gmail.com> References: <1554182797-12815-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 F81232 had 4 clocksource 1.846/18.46/14.77/24MHz and baud rates can be up to 1.5Mbits with 24MHz. F81232 Clock registers (106h) Bit1-0: Clock source selector 00: 1.846MHz. 01: 18.46MHz. 10: 24MHz. 11: 14.77MHz. Signed-off-by: Ji-Ze Hong (Peter Hong) --- v4: 1: no change v3: 1: change the baud_base in f81232_get_serial_info() drivers/usb/serial/f81232.c | 105 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 94 insertions(+), 11 deletions(-) diff --git a/drivers/usb/serial/f81232.c b/drivers/usb/serial/f81232.c index 9345f13274e9..37da345acafd 100644 --- a/drivers/usb/serial/f81232.c +++ b/drivers/usb/serial/f81232.c @@ -28,7 +28,8 @@ static const struct usb_device_id id_table[] = { MODULE_DEVICE_TABLE(usb, id_table); /* Maximum baudrate for F81232 */ -#define F81232_MAX_BAUDRATE 115200 +#define F81232_MAX_BAUDRATE 1500000 +#define F81232_DEF_BAUDRATE 9600 /* USB Control EP parameter */ #define F81232_REGISTER_REQUEST 0xa0 @@ -44,19 +45,43 @@ MODULE_DEVICE_TABLE(usb, id_table); #define LINE_STATUS_REGISTER (0x05 + SERIAL_BASE_ADDRESS) #define MODEM_STATUS_REGISTER (0x06 + SERIAL_BASE_ADDRESS) +/* + * F81232 Clock registers (106h) + * + * Bit1-0: Clock source selector + * 00: 1.846MHz. + * 01: 18.46MHz. + * 10: 24MHz. + * 11: 14.77MHz. + */ +#define F81232_CLK_REGISTER 0x106 +#define F81232_CLK_1_846_MHZ 0 +#define F81232_CLK_18_46_MHZ BIT(0) +#define F81232_CLK_24_MHZ BIT(1) +#define F81232_CLK_14_77_MHZ (BIT(1) | BIT(0)) +#define F81232_CLK_MASK GENMASK(1, 0) + struct f81232_private { struct mutex lock; u8 modem_control; u8 modem_status; + speed_t baud_base; bool lsr_work_resched; struct work_struct lsr_work; struct work_struct interrupt_work; struct usb_serial_port *port; }; -static int calc_baud_divisor(speed_t baudrate) +static u32 const baudrate_table[] = { 115200, 921600, 1152000, 1500000 }; +static u8 const clock_table[] = { F81232_CLK_1_846_MHZ, F81232_CLK_14_77_MHZ, + F81232_CLK_18_46_MHZ, F81232_CLK_24_MHZ }; + +static int calc_baud_divisor(speed_t baudrate, speed_t clockrate) { - return DIV_ROUND_CLOSEST(F81232_MAX_BAUDRATE, baudrate); + if (!baudrate) + return 0; + + return DIV_ROUND_CLOSEST(clockrate, baudrate); } static int f81232_get_register(struct usb_serial_port *port, u16 reg, u8 *val) @@ -130,6 +155,21 @@ static int f81232_set_register(struct usb_serial_port *port, u16 reg, u8 val) return status; } +static int f81232_set_mask_register(struct usb_serial_port *port, u16 reg, + u8 mask, u8 val) +{ + int status; + u8 tmp; + + status = f81232_get_register(port, reg, &tmp); + if (status) + return status; + + tmp = (tmp & ~mask) | (val & mask); + + return f81232_set_register(port, reg, tmp); +} + static void f81232_read_msr(struct usb_serial_port *port) { int status; @@ -347,13 +387,53 @@ static void f81232_break_ctl(struct tty_struct *tty, int break_state) */ } -static void f81232_set_baudrate(struct usb_serial_port *port, speed_t baudrate) +static int f81232_find_clk(speed_t baudrate) +{ + int idx; + + for (idx = 0; idx < ARRAY_SIZE(baudrate_table); ++idx) { + if (baudrate <= baudrate_table[idx] && + baudrate_table[idx] % baudrate == 0) + return idx; + } + + return -EINVAL; +} + +static void f81232_set_baudrate(struct tty_struct *tty, + struct usb_serial_port *port, speed_t baudrate, + speed_t old_baudrate) { + struct f81232_private *priv = usb_get_serial_port_data(port); u8 lcr; int divisor; int status = 0; + int i; + int idx; + speed_t baud_list[] = {baudrate, old_baudrate, F81232_DEF_BAUDRATE}; + + for (i = 0; i < ARRAY_SIZE(baud_list); ++i) { + idx = f81232_find_clk(baud_list[i]); + if (idx >= 0) { + baudrate = baud_list[i]; + tty_encode_baud_rate(tty, baudrate, baudrate); + break; + } + } - divisor = calc_baud_divisor(baudrate); + if (idx < 0) + return; + + priv->baud_base = baudrate_table[idx]; + divisor = calc_baud_divisor(baudrate, priv->baud_base); + + status = f81232_set_mask_register(port, F81232_CLK_REGISTER, + F81232_CLK_MASK, clock_table[idx]); + if (status) { + dev_err(&port->dev, "%s failed to set CLK_REG: %d\n", + __func__, status); + return; + } status = f81232_get_register(port, LINE_CONTROL_REGISTER, &lcr); /* get LCR */ @@ -443,6 +523,7 @@ static void f81232_set_termios(struct tty_struct *tty, u8 new_lcr = 0; int status = 0; speed_t baudrate; + speed_t old_baud; /* Don't change anything if nothing has changed */ if (old_termios && !tty_termios_hw_change(&tty->termios, old_termios)) @@ -455,11 +536,12 @@ static void f81232_set_termios(struct tty_struct *tty, baudrate = tty_get_baud_rate(tty); if (baudrate > 0) { - if (baudrate > F81232_MAX_BAUDRATE) { - baudrate = F81232_MAX_BAUDRATE; - tty_encode_baud_rate(tty, baudrate, baudrate); - } - f81232_set_baudrate(port, baudrate); + if (old_termios) + old_baud = tty_termios_baud_rate(old_termios); + else + old_baud = F81232_DEF_BAUDRATE; + + f81232_set_baudrate(tty, port, baudrate, old_baud); } if (C_PARENB(tty)) { @@ -595,11 +677,12 @@ static int f81232_get_serial_info(struct tty_struct *tty, struct serial_struct *ss) { struct usb_serial_port *port = tty->driver_data; + struct f81232_private *priv = usb_get_serial_port_data(port); ss->type = PORT_16550A; ss->line = port->minor; ss->port = port->port_number; - ss->baud_base = F81232_MAX_BAUDRATE; + ss->baud_base = priv->baud_base; return 0; } -- 2.7.4