From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 20 Nov 2012 01:39:55 +0000 (+0900)
Subject: Merge branch 'topic/tps6586x' of git://git.kernel.org/pub/scm/linux/kernel/git/brooni... 
X-Git-Tag: v5.15~21088^2~20^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ce6dd5da9dfcf9232df09d8d486cd6ed25e29cdc;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'topic/tps6586x' of git://git./linux/kernel/git/broonie/regulator into regulator-hotplug

Conflicts:
	drivers/regulator/tps6586x-regulator.c
---

ce6dd5da9dfcf9232df09d8d486cd6ed25e29cdc
diff --cc drivers/regulator/tps6586x-regulator.c
index b91400c,913c903..7206f4e
--- a/drivers/regulator/tps6586x-regulator.c
+++ b/drivers/regulator/tps6586x-regulator.c
@@@ -298,7 -300,85 +300,85 @@@ static inline struct tps6586x_regulato
  	return NULL;
  }
  
+ #ifdef CONFIG_OF
+ static struct of_regulator_match tps6586x_matches[] = {
+ 	{ .name = "sys",     .driver_data = (void *)TPS6586X_ID_SYS     },
+ 	{ .name = "sm0",     .driver_data = (void *)TPS6586X_ID_SM_0    },
+ 	{ .name = "sm1",     .driver_data = (void *)TPS6586X_ID_SM_1    },
+ 	{ .name = "sm2",     .driver_data = (void *)TPS6586X_ID_SM_2    },
+ 	{ .name = "ldo0",    .driver_data = (void *)TPS6586X_ID_LDO_0   },
+ 	{ .name = "ldo1",    .driver_data = (void *)TPS6586X_ID_LDO_1   },
+ 	{ .name = "ldo2",    .driver_data = (void *)TPS6586X_ID_LDO_2   },
+ 	{ .name = "ldo3",    .driver_data = (void *)TPS6586X_ID_LDO_3   },
+ 	{ .name = "ldo4",    .driver_data = (void *)TPS6586X_ID_LDO_4   },
+ 	{ .name = "ldo5",    .driver_data = (void *)TPS6586X_ID_LDO_5   },
+ 	{ .name = "ldo6",    .driver_data = (void *)TPS6586X_ID_LDO_6   },
+ 	{ .name = "ldo7",    .driver_data = (void *)TPS6586X_ID_LDO_7   },
+ 	{ .name = "ldo8",    .driver_data = (void *)TPS6586X_ID_LDO_8   },
+ 	{ .name = "ldo9",    .driver_data = (void *)TPS6586X_ID_LDO_9   },
+ 	{ .name = "ldo_rtc", .driver_data = (void *)TPS6586X_ID_LDO_RTC },
+ };
+ 
+ static struct tps6586x_platform_data *tps6586x_parse_regulator_dt(
+ 		struct platform_device *pdev,
+ 		struct of_regulator_match **tps6586x_reg_matches)
+ {
+ 	const unsigned int num = ARRAY_SIZE(tps6586x_matches);
+ 	struct device_node *np = pdev->dev.parent->of_node;
+ 	struct device_node *regs;
+ 	const char *sys_rail = NULL;
+ 	unsigned int i;
+ 	struct tps6586x_platform_data *pdata;
+ 	int err;
+ 
+ 	regs = of_find_node_by_name(np, "regulators");
+ 	if (!regs) {
+ 		dev_err(&pdev->dev, "regulator node not found\n");
+ 		return NULL;
+ 	}
+ 
+ 	err = of_regulator_match(&pdev->dev, regs, tps6586x_matches, num);
+ 	if (err < 0) {
+ 		dev_err(&pdev->dev, "Regulator match failed, e %d\n", err);
+ 		of_node_put(regs);
+ 		return NULL;
+ 	}
+ 
+ 	of_node_put(regs);
+ 
+ 	pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
+ 	if (!pdata) {
+ 		dev_err(&pdev->dev, "Memory alloction failed\n");
+ 		return NULL;
+ 	}
+ 
+ 	for (i = 0; i < num; i++) {
+ 		int id;
+ 		if (!tps6586x_matches[i].init_data)
+ 			continue;
+ 
+ 		pdata->reg_init_data[i] = tps6586x_matches[i].init_data;
+ 		id = (int)tps6586x_matches[i].driver_data;
+ 		if (id == TPS6586X_ID_SYS)
+ 			sys_rail = pdata->reg_init_data[i]->constraints.name;
+ 
+ 		if ((id == TPS6586X_ID_LDO_5) || (id == TPS6586X_ID_LDO_RTC))
+ 			pdata->reg_init_data[i]->supply_regulator = sys_rail;
+ 	}
+ 	*tps6586x_reg_matches = tps6586x_matches;
+ 	return pdata;
+ }
+ #else
+ static struct tps6586x_platform_data *tps6586x_parse_regulator_dt(
+ 		struct platform_device *pdev,
+ 		struct of_regulator_match **tps6586x_reg_matches)
+ {
+ 	*tps6586x_reg_matches = NULL;
+ 	return NULL;
+ }
+ #endif
+ 
 -static int __devinit tps6586x_regulator_probe(struct platform_device *pdev)
 +static int tps6586x_regulator_probe(struct platform_device *pdev)
  {
  	struct tps6586x_regulator *ri = NULL;
  	struct regulator_config config = { };