[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAJuevmANPg28tBovqT7PFBHorjVeh0SiBEkcmfocJMwy8NX5fg@mail.gmail.com>
Date: Sun, 15 Dec 2013 21:37:19 -0800
From: Stephen Engelman <stephen.engelman@...il.com>
To: linux-kernel@...r.kernel.org
Cc: Krzysztof Kozlowski <k.kozlowski@...sung.com>,
Sangbeom Kim <sbkim73@...sung.com>,
Kyungmin Park <kyungmin.park@...sung.com>,
Liam Girdwood <lgirdwood@...il.com>,
Mark Brown <broonie@...nel.org>,
Linus Torvalds <torvalds@...ux-foundation.org>
Subject: [PATCH] REGULATOR: s2mps11: fix regmap, renamed to regmap_pmic
Change regmap to regmap_pmic. This is needed for commit
3e1e4a5f3a324502c27c4e8808e06ac2ea842360 ("mfd/rtc: s5m: fix register
updating by adding regmap for RTC") to rename regmap to regmap_pmic in
include/linux/mfd/samsung/core.h.
Signed-off-by: Stephen Engelman <stephen.engelman@...il.com>
Cc: Krzysztof Kozlowski <k.kozlowski@...sung.com>
Cc: Sangbeom Kim <sbkim73@...sung.com>
Cc: Kyungmin Park <kyungmin.park@...sung.com>
Cc: Mark Brown <broonie@...nel.org>
---
drivers/regulator/s2mps11.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c
index 333677d..9e61922 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) {
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists