Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp1265061imu; Fri, 25 Jan 2019 22:18:50 -0800 (PST) X-Google-Smtp-Source: ALg8bN4RYH+kgLZqqAcRc20yviTRrqPCCNqsd/+ayetyu48k60cEfWtpSyZr2r6mATMW6OkcqS/J X-Received: by 2002:a62:cd1:: with SMTP id 78mr13870524pfm.219.1548483530584; Fri, 25 Jan 2019 22:18:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548483530; cv=none; d=google.com; s=arc-20160816; b=WG4vKFuY1WCeKteIeIUmLO44A9DqKIbNg1qUDJ5NH5PMfFKS4O7gjv9QGyY5FU8mJF xpvkuIWSxEpbAU85qT4caj1cTpTJDpRDViaF02pftBNpMsR0Yi1Ees/6EhKlJ7vLP4VU zNVdiSREQqFpdVQZp1lP0WEc/lsyCMfvKKSrYgI7wDJaIhOv8fat0RYtJngJY1rqCMc/ Ke8ElBcWNnqQL2Pd8sSwCN7UamvgyBTLCfiwRfmCWU5s958T4CqYmhCh61bzSQN30Gwk Zix0XMOKsQhs8ih4PM3SkVz58u5L5p27uVRYqDsZyFcqKsCR6GZ/77xX0IDPVM0RA5R+ 4ROw== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=JSmITJw8ipgTHDHuuQbVyNNP7a2K+4jjuUDKEO/2BSQ=; b=Df/hOkFqQSQdQN318BGBMzcktSPRcMlrNZ7JTvwyFIAKZDTWPiaQ35kixAkVP2lmRs kriefR72tU2I0ke6qqtHskdQp6t8OVB1yq56F012CxY5y/+Sq5m/T+eVn7/ayONI2VEp wx3rml41t3YLF4DScYF/ZJU9urdAEwgmHmh4UIDmWHJmI4glvC1G7L0tvUK8cDQAu+u7 WFYpxnGevBvZmmFjxC9rgUd01al0ujTYUv5VptXHEYRK+KsSDpSDC4ZsXPR9VeeLJ/Vg Zyt35C3wPGjw4mxOG9dG6GHVH1OnRKEEKx63JAQw4VU85sdcuC6gp89o9w3DOcGU9h50 yT3A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=iKvIgjXT; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d13si26415767plr.403.2019.01.25.22.18.33; Fri, 25 Jan 2019 22:18:50 -0800 (PST) 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=@gmail.com header.s=20161025 header.b=iKvIgjXT; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727739AbfAZGSS (ORCPT + 99 others); Sat, 26 Jan 2019 01:18:18 -0500 Received: from mail-pf1-f195.google.com ([209.85.210.195]:32902 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726030AbfAZGSS (ORCPT ); Sat, 26 Jan 2019 01:18:18 -0500 Received: by mail-pf1-f195.google.com with SMTP id c123so5748894pfb.0 for ; Fri, 25 Jan 2019 22:18:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=JSmITJw8ipgTHDHuuQbVyNNP7a2K+4jjuUDKEO/2BSQ=; b=iKvIgjXTU+cd0F7lUCt9CqpCckQ8Lgi4IWCA2A3uqy99Mj0FoEQfml8lOh5o2hcjaz LK6mLVA7ktj7qgKo05JFa+wxGgmViaKD3kwQhGNdJPWPbypRikJtiQ9X7OncP5OU5T4y Onjj2C8vnf5Ji51YM0oE+aW+dPJSZD4JMQB5KfVip/csehJZfXjSqDTXDOe8HGcfiUXy DY2dDe65mlm8Y8CINF2pL6pExl/YMvnzK4ksBMk5ApAMAldJdyDFPEzfAZpj5S2AR82j jaOLwtye0VOVvWhXrjPr0ruLkNk2NwuN5PdK2EOfk7axkVBJwqLqbZUzcVG4jefrrXSt oPfg== 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:mime-version :content-transfer-encoding; bh=JSmITJw8ipgTHDHuuQbVyNNP7a2K+4jjuUDKEO/2BSQ=; b=HbbuR+peiN4ZGxh1K3ea6qlYG6RotGvRqCLBfuB19dm+NFw9Hrjiar98FC82Yikyq/ 5d4FHhM6yM8E50hOM/r6xO23H1up+eEdH9wjOPOwXj/kgyg1N1j5nds03r/SDFpFAw+b 7cttnUd6LSoe57Y27zUxG2i0NGEGQyoKKUL7qgsbXgM+94Bv7Em5qoePpN3se3lVX0NM tl7fsrF2B0syFKEpN1nsyASJcmEDyARkoZ/sD9h4dm5e6f0sfun7C5RiK0yKJnK1HcNm jUl7ZzbcofTQRINdLHjd8ha5rfqIZ5PzznEqfEqAlbAEYiLdpuE0NY3lp2eDFpwyzyli PBfw== X-Gm-Message-State: AJcUukdzFm8KfTEzwoyBqSIVpljLcfmJcoQHyvQDbmOrlDrhkoH9Do46 56MMagGJb69BtrFXk9QVXNU= X-Received: by 2002:a62:c683:: with SMTP id x3mr13649666pfk.10.1548483497516; Fri, 25 Jan 2019 22:18:17 -0800 (PST) Received: from anarsoul-thinkpad.lan (216-71-193-140.dyn.novuscom.net. [216.71.193.140]) by smtp.gmail.com with ESMTPSA id 85sm36537643pfw.17.2019.01.25.22.18.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 22:18:16 -0800 (PST) From: Vasily Khoruzhick To: Liam Girdwood , Mark Brown , Chen-Yu Tsai , Olliver Schinagl , linux-kernel@vger.kernel.org Cc: Vasily Khoruzhick Subject: [PATCH] regulator: axp20x: fix ALDO2, DLDO2 and ELDO3 definitions for AXP803 Date: Fri, 25 Jan 2019 22:18:09 -0800 Message-Id: <20190126061809.18035-1-anarsoul@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Looks like refactoring didn't go well and left ALDO2, DLDO2 and ELDO3 definitions broken for AXP803 - now they are using register address instead of mask. Fix it by using mask where necessary. Fixes: db4a555f7c4cf ("regulator: axp20x: use defines for masks") Signed-off-by: Vasily Khoruzhick --- drivers/regulator/axp20x-regulator.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/regulator/axp20x-regulator.c b/drivers/regulator/axp20x-regulator.c index 48af859fd053..a808b03cae10 100644 --- a/drivers/regulator/axp20x-regulator.c +++ b/drivers/regulator/axp20x-regulator.c @@ -719,7 +719,7 @@ static const struct regulator_desc axp803_regulators[] = { AXP22X_ALDO1_V_OUT, AXP22X_ALDO1_V_OUT_MASK, AXP22X_PWR_OUT_CTRL3, AXP806_PWR_OUT_ALDO1_MASK), AXP_DESC(AXP803, ALDO2, "aldo2", "aldoin", 700, 3300, 100, - AXP22X_ALDO2_V_OUT, AXP22X_ALDO2_V_OUT, + AXP22X_ALDO2_V_OUT, AXP22X_ALDO2_V_OUT_MASK, AXP22X_PWR_OUT_CTRL3, AXP806_PWR_OUT_ALDO2_MASK), AXP_DESC(AXP803, ALDO3, "aldo3", "aldoin", 700, 3300, 100, AXP22X_ALDO3_V_OUT, AXP22X_ALDO3_V_OUT_MASK, @@ -729,7 +729,7 @@ static const struct regulator_desc axp803_regulators[] = { AXP22X_PWR_OUT_CTRL2, AXP22X_PWR_OUT_DLDO1_MASK), AXP_DESC_RANGES(AXP803, DLDO2, "dldo2", "dldoin", axp803_dldo2_ranges, AXP803_DLDO2_NUM_VOLTAGES, - AXP22X_DLDO2_V_OUT, AXP22X_DLDO2_V_OUT, + AXP22X_DLDO2_V_OUT, AXP22X_DLDO2_V_OUT_MASK, AXP22X_PWR_OUT_CTRL2, AXP22X_PWR_OUT_DLDO2_MASK), AXP_DESC(AXP803, DLDO3, "dldo3", "dldoin", 700, 3300, 100, AXP22X_DLDO3_V_OUT, AXP22X_DLDO3_V_OUT_MASK, @@ -744,7 +744,7 @@ static const struct regulator_desc axp803_regulators[] = { AXP22X_ELDO2_V_OUT, AXP22X_ELDO2_V_OUT_MASK, AXP22X_PWR_OUT_CTRL2, AXP22X_PWR_OUT_ELDO2_MASK), AXP_DESC(AXP803, ELDO3, "eldo3", "eldoin", 700, 1900, 50, - AXP22X_ELDO3_V_OUT, AXP22X_ELDO3_V_OUT, + AXP22X_ELDO3_V_OUT, AXP22X_ELDO3_V_OUT_MASK, AXP22X_PWR_OUT_CTRL2, AXP22X_PWR_OUT_ELDO3_MASK), AXP_DESC(AXP803, FLDO1, "fldo1", "fldoin", 700, 1450, 50, AXP803_FLDO1_V_OUT, AXP803_FLDO1_V_OUT_MASK, -- 2.20.1