From patchwork Wed Oct 31 23:11:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 149909 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp106376ljp; Wed, 31 Oct 2018 16:16:33 -0700 (PDT) X-Google-Smtp-Source: AJdET5cywodTS1gkX4DQft0L8xD2tpQqO5ztm53eBtpv8JljYAtgrSRr1GWTbWvZ0mwB/8yzad6m X-Received: by 2002:a63:83c1:: with SMTP id h184mr4906338pge.437.1541027793437; Wed, 31 Oct 2018 16:16:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1541027793; cv=none; d=google.com; s=arc-20160816; b=EbFVlHRYGLVb4YPeDTUkQljb8zkylMoKLrq10SuaqWovzoVhJc78Qv1L6Ep+YXGFeS fFnk1j16BPoJ6vGrjTPkz24oZ+rUjmX3XKmur3a84iqJjEetFxBsk1zWTKq6Q4YbmICX ifujl9EiSoorGxYDPf6pybiwPzG3NiiYH43hgcWSSB6WeBEvLiBWBSQVCQ8WcUs/FcWx tFvv5zd7TAFCFcaHWcGy/g6VSciX+RVBNrkxIsY7iw002PzgoBteoNdM83zGOw7B0ukn bdcaj62CCVvaxftzhaaKDxLt2r/CDD9RoLyr2neMbbn0xy8IG8ymXmHTmahlBGAwqDmO 9XHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=mrNs/bbsiB+AlGkwaRhyzwbmggIaoPYHDsnxbr5LHhA=; b=vkUnuk0II0kX9j7PsbRUTTRmfRPG+skkZGgzba2RV/gWSiR4MqdvXpuSSQkvl43VbI 1JDtCEXmZ/sJgOILMzGuyby/PXVDZ+V0TgHxNODmYmcd0r9U1JfpjccTy14UmEAjUexp OnvQFbiqDwnPOA2gNmrmMnYz/vCHGt19503FfN7MuHTwG/SWbd9JGpvPflCICcWvqIA8 +64XqohsFSmPksHJ/LXQR9sR1e47mfWVuUaYBMhSyCwfl33hBUmbOwm1+VgPe+Ho1HPg Mvis6t1Av7Hq7iMq2yQP0JTrgUoakVSFir3XEcf052QluFAN59vrGoIVjbeWTZmPpWYV XY+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=qegaXVJj; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m126-v6si17303978pfc.265.2018.10.31.16.16.33; Wed, 31 Oct 2018 16:16:33 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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=@kernel.org header.s=default header.b=qegaXVJj; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732188AbeKAIQp (ORCPT + 32 others); Thu, 1 Nov 2018 04:16:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:36284 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730815AbeKAIL7 (ORCPT ); Thu, 1 Nov 2018 04:11:59 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A63E420866; Wed, 31 Oct 2018 23:11:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1541027507; bh=Cju/D3RxbTH6ZqqwWGQO2KVmVRK5Bbg6zlXLa/iyMQU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qegaXVJjoUx/Hih1eaKWMq4HmxOHc6wZ0fnXktxnOcGvqQQOLVmbJjB46KhB3j9zt /arFLTESH4ePWD91IRzhFNXf++AK5bs38kEDTUjEtKORoE+y4IeDyG7qRkDd71ejBW w/Um/9CzTkHSDFLakYdo9Yd+yHvXudD9ZDsh91/8= From: Sasha Levin To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Linus Walleij , Mark Brown , Sasha Levin Subject: [PATCH AUTOSEL 4.4 10/32] regulator: fixed: Default enable high on DT regulators Date: Wed, 31 Oct 2018 19:11:15 -0400 Message-Id: <20181031231137.29429-10-sashal@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181031231137.29429-1-sashal@kernel.org> References: <20181031231137.29429-1-sashal@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Linus Walleij [ Upstream commit 28be5f15df2ee6882b0a122693159c96a28203c7 ] commit efdfeb079cc3 ("regulator: fixed: Convert to use GPIO descriptor only") switched to use gpiod_get() to look up the regulator from the gpiolib core whether that is device tree or boardfile. This meant that we activate the code in a603a2b8d86e ("gpio: of: Add special quirk to parse regulator flags") which means the descriptors coming from the device tree already have the right inversion and open drain semantics set up from the gpiolib core. As the fixed regulator was inspected again we got the inverted inversion and things broke. Fix it by ignoring the config in the device tree for now: the later patches in the series will push all inversion handling over to the gpiolib core and set it up properly in the boardfiles for legacy devices, but I did not finish that for this kernel cycle. Fixes: commit efdfeb079cc3 ("regulator: fixed: Convert to use GPIO descriptor only") Reported-by: Leonard Crestez Reported-by: Fabio Estevam Reported-by: John Stultz Reported-by: Anders Roxell Signed-off-by: Linus Walleij Tested-by: John Stultz Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- drivers/regulator/fixed.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) -- 2.17.1 diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c index ff62d69ba0be..24ad5e6832df 100644 --- a/drivers/regulator/fixed.c +++ b/drivers/regulator/fixed.c @@ -94,9 +94,14 @@ of_get_fixed_voltage_config(struct device *dev, of_property_read_u32(np, "startup-delay-us", &config->startup_delay); - config->enable_high = of_property_read_bool(np, "enable-active-high"); - config->gpio_is_open_drain = of_property_read_bool(np, - "gpio-open-drain"); + /* + * FIXME: we pulled active low/high and open drain handling into + * gpiolib so it will be handled there. Delete this in the second + * step when we also remove the custom inversion handling for all + * legacy boardfiles. + */ + config->enable_high = 1; + config->gpio_is_open_drain = 0; if (of_find_property(np, "vin-supply", NULL)) config->input_supply = "vin";