From 1076fe28af4fb6cdd93a2b82247b36ce26180150 Mon Sep 17 00:00:00 2001
From: "Martin T. H. Sandsmark" <martin.sandsmark@remarkable.no>
Date: Thu, 20 Dec 2018 17:31:46 +0100
Subject: [PATCH] make build work thing

---
 drivers/mfd/tps6518x-core.c            | 12 ------------
 drivers/regulator/tps6518x-regulator.c | 10 +++++-----
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/drivers/mfd/tps6518x-core.c b/drivers/mfd/tps6518x-core.c
index 30d7f322441c..b1c0ddf80ed8 100644
--- a/drivers/mfd/tps6518x-core.c
+++ b/drivers/mfd/tps6518x-core.c
@@ -194,16 +194,6 @@ static int tps6518x_remove(struct i2c_client *i2c)
 	return 0;
 }
 
-static int tps6518x_suspend(struct i2c_client *client, pm_message_t state)
-{
-	return 0;
-}
-
-static int tps6518x_resume(struct i2c_client *client)
-{
-	return 0;
-}
-
 /* Return 0 if detection is successful, -ENODEV otherwise */
 static int tps6518x_detect(struct i2c_client *client,
 			  struct i2c_board_info *info)
@@ -275,8 +265,6 @@ static struct i2c_driver tps6518x_driver = {
 	},
 	.probe = tps6518x_probe,
 	.remove = tps6518x_remove,
-	.suspend = tps6518x_suspend,
-	.resume = tps6518x_resume,
 	.id_table = tps6518x_id,
 	.detect = tps6518x_detect,
 	.address_list = &normal_i2c[0],
diff --git a/drivers/regulator/tps6518x-regulator.c b/drivers/regulator/tps6518x-regulator.c
index 5f0c79132ecc..59b81329e8f5 100644
--- a/drivers/regulator/tps6518x-regulator.c
+++ b/drivers/regulator/tps6518x-regulator.c
@@ -553,7 +553,7 @@ static int tps6518x_pmic_dt_parse_pdata(struct platform_device *pdev,
 
 		rdata->id = i;
 		rdata->initdata = of_get_regulator_init_data(&pdev->dev,
-							     reg_np);
+							     reg_np, &tps6518x_reg[i]);
 		rdata->reg_node = reg_np;
 		rdata++;
 	}
@@ -751,7 +751,7 @@ static int __init tps6518x_setup(char *options)
 		if (!*opt)
 			continue;
 		if (!strncmp(opt, "pass=", 5)) {
-			ret = strict_strtoul((const char *)(opt + 5), 0, &ulResult);
+			ret = kstrtoul((const char *)(opt + 5), 0, &ulResult);
 			tps6518x_pass_num = ulResult;
 			if (ret < 0)
 				return ret;
@@ -760,7 +760,7 @@ static int __init tps6518x_setup(char *options)
 			int offs = 5;
 			if (opt[5] == '-')
 				offs = 6;
-			ret = strict_strtoul((const char *)(opt + offs), 0, &ulResult);
+			ret = kstrtoul((const char *)(opt + offs), 0, &ulResult);
 			tps6518x_vcom = (int) ulResult;
 			if (ret < 0)
 				return ret;
@@ -782,7 +782,7 @@ static int __init tps65182_setup(char *options)
 		if (!*opt)
 			continue;
 		if (!strncmp(opt, "pass=", 5)) {
-			ret = strict_strtoul((const char *)(opt + 5), 0, &ulResult);
+			ret = kstrtoul((const char *)(opt + 5), 0, &ulResult);
 			tps6518x_pass_num = ulResult;
 			if (ret < 0)
 				return ret;
@@ -791,7 +791,7 @@ static int __init tps65182_setup(char *options)
 			int offs = 5;
 			if (opt[5] == '-')
 				offs = 6;
-			ret = strict_strtoul((const char *)(opt + offs), 0, &ulResult);
+			ret = kstrtoul((const char *)(opt + offs), 0, &ulResult);
 			tps6518x_vcom = (int) ulResult;
 			if (ret < 0)
 				return ret;