From patchwork Tue Sep 3 08:40:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1979925 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WyfGV3k0vz1yZ9 for ; Tue, 3 Sep 2024 18:40:50 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1slP5e-0002Sq-4H; Tue, 03 Sep 2024 08:40:42 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1slP5a-0002ET-IG for kernel-team@lists.ubuntu.com; Tue, 03 Sep 2024 08:40:38 +0000 Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 63F093F283 for ; Tue, 3 Sep 2024 08:40:38 +0000 (UTC) Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-a868403dbdeso375889766b.1 for ; Tue, 03 Sep 2024 01:40:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725352838; x=1725957638; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yC0GNRrjeoHfQR5ni1JMUj1hLuN5w54/YBod5tHcOv4=; b=Xofb8B2TdpxQrTWXpUttTtSrezy/gaXICwQHZI7D4hKNaEBhczykZ0LBkBK+d9uiNr eY8aoVT59dTXMiIzS4h89xZ5xteDwXZ8Ed+t7fVLURhS+ZT/4s0ZJY07/6RMPKyXpsDs ueM2WEqRsAOR/U81YIELlBTiuESmf4NgD3vtT7MjVRcNCM+jO55JWDuQsD6uiqwiQIZU M4pdImQS/VIMjqiX0ym+sSyeBXeXjKIeCHynwSMZIAduIvIA/Z/gECFHzw9lg8UvJMSK dCAfchfy2WlTU2c3ozB4rZnHbVt0tOwGsU00nknLqFYXn4Tl5jX3nJ626kR4xIj9UHlk ZVbg== X-Gm-Message-State: AOJu0YyuM5O+PFqS8h+o4wTaNWLVbTcU2tJy5rfNjQboCTH8mEO5OpUq KuhKoPIw2mW/2r/xWPoBX1GxUINR/zExH2dsckllYvQkXpMi/Tmmvr2p0kPihF3qRn8pYKMyIpK K9+o0kWDol/1uYXVC8kSK/P2JIBmjDnrs+rnEXHX+aZPkqL9bKf2s8XgFQWeDvbFXoa1Gojf/Y0 IVa468iPA4oA== X-Received: by 2002:a17:907:7251:b0:a86:7c5d:1856 with SMTP id a640c23a62f3a-a897fa744a8mr1456684566b.46.1725352837832; Tue, 03 Sep 2024 01:40:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE3NSfhmbAc0GElp17JIC83lx98W6dyJOYjQsJQX+Un5DRIb9ztrYrg+fzuBNYZZG3ivGN2Bg== X-Received: by 2002:a17:907:7251:b0:a86:7c5d:1856 with SMTP id a640c23a62f3a-a897fa744a8mr1456681066b.46.1725352836999; Tue, 03 Sep 2024 01:40:36 -0700 (PDT) Received: from localhost ([81.221.247.52]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a8988feb112sm660012966b.39.2024.09.03.01.40.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Sep 2024 01:40:36 -0700 (PDT) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [O][PATCH 18/21] UBUNTU: SAUCE: phy: qcom-qmp-combo: drop regulator loads Date: Tue, 3 Sep 2024 10:40:07 +0200 Message-ID: <20240903084010.3746280-19-juerg.haefliger@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240903084010.3746280-1-juerg.haefliger@canonical.com> References: <20240903084010.3746280-1-juerg.haefliger@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Johan Hovold Drivers should not be specifying active-mode regulator loads unless supporting an idle mode where the load is reduced during runtime. This effectively reverts commit 85936d4f3815 ("phy: qcom-qmp: add regulator_set_load to dp phy"). Link: https://lore.kernel.org/r/YuPps+cvVAMugWmy@sirena.org.uk Signed-off-by: Johan Hovold (cherry picked from commit 85f127f537adb8886e5caeb72a78d4aa15049708 github.com/jhovold/linux) Signed-off-by: Juerg Haefliger --- drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 40 +++++------------------ 1 file changed, 9 insertions(+), 31 deletions(-) diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c index 7b00945f7191..3d3e68aa0774 100644 --- a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c +++ b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c @@ -1425,17 +1425,6 @@ static const struct qmp_phy_init_tbl x1e80100_usb43dp_pcs_usb_tbl[] = { QMP_PHY_INIT_CFG(QPHY_V6_PCS_USB3_RXEQTRAINING_DFE_TIME_S2, 0x07), }; -/* list of regulators */ -struct qmp_regulator_data { - const char *name; - unsigned int enable_load; -}; - -static struct qmp_regulator_data qmp_phy_vreg_l[] = { - { .name = "vdda-phy", .enable_load = 21800 }, - { .name = "vdda-pll", .enable_load = 36000 }, -}; - static const u8 qmp_dp_v3_pre_emphasis_hbr3_hbr2[4][4] = { { 0x00, 0x0c, 0x15, 0x1a }, { 0x02, 0x0e, 0x16, 0xff }, @@ -1591,7 +1580,7 @@ struct qmp_phy_cfg { const char * const *reset_list; int num_resets; /* regulators to be requested */ - const struct qmp_regulator_data *vreg_list; + const char * const *vreg_list; int num_vregs; /* array of registers with different offsets */ @@ -1700,6 +1689,11 @@ static const char * const sc7180_usb3phy_reset_l[] = { "phy", }; +/* list of regulators */ +static const char * const qmp_phy_vreg_l[] = { + "vdda-phy", "vdda-pll", +}; + static const struct qmp_combo_offsets qmp_combo_offsets_v3 = { .com = 0x0000, .txa = 0x1200, @@ -3090,32 +3084,16 @@ static int qmp_combo_vreg_init(struct qmp_combo *qmp) const struct qmp_phy_cfg *cfg = qmp->cfg; struct device *dev = qmp->dev; int num = cfg->num_vregs; - int ret, i; + int i; qmp->vregs = devm_kcalloc(dev, num, sizeof(*qmp->vregs), GFP_KERNEL); if (!qmp->vregs) return -ENOMEM; for (i = 0; i < num; i++) - qmp->vregs[i].supply = cfg->vreg_list[i].name; + qmp->vregs[i].supply = cfg->vreg_list[i]; - ret = devm_regulator_bulk_get(dev, num, qmp->vregs); - if (ret) { - dev_err(dev, "failed at devm_regulator_bulk_get\n"); - return ret; - } - - for (i = 0; i < num; i++) { - ret = regulator_set_load(qmp->vregs[i].consumer, - cfg->vreg_list[i].enable_load); - if (ret) { - dev_err(dev, "failed to set load at %s\n", - qmp->vregs[i].supply); - return ret; - } - } - - return 0; + return devm_regulator_bulk_get(dev, num, qmp->vregs); } static int qmp_combo_reset_init(struct qmp_combo *qmp)