From patchwork Wed Dec 11 14:07:43 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 3326941 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 52EFD9F1F0 for ; Wed, 11 Dec 2013 14:58:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 35F89207BE for ; Wed, 11 Dec 2013 14:58:09 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B0C82207B8 for ; Wed, 11 Dec 2013 14:58:00 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VqkSz-0006AI-AI; Wed, 11 Dec 2013 14:08:45 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VqkSp-0005L7-UC; Wed, 11 Dec 2013 14:08:35 +0000 Received: from mailout1.w1.samsung.com ([210.118.77.11]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VqkSm-0005Jw-Bt for linux-arm-kernel@lists.infradead.org; Wed, 11 Dec 2013 14:08:33 +0000 Received: from eucpsbgm2.samsung.com (unknown [203.254.199.245]) by mailout1.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MXN0019GB9I9X80@mailout1.w1.samsung.com> for linux-arm-kernel@lists.infradead.org; Wed, 11 Dec 2013 14:08:07 +0000 (GMT) X-AuditID: cbfec7f5-b7fd16d000007299-f2-52a871c69e28 Received: from eusync4.samsung.com ( [203.254.199.214]) by eucpsbgm2.samsung.com (EUCPMTA) with SMTP id 4E.3D.29337.6C178A25; Wed, 11 Dec 2013 14:08:06 +0000 (GMT) Received: from AMDC1943.digital.local ([106.116.151.171]) by eusync4.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MXN004YLB9FMVA0@eusync4.samsung.com>; Wed, 11 Dec 2013 14:08:06 +0000 (GMT) From: Krzysztof Kozlowski To: Mike Turquette , Sangbeom Kim , Liam Girdwood , Mark Brown , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Johannes Weiner , Andrew Morton Subject: [PATCH] mfd: s2mps11: Fix build after regmap field rename in sec-core.c Date: Wed, 11 Dec 2013 15:07:43 +0100 Message-id: <1386770863-32247-1-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 1.7.9.5 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrHJMWRmVeSWpSXmKPExsVy+t/xa7rHClcEGTTOM7OYs34Nm8XUh0/Y LFZv8rV4/cLQ4mzTG3aLb1c6mCw2Pb7GanF51xw2i7VH7rJbPJ1wkc3i4oovTA7cHoffvGf2 2DnrLrvHplWdbB53ru1h8zgx4zeLx+Yl9R59W1YxenzeJBfAEcVlk5Kak1mWWqRvl8CV8eNr J2PBK4GK718uMjYwdvJ1MXJySAiYSNzoXcQCYYtJXLi3nq2LkYtDSGApo8Stvi8sEE4fk8Tr O//AqtgEjCU2L18CViUisJ5J4vm6tcwgDrNAL6PEg3e/GEGqhAUCJBbP2sIOYrMIqEps2vgQ qJuDg1fAXWLGhVIQU0JAQWLOJJsJjNwLGBlWMYqmliYXFCel5xrpFSfmFpfmpesl5+duYoSE 2dcdjEuPWR1iFOBgVOLhPVC0PEiINbGsuDL3EKMEB7OSCO8nzxVBQrwpiZVVqUX58UWlOanF hxiZODilGhizpFsyNvtvdfOa/n2tctIVUdd7i+uFe7bIPNxhZTVFY31v9b9DD1l2ree/t2J9 1sLTTSpGLOcvPKyVetHMMYn5wo/Kl+rX1LX53k09tTCETfr9kqTd1/ryLO43npmT0BB54Nav mycO/w5snvf2szKns1VTI7OSGLvfE602LjG/r6Jvf/gYqC1RYinOSDTUYi4qTgQA2nGtDBEC AAA= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131211_090832_480828_824D6EC1 X-CRM114-Status: UNSURE ( 9.32 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -7.1 (-------) Cc: Krzysztof Kozlowski , Kyungmin Park , Marek Szyprowski X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Fix building of s2mps11 regulator and clock drivers after renaming regmap field in struct sec_pmic_dev in commit: - "mfd/rtc: s5m: Fix register updating by adding regmap for RTC" Signed-off-by: Krzysztof Kozlowski Cc: Kyungmin Park Cc: Marek Szyprowski --- drivers/clk/clk-s2mps11.c | 6 +++--- drivers/regulator/s2mps11.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/clk/clk-s2mps11.c b/drivers/clk/clk-s2mps11.c index 7be41e676a64..00a3abe103a5 100644 --- a/drivers/clk/clk-s2mps11.c +++ b/drivers/clk/clk-s2mps11.c @@ -60,7 +60,7 @@ static int s2mps11_clk_prepare(struct clk_hw *hw) struct s2mps11_clk *s2mps11 = to_s2mps11_clk(hw); int ret; - ret = regmap_update_bits(s2mps11->iodev->regmap, + ret = regmap_update_bits(s2mps11->iodev->regmap_pmic, S2MPS11_REG_RTC_CTRL, s2mps11->mask, s2mps11->mask); if (!ret) @@ -74,7 +74,7 @@ static void s2mps11_clk_unprepare(struct clk_hw *hw) struct s2mps11_clk *s2mps11 = to_s2mps11_clk(hw); int ret; - ret = regmap_update_bits(s2mps11->iodev->regmap, S2MPS11_REG_RTC_CTRL, + ret = regmap_update_bits(s2mps11->iodev->regmap_pmic, S2MPS11_REG_RTC_CTRL, s2mps11->mask, ~s2mps11->mask); if (!ret) @@ -174,7 +174,7 @@ static int s2mps11_clk_probe(struct platform_device *pdev) s2mps11_clk->hw.init = &s2mps11_clks_init[i]; s2mps11_clk->mask = 1 << i; - ret = regmap_read(s2mps11_clk->iodev->regmap, + ret = regmap_read(s2mps11_clk->iodev->regmap_pmic, S2MPS11_REG_RTC_CTRL, &val); if (ret < 0) goto err_reg; diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c index 333677d68d0e..9e61922d8230 100644 --- a/drivers/regulator/s2mps11.c +++ b/drivers/regulator/s2mps11.c @@ -438,7 +438,7 @@ common_reg: platform_set_drvdata(pdev, s2mps11); config.dev = &pdev->dev; - config.regmap = iodev->regmap; + config.regmap = iodev->regmap_pmic; config.driver_data = s2mps11; for (i = 0; i < S2MPS11_REGULATOR_MAX; i++) { if (!reg_np) {