From patchwork Sun Jan 11 07:33:39 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Nazzareno Trimarchi X-Patchwork-Id: 4426 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 5C22C3F332 for ; Sun, 11 Jan 2026 08:33:50 +0100 (CET) Received: by mail-ed1-f69.google.com with SMTP id 4fb4d7f45d1cf-64db7bc9921sf9455641a12.2 for ; Sat, 10 Jan 2026 23:33:50 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1768116830; cv=pass; d=google.com; s=arc-20240605; b=AEb0ZFM8OWLBxRTxpW/EBa9YOyBM4aMrMiwzFBPPFEA24S51aVCNSJ+3Jjw4Jzbg6y rHzbALequxLS7wIsZjsuzy8tsLIdK0AxJQQtGDUH3KrPlJMhJC+f5kLkNWn4bSkw3nCq /rqd8Ky3uucYPh1+IWda8zLs0YgV8/eo4AzjviOqFF9seSO2K5e03TdakX0Yfhyg7+ty 9dfFG+lIfrvM3KAzWaoc5wpKiuWaDfRn13GvfydzSN53YltdFRtbKo7M10S+mjKItpg3 XcTUXeOO+dU5nOVPWmGAxeD9ft2gc6xtIE/S67Vk3eJJ9qQ0yZlonB0Mu4JvOtg/EkDy JDFw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=AZL7ua9feIBF2j/w2Gp2UgB7KwSROc82xAHqdB7CPks=; fh=Jxinvlh5tUHYhy+R4yAophMZJKWFVQhsKwpsj9l2kpA=; b=IJbrwtjuhB8ocyldJQL/Puqe9h5acxtMMCzi+EIOQ5bCm0yBiIGASuBhbg+LoEiwG3 hOrYyp1m1zFMQK4m0/1swBiudJcI7Di15FhOYXFIXs54OSJ9pwD0Gam5T8MF3hUc5otI 5j7bLcyUfUenXrBuaAOpAONoDzL3UPDuJ+GOjBZb3AIuqy99ULhXLbLZta0ptuimE4Hl tJSOeri7Dvu4wsGIYuGpe/rc9hNUfYsnOp7tAqIs6Tv1pZ58fZqDbW37M99Js9R478TY FDpBSylDUtmQ6+4LqIcvunZZVNhtfFGTT5Ch0g/DIDRwDMwRWkQR0mn8J+Z5Rqc/sBi0 jqiQ==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=Fd6Z6atE; spf=pass (google.com: domain of michael@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=michael@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=neutral header.i=@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1768116830; x=1768721630; darn=patchwork.amarulasolutions.com; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=AZL7ua9feIBF2j/w2Gp2UgB7KwSROc82xAHqdB7CPks=; b=QKm5AqWN4qyNJ9y1YwYCtGlYxD7MJEyJDPpyfcXRIpzEct8oRdoPSQiSB1u9hk+0Mu Uhm6uwgZWfljnHxa/ml4dDFBKCsUkTs+iff2f322QN0LQ4ScTP4x0OboH5cNWU9hIVgh inbAH47FGKC2JUW1VQ0pIK6G9+36GchQWhk+8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768116830; x=1768721630; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=AZL7ua9feIBF2j/w2Gp2UgB7KwSROc82xAHqdB7CPks=; b=Ee45Rx7pyZ1JliYbVgCrZcoIJQ/Gb/thAB4HRzXfit1Lazvt+7O565xwnZNhoH7seR R4xH2QGRk5QFrHqYfCqNWwpFejxC5xKOlzM+2xcNT9v1QRtVw3+K4F7L7K5+5X313Jc4 qpFPe49ihHplVBrSwms52XpJfMCfVbG3EPJEDzS8l/n6y70waXExxNXAw3UElWX8LfOU 4QEU6h4ytUt/UVXz8gRUx+NLBi2aFIx2eiczY8/AL5+2Txsvm4pWHyatjE6SfPvTjHt1 jo2Gnz2AZw6v0cHugRXAGVFOTJl6zMznN0cyJ8HdFlOl0yAgVoqrIiqfjyUFriGd76ZK J7Cw== X-Forwarded-Encrypted: i=2; AJvYcCUk1gtW7ewXqBKBnTem3PWjw14lTpaw+4wViaVXnzQx1TLzLeTNgmTPGqhtuesb9SJDIJdexSmZnw3mGhF/@patchwork.amarulasolutions.com X-Gm-Message-State: AOJu0Yx4zXdFwzu1UY5e/So7t3tjfI7eQAeZkAH+lUWSZZRlx+xgfx3h X3RFHbKNU9Y+dK/Ge5yBvxKyTbLfQ3B4hy5cto8CEqgfm2A5XMVoN8VVYVSsUld115y+zw== X-Google-Smtp-Source: AGHT+IH+gzgS0MyJya5AClOj3klu5V+uNGrZybROzlwuyfgNL8IAI5Izmyqu1WZgaTvjdObL20IbTA== X-Received: by 2002:a05:6402:26d3:b0:640:aae4:b84e with SMTP id 4fb4d7f45d1cf-65097df8eebmr14629537a12.13.1768116829938; Sat, 10 Jan 2026 23:33:49 -0800 (PST) X-BeenThere: linux-amarula@amarulasolutions.com; h="AV1CL+FkO/lnivDMov30EEBufBCx0Mb82W9FbAGvWq97LPHUWA==" Received: by 2002:aa7:c38c:0:b0:644:fc0e:254 with SMTP id 4fb4d7f45d1cf-6507421e9a7ls4652777a12.0.-pod-prod-04-eu; Sat, 10 Jan 2026 23:33:47 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVO+9sPp7ON/nuxuDQ5FRvKq6EMo86l032HIlCmWUPJrsB+iMgTXZQqyJgi+LCEA27zukhJ0QOonPfNT+Hk@amarulasolutions.com X-Received: by 2002:a17:907:948a:b0:b7a:1bde:a01d with SMTP id a640c23a62f3a-b844542d60dmr1378568466b.65.1768116827507; Sat, 10 Jan 2026 23:33:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1768116827; cv=none; d=google.com; s=arc-20240605; b=O7JRoaXkdcxrC7bZY4lacS6oexbQhOm/P9gMXV1bhJtLkNeRYBNRJiPhzdjlVBdPat 5yNnldhXf4USL6WjDHXnqbRoEkWBnmJyjqsQWdxSeW1qo08TjlPEmVpZ8ao7H0gdehW8 2yxEj87X1nVOAX4D+1ZA5LbNFpE0BvqTdaFNYwquzJEDZWVs7L/nHK3jOUJGkFUtsXSO lkKhRiiwHqIsINQsVdO+6aRjZAjy8bAvjOhmhZBru5i75P4zCvqI7rVa6sznnNMUy+iC 6FVs7nmi8NE23ncFMFdq7x4Iooqv+OweoO/qu4TwylLut9nKIX+nQVqlmKnMnMIkS+nF GYVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=vQidZ+PZ2lNQ0SE35FIC4EZo92wupR0Qpu6LmjJaFLY=; fh=FR9h5f/00yqxvxdGbQdqJrCGyv9AiZVWC8qHInJDMSc=; b=ielgLDqyUmdTq7cNqselqN1soAvSZUM2AM1uqArGivTmKGKMQ1ayeahaZHGz2i5N3j vVIkGzx37Ru8Gw6bRXAw3i2ec3DdLgAeqxCziG+0oBGvoZJfOE4/gW0VkekrgFTHG3Vr CuznSf+eG6NXa4Buxq6lLeDoLf7mKeIErc8YegePLZSjlX/rv2Gk0fE35PgSHldKjAa0 HO2pqnzJLO0cmVbgdmYYrHy8qBQvHDFTcoaCk+UyU70uN7hma98mYBZByHKYZkx3Lkr9 ZVM1ZSO5bMjX2M0k9M4JJh05nww7F9tIS33aQYNRTtcYc84IEY7F+WqblDln2P4c4yTr ikdQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=Fd6Z6atE; spf=pass (google.com: domain of michael@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=michael@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=neutral header.i=@amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id a640c23a62f3a-b842a20e79csor483933866b.4.2026.01.10.23.33.47 for (Google Transport Security); Sat, 10 Jan 2026 23:33:47 -0800 (PST) Received-SPF: pass (google.com: domain of michael@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Forwarded-Encrypted: i=1; AJvYcCVsFQBiakhBlo6THdWHf7lv+7ujmfVTkkyEmnBaIn4RBzq6oQusafSS+sR0aIwr84ofTg09XTRDlCQvI2Yo@amarulasolutions.com X-Gm-Gg: AY/fxX6j9qgi9bMI81zukbnVQ5p4hnASTV0Qvo2vDSRphcgVD+ivEL5cQKwA0UB9LB8 jzbK8a8q7Q6BFC8wQQPykiiYa2JFav7OQQV4SWcfqjhy+OOBnqoJHPs33FrxDYh+H/ThhqHbk+H KzJckocfKdZbgCCNH1NAjcPaLt2H0tJS78ZuLckUQQKtLXgCnpo5nOFG6UWMFabmH+4kmu3q8l4 fVg2+ZVvqlEbA4OnSFB1UioFG/7Kp6LIjG/oJDosm7gM3aw5M2fDO8lDLbICmDLPA1yj8I5JdSO YMJjfg84+yzyPu7mpoqrs3/YQPgKAFNvtuV8AtROwWtPLjm4BA6zvU6v2qdrMYSdubjfu44Cb5g 86jVYhvGKNt0uxWVRISObvaH3DW7992uVJ1PT9XNoLcV5P2StRaKok2rnUbho999W3WVmXBS0r1 Rdye7BiIbsJ0ZN0Cg3H0Wi5UbYd48A3f2NCLU2btM8TuGQ4gSDWKhp5SkQKlnvZwFJeU0VsVZTw 4A/zXGt4SouFQWwqgTNaPIuZsJNZmmSattmPDvbTv5QrgeuMN/qt5uPQg== X-Received: by 2002:a05:6402:5186:b0:64b:7231:da3d with SMTP id 4fb4d7f45d1cf-65097de81f7mr11937135a12.9.1768116827015; Sat, 10 Jan 2026 23:33:47 -0800 (PST) Received: from panicking.homenet.telecomitalia.it (host-87-5-117-220.retail.telecomitalia.it. [87.5.117.220]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-6507bf6d683sm14548782a12.34.2026.01.10.23.33.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Jan 2026 23:33:46 -0800 (PST) From: Michael Trimarchi To: Peng Fan , Jaehoon Chung Cc: Tom Rini , Dario Binacchi , u-boot@lists.denx.de, linux-amarula@amarulasolutions.com, Michael Trimarchi Subject: [PATCH 2/2] power: regulator: pfuze100: Decouple hardware base voltage from DTS constraints Date: Sun, 11 Jan 2026 08:33:39 +0100 Message-ID: <20260111073339.1297089-3-michael@amarulasolutions.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260111073339.1297089-1-michael@amarulasolutions.com> References: <20260111073339.1297089-1-michael@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: michael@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=Fd6Z6atE; spf=pass (google.com: domain of michael@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=michael@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=neutral header.i=@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Currently, the driver uses the device tree property `regulator-min-microvolt` (accessed via `uc_pdata->min_uV`) as the base voltage for calculating voltage register values. However, the device tree property defines the safety constraint (the minimum voltage allowed for the specific board/consumer), not the physical minimum voltage the regulator outputs when the selector is at 0. Using the DTS constraint as the linear base leads to incorrect voltage calculations if the constraint does not exactly match the hardware's zero-index voltage. For example, if a regulator physically starts at 700mV but the DTS constrains it to 1000mV, the driver incorrectly calculates the selector assuming 0 corresponds to 1000mV. Fix this by: 1. Adding a `min_uV` field to the regulator descriptor to hold the true hardware base voltage as defined in the datasheet. 2. Updating the regulator definitions with the correct base voltages (aligned with Linux kernel driver definitions). 3. Using the descriptor's hardware minimum for all voltage-to-selector calculations, instead of the DTS constraint. 4. Adding a validation check to ensure the DTS constraint is within the hardware's possible range. Signed-off-by: Michael Trimarchi --- drivers/power/regulator/pfuze100.c | 94 ++++++++++++++++-------------- 1 file changed, 51 insertions(+), 43 deletions(-) diff --git a/drivers/power/regulator/pfuze100.c b/drivers/power/regulator/pfuze100.c index 63d39c21bb8..107f036d33f 100644 --- a/drivers/power/regulator/pfuze100.c +++ b/drivers/power/regulator/pfuze100.c @@ -32,6 +32,7 @@ struct pfuze100_regulator_desc { enum regulator_type type; bool hi_bit; unsigned int uV_step; + unsigned int min_uV; unsigned int vsel_reg; unsigned int vsel_mask; unsigned int stby_reg; @@ -54,13 +55,15 @@ struct pfuze100_regulator_plat { .name = #_name, \ .type = REGULATOR_TYPE_FIXED, \ .voltage = (vol), \ + .min_uV = (vol), \ } -#define PFUZE100_SW_REG(_name, base, step, hbit) \ +#define PFUZE100_SW_REG(_name, base, min, step, hbit) \ { \ .name = #_name, \ .type = REGULATOR_TYPE_BUCK, \ .hi_bit = (hbit), \ + .min_uV = (min), \ .uV_step = (step), \ .vsel_reg = (base) + PFUZE100_VOL_OFFSET, \ .vsel_mask = 0x3F, \ @@ -88,10 +91,11 @@ struct pfuze100_regulator_plat { .volt_table = (voltages), \ } -#define PFUZE100_VGEN_REG(_name, base, step) \ +#define PFUZE100_VGEN_REG(_name, base, min, step) \ { \ .name = #_name, \ .type = REGULATOR_TYPE_LDO, \ + .min_uV = (min), \ .uV_step = (step), \ .vsel_reg = (base), \ .vsel_mask = 0xF, \ @@ -99,10 +103,11 @@ struct pfuze100_regulator_plat { .stby_mask = 0x20, \ } -#define PFUZE3000_VCC_REG(_name, base, step) \ +#define PFUZE3000_VCC_REG(_name, base, min, step) \ { \ .name = #_name, \ .type = REGULATOR_TYPE_LDO, \ + .min_uV = (min), \ .uV_step = (step), \ .vsel_reg = (base), \ .vsel_mask = 0x3, \ @@ -110,10 +115,11 @@ struct pfuze100_regulator_plat { .stby_mask = 0x20, \ } -#define PFUZE3000_SW1_REG(_name, base, step) \ +#define PFUZE3000_SW1_REG(_name, base, min, step) \ { \ .name = #_name, \ .type = REGULATOR_TYPE_BUCK, \ + .min_uV = (min), \ .uV_step = (step), \ .vsel_reg = (base) + PFUZE100_VOL_OFFSET, \ .vsel_mask = 0x1F, \ @@ -121,10 +127,11 @@ struct pfuze100_regulator_plat { .stby_mask = 0x1F, \ } -#define PFUZE3000_SW2_REG(_name, base, step) \ +#define PFUZE3000_SW2_REG(_name, base, min, step) \ { \ .name = #_name, \ .type = REGULATOR_TYPE_BUCK, \ + .min_uV = (min), \ .uV_step = (step), \ .vsel_reg = (base) + PFUZE100_VOL_OFFSET, \ .vsel_mask = 0x7, \ @@ -132,10 +139,11 @@ struct pfuze100_regulator_plat { .stby_mask = 0x7, \ } -#define PFUZE3000_SW3_REG(_name, base, step) \ +#define PFUZE3000_SW3_REG(_name, base, min, step) \ { \ .name = #_name, \ .type = REGULATOR_TYPE_BUCK, \ + .min_uV = (min), \ .uV_step = (step), \ .vsel_reg = (base) + PFUZE100_VOL_OFFSET, \ .vsel_mask = 0xF, \ @@ -165,55 +173,55 @@ static unsigned int pfuze3000_sw2hi[] = { /* PFUZE100 */ static struct pfuze100_regulator_desc pfuze100_regulators[] = { - PFUZE100_SW_REG(sw1ab, PFUZE100_SW1ABVOL, 25000, false), - PFUZE100_SW_REG(sw1c, PFUZE100_SW1CVOL, 25000, false), - PFUZE100_SW_REG(sw2, PFUZE100_SW2VOL, 25000, true), - PFUZE100_SW_REG(sw3a, PFUZE100_SW3AVOL, 25000, true), - PFUZE100_SW_REG(sw3b, PFUZE100_SW3BVOL, 25000, true), - PFUZE100_SW_REG(sw4, PFUZE100_SW4VOL, 25000, true), + PFUZE100_SW_REG(sw1ab, PFUZE100_SW1ABVOL, 300000, 25000, false), + PFUZE100_SW_REG(sw1c, PFUZE100_SW1CVOL, 300000, 25000, false), + PFUZE100_SW_REG(sw2, PFUZE100_SW2VOL, 400000, 25000, true), + PFUZE100_SW_REG(sw3a, PFUZE100_SW3AVOL, 400000, 25000, true), + PFUZE100_SW_REG(sw3b, PFUZE100_SW3BVOL, 400000, 25000, true), + PFUZE100_SW_REG(sw4, PFUZE100_SW4VOL, 400000, 25000, true), PFUZE100_SWB_REG(swbst, PFUZE100_SWBSTCON1, 0x3, 50000, pfuze100_swbst, false), PFUZE100_SNVS_REG(vsnvs, PFUZE100_VSNVSVOL, 0x7, pfuze100_vsnvs), PFUZE100_FIXED_REG(vrefddr, PFUZE100_VREFDDRCON, 750000), - PFUZE100_VGEN_REG(vgen1, PFUZE100_VGEN1VOL, 50000), - PFUZE100_VGEN_REG(vgen2, PFUZE100_VGEN2VOL, 50000), - PFUZE100_VGEN_REG(vgen3, PFUZE100_VGEN3VOL, 100000), - PFUZE100_VGEN_REG(vgen4, PFUZE100_VGEN4VOL, 100000), - PFUZE100_VGEN_REG(vgen5, PFUZE100_VGEN5VOL, 100000), - PFUZE100_VGEN_REG(vgen6, PFUZE100_VGEN6VOL, 100000), + PFUZE100_VGEN_REG(vgen1, PFUZE100_VGEN1VOL, 800000, 50000), + PFUZE100_VGEN_REG(vgen2, PFUZE100_VGEN2VOL, 800000, 50000), + PFUZE100_VGEN_REG(vgen3, PFUZE100_VGEN3VOL, 1800000, 100000), + PFUZE100_VGEN_REG(vgen4, PFUZE100_VGEN4VOL, 1800000, 100000), + PFUZE100_VGEN_REG(vgen5, PFUZE100_VGEN5VOL, 1800000, 100000), + PFUZE100_VGEN_REG(vgen6, PFUZE100_VGEN6VOL, 1800000, 100000), }; /* PFUZE200 */ static struct pfuze100_regulator_desc pfuze200_regulators[] = { - PFUZE100_SW_REG(sw1ab, PFUZE100_SW1ABVOL, 25000, false), - PFUZE100_SW_REG(sw2, PFUZE100_SW2VOL, 25000, true), - PFUZE100_SW_REG(sw3a, PFUZE100_SW3AVOL, 25000, true), - PFUZE100_SW_REG(sw3b, PFUZE100_SW3BVOL, 25000, true), + PFUZE100_SW_REG(sw1ab, PFUZE100_SW1ABVOL, 300000, 25000, false), + PFUZE100_SW_REG(sw2, PFUZE100_SW2VOL, 400000, 25000, true), + PFUZE100_SW_REG(sw3a, PFUZE100_SW3AVOL, 400000, 25000, true), + PFUZE100_SW_REG(sw3b, PFUZE100_SW3BVOL, 400000, 25000, true), PFUZE100_SWB_REG(swbst, PFUZE100_SWBSTCON1, 0x3, 50000, pfuze100_swbst, false), PFUZE100_SNVS_REG(vsnvs, PFUZE100_VSNVSVOL, 0x7, pfuze100_vsnvs), PFUZE100_FIXED_REG(vrefddr, PFUZE100_VREFDDRCON, 750000), - PFUZE100_VGEN_REG(vgen1, PFUZE100_VGEN1VOL, 50000), - PFUZE100_VGEN_REG(vgen2, PFUZE100_VGEN2VOL, 50000), - PFUZE100_VGEN_REG(vgen3, PFUZE100_VGEN3VOL, 100000), - PFUZE100_VGEN_REG(vgen4, PFUZE100_VGEN4VOL, 100000), - PFUZE100_VGEN_REG(vgen5, PFUZE100_VGEN5VOL, 100000), - PFUZE100_VGEN_REG(vgen6, PFUZE100_VGEN6VOL, 100000), + PFUZE100_VGEN_REG(vgen1, PFUZE100_VGEN1VOL, 800000, 50000), + PFUZE100_VGEN_REG(vgen2, PFUZE100_VGEN2VOL, 800000, 50000), + PFUZE100_VGEN_REG(vgen3, PFUZE100_VGEN3VOL, 1800000, 100000), + PFUZE100_VGEN_REG(vgen4, PFUZE100_VGEN4VOL, 1800000, 100000), + PFUZE100_VGEN_REG(vgen5, PFUZE100_VGEN5VOL, 1800000, 100000), + PFUZE100_VGEN_REG(vgen6, PFUZE100_VGEN6VOL, 1800000, 100000), }; /* PFUZE3000 */ static struct pfuze100_regulator_desc pfuze3000_regulators[] = { - PFUZE3000_SW1_REG(sw1a, PFUZE100_SW1ABVOL, 25000), - PFUZE3000_SW1_REG(sw1b, PFUZE100_SW1CVOL, 25000), + PFUZE3000_SW1_REG(sw1a, PFUZE100_SW1ABVOL, 700000, 25000), + PFUZE3000_SW1_REG(sw1b, PFUZE100_SW1CVOL, 700000, 25000), PFUZE100_SWB_REG(sw2, PFUZE100_SW2VOL, 0x7, 50000, pfuze3000_sw2lo, true), - PFUZE3000_SW3_REG(sw3, PFUZE100_SW3AVOL, 50000), + PFUZE3000_SW3_REG(sw3, PFUZE100_SW3AVOL, 900000, 50000), PFUZE100_SWB_REG(swbst, PFUZE100_SWBSTCON1, 0x3, 50000, pfuze100_swbst, false), PFUZE100_SNVS_REG(vsnvs, PFUZE100_VSNVSVOL, 0x7, pfuze3000_vsnvs), PFUZE100_FIXED_REG(vrefddr, PFUZE100_VREFDDRCON, 750000), - PFUZE100_VGEN_REG(vldo1, PFUZE100_VGEN1VOL, 100000), - PFUZE100_VGEN_REG(vldo2, PFUZE100_VGEN2VOL, 50000), - PFUZE3000_VCC_REG(vccsd, PFUZE100_VGEN3VOL, 150000), - PFUZE3000_VCC_REG(v33, PFUZE100_VGEN4VOL, 150000), - PFUZE100_VGEN_REG(vldo3, PFUZE100_VGEN5VOL, 100000), - PFUZE100_VGEN_REG(vldo4, PFUZE100_VGEN6VOL, 100000), + PFUZE100_VGEN_REG(vldo1, PFUZE100_VGEN1VOL, 1800000, 100000), + PFUZE100_VGEN_REG(vldo2, PFUZE100_VGEN2VOL, 800000, 50000), + PFUZE3000_VCC_REG(vccsd, PFUZE100_VGEN3VOL, 2850000, 150000), + PFUZE3000_VCC_REG(v33, PFUZE100_VGEN4VOL, 2850000, 150000), + PFUZE100_VGEN_REG(vldo3, PFUZE100_VGEN5VOL, 1800000, 100000), + PFUZE100_VGEN_REG(vldo4, PFUZE100_VGEN6VOL, 1800000, 100000), }; #define MODE(_id, _val, _name) { \ @@ -483,15 +491,15 @@ static int pfuze100_regulator_val(struct udevice *dev, int op, int *uV) val &= desc->vsel_mask; *uV = desc->volt_table[val]; } else { - if (uc_pdata->min_uV < 0) { - debug("Need to provide min_uV in dts.\n"); + if (uc_pdata->min_uV < desc->min_uV) { + debug("min_uV in dts can not be below regulator min_uV.\n"); return -EINVAL; } val = pmic_reg_read(dev->parent, desc->vsel_reg); if (val < 0) return val; val &= desc->vsel_mask; - *uV = uc_pdata->min_uV + (int)val * desc->uV_step; + *uV = desc->min_uV + (int)val * desc->uV_step; } return 0; @@ -513,13 +521,13 @@ static int pfuze100_regulator_val(struct udevice *dev, int op, int *uV) return pmic_clrsetbits(dev->parent, desc->vsel_reg, desc->vsel_mask, i); } else { - if (uc_pdata->min_uV < 0) { - debug("Need to provide min_uV in dts.\n"); + if (uc_pdata->min_uV < desc->min_uV) { + debug("min_uV in dts can not be below regulator min_uV.\n"); return -EINVAL; } return pmic_clrsetbits(dev->parent, desc->vsel_reg, desc->vsel_mask, - (*uV - uc_pdata->min_uV) / desc->uV_step); + (*uV - desc->min_uV) / desc->uV_step); } return 0;