From patchwork Wed Oct 4 11:29:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 9984345 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9B1DB6028E for ; Wed, 4 Oct 2017 11:31:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8EA9928A9A for ; Wed, 4 Oct 2017 11:31:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8353A28ADD; Wed, 4 Oct 2017 11:31:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E9EF128A9A for ; Wed, 4 Oct 2017 11:30:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Date:Message-Id: In-Reply-To:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: References:List-Owner; bh=Wrrep/XXv9lfddnojNCxSD02PaWcikzDG88gsfFLF60=; b=MoU TiryYIczvhUHRvdnnJIyqOjv9VdOHyL+bjm6ebepKF5RoTHL4iKMqmCCSZ1mT+y9Qhq0BtiOoQ9Uy poDdttOhsZSFASby6P1wMgh1W8NhepXPIdGBx4pyrALmFdpFut8uP3GnB8POtmERvHGP9cLpmmWfi PXraucMAucuC9j+tDmTXMEQgRl3KFf+f0Po/Iq5WIbqaZ/JqEa2w8FBlJ0iGPWBM0WmWJueHU79dx bBIN09A+lVBRMgqvNnDznPU8/lNEj/mYIPFm+nNlyCphhoBG9LCZpNBuh7jIG6bxdVCYllgZJY27H dHQRMLG73WEXvcMARYaRChvv65STzPg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dzht8-0001Eo-FX; Wed, 04 Oct 2017 11:30:54 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dzht6-0001Dr-4T for linux-arm-kernel@bombadil.infradead.org; Wed, 04 Oct 2017 11:30:52 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=Date:Message-Id:In-Reply-To:Subject:Cc: To:From:Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:References:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=I51Nl4n8AB+XcRmFDSOYzXsdhsttUvT0BEIrUeJCiHE=; b=uTyMskO2Ko/IqmUeQHbZGg/3du txACc0/lLb9JekuZYfV7458r5V/ifpdZmorzsuUfz+jPbe5M5oRMV/pZ8RCtzB/kciI4fDc+ucVk4 hZnzrUxr6d1WfqJiLhpIXIiB+5jlWSaDFwbMmOqBH+PzQsVfc+vxJU+7XyM9gBpdBtNUubY1cMWQT 0yf1NNb0uHES/FSJhUnNGcp3/TD39gI4yOxcL00LCYGTzrX4Vh+UBTcFVdniki29ZxszNLjwr4Z9b ekSpflQ//FY186Ddt4UDR976kVsXge+NdvVye5hTBQyuy6LnY8K3IzR0FiMy/u/iOjsvo60OJE7s5 3CnNdO7A==; Received: from heliosphere.sirena.org.uk ([2a01:7e01::f03c:91ff:fed4:a3b6]) by merlin.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dzht3-0007l4-KY for linux-arm-kernel@lists.infradead.org; Wed, 04 Oct 2017 11:30:50 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=I51Nl4n8AB+XcRmFDSOYzXsdhsttUvT0BEIrUeJCiHE=; b=mAA+3hhh52/Z oo2/TvTJYPzc1hI98en85x2yE22HQUwavy9rbTOVgEXe2PmZJLJ9wCgVE+kZqKzl5DZwDbasoT8gz 7uy75n8Pu8l+iBAGZ0ridVg5BEeCSaTiEb5gJ8KqtEuAIdzm9NeqxuyCksLIwZiI3318hn49aMrvd sjQKU=; Received: from debutante.sirena.org.uk ([2001:470:1f1d:6b5::3] helo=debutante) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1dzhrQ-0006Zt-5D; Wed, 04 Oct 2017 11:29:08 +0000 Received: from broonie by debutante with local (Exim 4.89) (envelope-from ) id 1dzhrP-0004X4-NL; Wed, 04 Oct 2017 12:29:07 +0100 From: Mark Brown To: Chen-Yu Tsai Subject: Applied "regulator: axp20x: Fix poly-phase bit offset for AXP803 DCDC5/6" to the regulator tree In-Reply-To: <20170929032514.31727-2-wens@csie.org> Message-Id: Date: Wed, 04 Oct 2017 12:29:07 +0100 X-Bad-Reply: In-Reply-To but no 'Re:' in Subject. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Quentin Schulz , linux-sunxi@googlegroups.com, Mark Brown , Maxime Ripard , Lee Jones , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The patch regulator: axp20x: Fix poly-phase bit offset for AXP803 DCDC5/6 has been applied to the regulator tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark From 986e7b7e4991a5d3abab26f97a671512e09e4417 Mon Sep 17 00:00:00 2001 From: Chen-Yu Tsai Date: Fri, 29 Sep 2017 11:25:08 +0800 Subject: [PATCH] regulator: axp20x: Fix poly-phase bit offset for AXP803 DCDC5/6 The bit offset used to check if DCDC5 and DCDC6 are tied together in poly-phase output is wrong. It was checking against a reserved bit, which is always false. In reality, neither the reference design layout nor actually produced boards tie these two buck regulators together. But we should still fix it, just in case. Fixes: 1dbe0ccb0631 ("regulator: axp20x-regulator: add support for AXP803") Signed-off-by: Chen-Yu Tsai Tested-by: Maxime Ripard Acked-by: Maxime Ripard Signed-off-by: Mark Brown --- drivers/regulator/axp20x-regulator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/regulator/axp20x-regulator.c b/drivers/regulator/axp20x-regulator.c index f18b36dd57dd..376a99b7cf5d 100644 --- a/drivers/regulator/axp20x-regulator.c +++ b/drivers/regulator/axp20x-regulator.c @@ -590,7 +590,7 @@ static bool axp20x_is_polyphase_slave(struct axp20x_dev *axp20x, int id) case AXP803_DCDC3: return !!(reg & BIT(6)); case AXP803_DCDC6: - return !!(reg & BIT(7)); + return !!(reg & BIT(5)); } break;