From patchwork Fri Mar 11 20:12:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 8568881 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 8763CC0553 for ; Fri, 11 Mar 2016 20:14:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A859B2024D for ; Fri, 11 Mar 2016 20:14:55 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AC805201CE for ; Fri, 11 Mar 2016 20:14:54 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1aeTQm-0000GL-AT; Fri, 11 Mar 2016 20:13:04 +0000 Received: from mx1.redhat.com ([209.132.183.28]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aeTQj-0000Dn-0b for linux-arm-kernel@lists.infradead.org; Fri, 11 Mar 2016 20:13:01 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 134D77F089; Fri, 11 Mar 2016 20:12:43 +0000 (UTC) Received: from shalem.localdomain.com (vpn1-6-20.ams2.redhat.com [10.36.6.20]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u2BKCYXZ004692; Fri, 11 Mar 2016 15:12:39 -0500 From: Hans de Goede To: Maxime Ripard , Chen-Yu Tsai , Mark Brown , Liam Girdwood Subject: [PATCH 2/2] regulator: axp20x: Fix axp22x ldo_io registration error on cold boot Date: Fri, 11 Mar 2016 21:12:31 +0100 Message-Id: <1457727151-16392-2-git-send-email-hdegoede@redhat.com> In-Reply-To: <1457727151-16392-1-git-send-email-hdegoede@redhat.com> References: <1457727151-16392-1-git-send-email-hdegoede@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160311_121301_103955_E8D1D0F2 X-CRM114-Status: GOOD ( 11.61 ) X-Spam-Score: -6.9 (------) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree , linux-sunxi@googlegroups.com, linux-arm-kernel@lists.infradead.org, Hans de Goede MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The maximum supported voltage for ldo_io# is 3.3V, but on cold boot the selector comes up at 0x1f, which maps to 3.8V. This causes _regulator_get_voltage() to fail with -EINVAL which causes regulator registration to fail when constrains are used: [ 1.467788] vcc-touchscreen: failed to get the current voltage(-22) [ 1.474209] axp20x-regulator axp20x-regulator: Failed to register ldo_io1 [ 1.483363] axp20x-regulator: probe of axp20x-regulator failed with error -22 This commits makes axp20x_probe fix-up the selector values in the chip before registering regulators avoiding the above errors. Signed-off-by: Hans de Goede --- drivers/regulator/axp20x-regulator.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/drivers/regulator/axp20x-regulator.c b/drivers/regulator/axp20x-regulator.c index 0c0e7a3..679018c 100644 --- a/drivers/regulator/axp20x-regulator.c +++ b/drivers/regulator/axp20x-regulator.c @@ -345,6 +345,7 @@ static int axp20x_regulator_probe(struct platform_device *pdev) .driver_data = axp20x, }; int ret, i, nregulators; + unsigned int reg, sel; u32 workmode; const char *axp22x_dc1_name = axp22x_regulators[AXP22X_DCDC1].name; const char *axp22x_dc5_name = axp22x_regulators[AXP22X_DCDC5].name; @@ -359,6 +360,24 @@ static int axp20x_regulator_probe(struct platform_device *pdev) case AXP223_ID: regulators = axp22x_regulators; nregulators = AXP22X_REG_ID_MAX; + /* + * On cold boot ldo_io# sel is 0x1f which is out of spec, + * fix this up here to avoid _regulator_get_voltage returning + * -EINVAL when applying constraints. + */ + for (reg = AXP22X_LDO_IO0_V_OUT; + reg <= AXP22X_LDO_IO1_V_OUT; reg += 2) { + ret = regmap_read(axp20x->regmap, reg, &sel); + if (ret) + return ret; + sel &= 0x1f; + if (sel > 0x1a) { + ret = regmap_update_bits(axp20x->regmap, reg, + 0x1f, 0x1a); + if (ret) + return ret; + } + } break; default: dev_err(&pdev->dev, "Unsupported AXP variant: %ld\n",