From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1176253AbdDYH5c (ORCPT ); Tue, 25 Apr 2017 03:57:32 -0400 Received: from mail-wm0-f51.google.com ([74.125.82.51]:36214 "EHLO mail-wm0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1176227AbdDYH5V (ORCPT ); Tue, 25 Apr 2017 03:57:21 -0400 Date: Tue, 25 Apr 2017 08:57:17 +0100 From: Lee Jones To: Icenowy Zheng Cc: Thomas Gleixner , Rob Herring , Maxime Ripard , Chen-Yu Tsai , Liam Girdwood , linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@googlegroups.com Subject: Re: [PATCH v4 07/10] mfd: axp20x: add axp20x-regulator cell for AXP803 Message-ID: <20170425075717.l4x3qektdgt6kaiq@dell> References: <20170424160103.9447-1-icenowy@aosc.io> <20170424160103.9447-8-icenowy@aosc.io> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20170424160103.9447-8-icenowy@aosc.io> User-Agent: Mutt/1.6.2-neo (2016-08-21) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 25 Apr 2017, Icenowy Zheng wrote: > As axp20x-regulator now supports AXP803, add a cell for it. > > Signed-off-by: Icenowy Zheng > Acked-by: Chen-Yu Tsai > --- > Changes in v4: > - Added a trailing comma for new cell, for easier further cell addition. > Changes in v3: > - Make the new cell one-liner. > > drivers/mfd/axp20x.c | 3 ++- > drivers/regulator/axp20x-regulator.c | 6 +++--- These 2 changes are orthogonal, thus there is no reason to send them bundled into a single patch. Doing so complicates things greatly. Please resubmit the two changes separately, so that they may be absorbed by our respective subsystems. > 2 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c > index 1dc6235778eb..917b6ddc4f15 100644 > --- a/drivers/mfd/axp20x.c > +++ b/drivers/mfd/axp20x.c > @@ -848,7 +848,8 @@ static struct mfd_cell axp803_cells[] = { > .name = "axp20x-pek", > .num_resources = ARRAY_SIZE(axp803_pek_resources), > .resources = axp803_pek_resources, > - } > + }, > + { .name = "axp20x-regulator" }, > }; > > static struct mfd_cell axp806_cells[] = { > diff --git a/drivers/regulator/axp20x-regulator.c b/drivers/regulator/axp20x-regulator.c > index 9356ec8a9a1f..e2608fe770b9 100644 > --- a/drivers/regulator/axp20x-regulator.c > +++ b/drivers/regulator/axp20x-regulator.c > @@ -311,13 +311,13 @@ static const struct regulator_desc axp803_regulators[] = { > AXP803_FLDO1_V_OUT, 0x0f, AXP22X_PWR_OUT_CTRL3, BIT(2)), > AXP_DESC(AXP803, FLDO2, "fldo2", "fldoin", 700, 1450, 50, > AXP803_FLDO2_V_OUT, 0x0f, AXP22X_PWR_OUT_CTRL3, BIT(3)), > - AXP_DESC_IO(AXP803, LDO_IO0, "ldo_io0", "ips", 700, 3300, 100, > + AXP_DESC_IO(AXP803, LDO_IO0, "ldo-io0", "ips", 700, 3300, 100, > AXP22X_LDO_IO0_V_OUT, 0x1f, AXP20X_GPIO0_CTRL, 0x07, > AXP22X_IO_ENABLED, AXP22X_IO_DISABLED), > - AXP_DESC_IO(AXP803, LDO_IO1, "ldo_io1", "ips", 700, 3300, 100, > + AXP_DESC_IO(AXP803, LDO_IO1, "ldo-io1", "ips", 700, 3300, 100, > AXP22X_LDO_IO1_V_OUT, 0x1f, AXP20X_GPIO1_CTRL, 0x07, > AXP22X_IO_ENABLED, AXP22X_IO_DISABLED), > - AXP_DESC_FIXED(AXP803, RTC_LDO, "rtc_ldo", "ips", 3000), > + AXP_DESC_FIXED(AXP803, RTC_LDO, "rtc-ldo", "ips", 3000), > }; > > static const struct regulator_linear_range axp806_dcdca_ranges[] = { -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog