From patchwork Fri Oct 18 05:24:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 176767 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp362740ill; Thu, 17 Oct 2019 22:24:14 -0700 (PDT) X-Google-Smtp-Source: APXvYqxk769f67XS8M8C7HSOqny5DuPhljMQnR0M1Afj/aPBVmn62ExH+8bwjJm1RfCV3+ACCOzj X-Received: by 2002:a17:906:d964:: with SMTP id rp4mr6795724ejb.147.1571376254219; Thu, 17 Oct 2019 22:24:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571376254; cv=none; d=google.com; s=arc-20160816; b=f2BrNjEf9W+rqEvd+AjDyy23HlN0BePMBjWNy5AfyUOKK+yG+Xt0go0pCwzOAA5sm2 Lxq7OJIKWa14QUhFIWhW4mq7wv7v6gVG3apxgjjIS2/1a4wgrUQu2+uIH8ZgK0tFVuGU 75XnwUGPEIGxV12IIuuldBNeGXZO6tcrmULsXnP6pBRj2ZykcVk6Kw4Ov6x6yxn5Kt4P 9jfKKk/gdItstBmKfUyqfSLWv9Y8exz6gBMpwyrMZz1FFxf8bVKwLNtj+boH55gh90SN QkwDExkJYmyBbjsNQRSzB0fdzQ4SZykpeNPaiGSAZwgCa1OJU0SPVD2jh7yg7TiSywfB xCig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=SCHFSyaag0fV1b4EweLCBFXNBv8kfZEJeYucJn2bT6s=; b=sTvRNUuUOdzoycjz3a5gP9tKMLb4UdWSXgV0QcpmJOuBZxYmiAgyno/355c2RVddAh KPKPb9qc/06w1AoGY+bKhMxeIiqv4Wcq4N4HKCy1Tjaj3DpUOh9n2Tw9wyz99grFuGhs IUl0FF5dGzrWbZ6QTOsWgkdT5KYbYlQYXF2ZpGWHg4wF9jhoMgp8ch89bgt8HE79u6rv 1zP8A3R/aNcHI4Nxv9piD5c5/G6Zpp4Re6Bp91bhdtVorhgIbx0oMZA8+psu/VpPFjj5 JttN+cm57IOSv39W92VhSKerswmFJEXXTZey9rzqqLY+mqshBrELSjwAGtFKZkZR5eKj 7DaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hw4u9oUL; spf=pass (google.com: best guess record for domain of linux-bluetooth-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p28si2857411ejn.88.2019.10.17.22.24.14; Thu, 17 Oct 2019 22:24:14 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-bluetooth-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hw4u9oUL; spf=pass (google.com: best guess record for domain of linux-bluetooth-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2395042AbfJRFYM (ORCPT + 1 other); Fri, 18 Oct 2019 01:24:12 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:39794 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2438188AbfJRFYM (ORCPT ); Fri, 18 Oct 2019 01:24:12 -0400 Received: by mail-pf1-f193.google.com with SMTP id v4so3112781pff.6 for ; Thu, 17 Oct 2019 22:24:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SCHFSyaag0fV1b4EweLCBFXNBv8kfZEJeYucJn2bT6s=; b=hw4u9oULAXd4AgBXp/9AkA/ZPr6fbU5xbqz+K4prhY2sBWfo6tcRdGLwkUIANg0L0f P2yLfr36x3oE0QkslOhGU+UDIxrQjvWRODCZdl6Y28FDVIY9hR8ejkxbnY1kOsK5ZIpz ytvLYeIH4v35kAltNoItGw13qjJptaT1zPStmQ+vK9RrdlyrizLKUfQ3rbUOsOcjpbiG ZIcw3HIPXjrylIN94yNLpR3+MKld5fYz1/keO7Ap0ElxG3eQpMCiZjjjK9Vtn5Ck/PU6 722cqOBCeyGm3LVzIepS8zG5qF+e65mB+X/fpp623lIqID98jPJt7WDR7quxYdizaOCr qzog== 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:mime-version:content-transfer-encoding; bh=SCHFSyaag0fV1b4EweLCBFXNBv8kfZEJeYucJn2bT6s=; b=M3QyRPcryG/PvC29y9QG5nz/fPX+PIk4EJ9BBfDZ0GvvQiFwPP5rjTw6mLBFaNwd8K uOPQt0EcJ+dc9+p9pcOu+8iIj/12LUbWRtGqy6BZjYeLg0P8fMtBu73JrqBy0i0YSmKn JUD8ynZPCrRX5PAyPfcEDT/cX93m/BnSCYW6MtPNHppJlyWOX8aMFwwqB2hnXsjfd1jj Ce4kefJxyB+rM81fSlKWEasdDmmbpIAr4F9cQSJqhapSAwT8+/lpLSS39TlNWVpcp5iq QOILUh87LHDQi1PTQsIUYjFDsLCO/JWKRl1bENGCqes9+9VTJcjJetUgE6v2DOglUtmp u58A== X-Gm-Message-State: APjAAAWpvrAaO5WwQQtGg/gjIVgiYaPq/ck0Q67c+EWln8vCFdK82FTP Tx6aJSXjh+Vqyuq2z8O3P7Batw== X-Received: by 2002:a62:6842:: with SMTP id d63mr4426461pfc.166.1571376251002; Thu, 17 Oct 2019 22:24:11 -0700 (PDT) Received: from localhost.localdomain (104-188-17-28.lightspeed.sndgca.sbcglobal.net. [104.188.17.28]) by smtp.gmail.com with ESMTPSA id u11sm2178760pgc.61.2019.10.17.22.24.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Oct 2019 22:24:10 -0700 (PDT) From: Bjorn Andersson To: Marcel Holtmann , Johan Hedberg Cc: linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org, Jeffrey Hugo , linux-arm-msm@vger.kernel.org Subject: [PATCH 2/4] Bluetooth: hci_qca: Don't vote for specific voltage Date: Thu, 17 Oct 2019 22:24:02 -0700 Message-Id: <20191018052405.3693555-3-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191018052405.3693555-1-bjorn.andersson@linaro.org> References: <20191018052405.3693555-1-bjorn.andersson@linaro.org> MIME-Version: 1.0 Sender: linux-bluetooth-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org Devices with specific voltage requirements should not request voltage from the driver, but instead rely on the system configuration to define appropriate voltages for each rail. This ensures that PMIC and board variations are accounted for, something that the 0.1V range in the hci_qca driver currently tries to address. But on the Lenovo Yoga C630 (with wcn3990) vddch0 is 3.1V, which means the driver will fail to set the voltage. Signed-off-by: Bjorn Andersson --- drivers/bluetooth/hci_qca.c | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) -- 2.23.0 Reviewed-by: Matthias Kaehlcke diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c index c07c529b0d81..54aafcc69d06 100644 --- a/drivers/bluetooth/hci_qca.c +++ b/drivers/bluetooth/hci_qca.c @@ -130,8 +130,6 @@ enum qca_speed_type { */ struct qca_vreg { const char *name; - unsigned int min_uV; - unsigned int max_uV; unsigned int load_uA; }; @@ -1332,10 +1330,10 @@ static const struct hci_uart_proto qca_proto = { static const struct qca_vreg_data qca_soc_data_wcn3990 = { .soc_type = QCA_WCN3990, .vregs = (struct qca_vreg []) { - { "vddio", 1800000, 1900000, 15000 }, - { "vddxo", 1800000, 1900000, 80000 }, - { "vddrf", 1300000, 1350000, 300000 }, - { "vddch0", 3300000, 3400000, 450000 }, + { "vddio", 15000 }, + { "vddxo", 80000 }, + { "vddrf", 300000 }, + { "vddch0", 450000 }, }, .num_vregs = 4, }; @@ -1343,10 +1341,10 @@ static const struct qca_vreg_data qca_soc_data_wcn3990 = { static const struct qca_vreg_data qca_soc_data_wcn3998 = { .soc_type = QCA_WCN3998, .vregs = (struct qca_vreg []) { - { "vddio", 1800000, 1900000, 10000 }, - { "vddxo", 1800000, 1900000, 80000 }, - { "vddrf", 1300000, 1352000, 300000 }, - { "vddch0", 3300000, 3300000, 450000 }, + { "vddio", 10000 }, + { "vddxo", 80000 }, + { "vddrf", 300000 }, + { "vddch0", 450000 }, }, .num_vregs = 4, }; @@ -1386,13 +1384,6 @@ static int qca_power_off(struct hci_dev *hdev) static int qca_enable_regulator(struct qca_vreg vregs, struct regulator *regulator) { - int ret; - - ret = regulator_set_voltage(regulator, vregs.min_uV, - vregs.max_uV); - if (ret) - return ret; - return regulator_enable(regulator); } @@ -1401,7 +1392,6 @@ static void qca_disable_regulator(struct qca_vreg vregs, struct regulator *regulator) { regulator_disable(regulator); - regulator_set_voltage(regulator, 0, vregs.max_uV); }