From patchwork Mon Apr 24 16:01:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Icenowy Zheng X-Patchwork-Id: 9696753 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 E27C4603F3 for ; Mon, 24 Apr 2017 16:20:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D2A7D28329 for ; Mon, 24 Apr 2017 16:20:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C46B2283F9; Mon, 24 Apr 2017 16:20:24 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham 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 49893283FE for ; Mon, 24 Apr 2017 16:20:24 +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:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=3J1C1ZS/NPd3+3ULZYEYVf6C7qapreGy9lcIW+d/IV4=; b=Q+62fNnEFRCsVqvV473TfzXZEm +M9zCzw6nkk42CAhhl84cutaFcx3AXdcVNGeWLhEPemM9Lrk58Upfj5fIa5CCEAJwd/8n2rEY3Sea GphIEaL789WCP0e3yQRnLZBTqjPV8eRO3LjdzOSfm8aEb29Wu3YTiym5AVucmWMmYTKHVmVZh/MqC eKfO8vS9+SCZtZrvfaWsnCiJktk32foNyv20mGMmm9Fpp5usQFGmsCvTm3Qg8jIjQPmDDlFSLXbDE 64n9JhZ7ZTKcmrH0h5nT2KJA7N3+PNLjGbdEWSlimTIO4h8YWbsbyknAwkeOIde0watZARSzdSjKE jVJD0f+g==; 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 1d2gij-0001RB-KU; Mon, 24 Apr 2017 16:20:13 +0000 Received: from casper.infradead.org ([2001:770:15f::2]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1d2giF-0007vO-TP for linux-arm-kernel@bombadil.infradead.org; Mon, 24 Apr 2017 16:19:44 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=References:In-Reply-To:Message-Id:Date: 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:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=63FPlS/3w46npQSIGkTbSsTlmYI+Doec/zto9UJlYJA=; b=s0K9Qt8WQqMu3Yp994HErcCqP rva7TZq+2W7Zsi8I/S3462OF92nK5YQqm5woQDtmzD7uc+Tg4sByLC+Y5kA7ZjyExwp38QJGB52Ow mzeMUP7XA3PFoA0QiZ+cngnamSRP9QpPiw+UiuztiT9aTkg93k1VaBKvpZtSiYMI4g0yKQWrYRnZX g3buNJDFNaIlYlOgxQ2zRotPOVjC7ahQ8oKmkvZ4M52iH/M8BbJ8yVtm6zAT1i8bPZ9/JFoSB/Lw8 2jty0WqWlVgEIVhRNKJ92BLWBbaCUT5u6EE+hGn6Sd44ob6Wx/7SCq/7UErDel0RmyTCCLeeDombk 1ZaqZ86dQ==; Received: from duck.birch.relay.mailchannels.net ([23.83.209.52]) by casper.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1d2gSk-0006ob-No for linux-arm-kernel@lists.infradead.org; Mon, 24 Apr 2017 16:03:47 +0000 X-Sender-Id: lmn-tzduiowcrqmw|x-authsender|icenowy@aosc.io Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 271C7106409; Mon, 24 Apr 2017 16:03:14 +0000 (UTC) Received: from hermes.aosc.io (unknown [100.96.126.121]) by relay.mailchannels.net (Postfix) with ESMTPA id BE2EC1060B1; Mon, 24 Apr 2017 16:03:12 +0000 (UTC) X-Sender-Id: lmn-tzduiowcrqmw|x-authsender|icenowy@aosc.io Received: from hermes.aosc.io (hermes.aosc.io [172.20.61.168]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384) by 0.0.0.0:2500 (trex/5.9.2); Mon, 24 Apr 2017 16:03:14 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: lmn-tzduiowcrqmw|x-authsender|icenowy@aosc.io X-MailChannels-Auth-Id: lmn-TZDUIOWCRQMW X-Spicy-Minister: 31509bea19953377_1493049793779_2958916587 X-MC-Loop-Signature: 1493049793779:1527268383 X-MC-Ingress-Time: 1493049793778 Received: from localhost (localhost [127.0.0.1]) (Authenticated sender: icenowy@aosc.io) by hermes.aosc.io (Postfix) with ESMTPSA id 7BA2D48BD5; Mon, 24 Apr 2017 16:03:07 +0000 (UTC) From: Icenowy Zheng To: Thomas Gleixner , Rob Herring , Maxime Ripard , Chen-Yu Tsai , Lee Jones , Liam Girdwood Subject: [PATCH v4 07/10] mfd: axp20x: add axp20x-regulator cell for AXP803 Date: Tue, 25 Apr 2017 00:01:00 +0800 Message-Id: <20170424160103.9447-8-icenowy@aosc.io> In-Reply-To: <20170424160103.9447-1-icenowy@aosc.io> References: <20170424160103.9447-1-icenowy@aosc.io> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170424_170343_051403_FC8F4733 X-CRM114-Status: GOOD ( 10.58 ) 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-sunxi@googlegroups.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Icenowy Zheng 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 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 +++--- 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[] = {