From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 27 Nov 2012 20:06:08 +0000 (+0000)
Subject: Merge branch 'topic/hotplug' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Tag: v3.8-rc1~129^2~14^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b87d07b13c779c42e4929e590003c9eb8c2f06fa;p=profile%2Fivi%2Fkernel-x86-ivi.git

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

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

b87d07b13c779c42e4929e590003c9eb8c2f06fa
diff --cc drivers/regulator/max8997.c
index b56c432,cea9ec9..df0eafb
--- a/drivers/regulator/max8997.c
+++ b/drivers/regulator/max8997.c
@@@ -935,145 -933,10 +935,145 @@@ static struct regulator_desc regulators
  				  max8997_charger_fixedstate_ops),
  };
  
 +#ifdef CONFIG_OF
 +static int max8997_pmic_dt_parse_dvs_gpio(struct max8997_dev *iodev,
 +			struct max8997_platform_data *pdata,
 +			struct device_node *pmic_np)
 +{
 +	int i, gpio;
 +
 +	for (i = 0; i < 3; i++) {
 +		gpio = of_get_named_gpio(pmic_np,
 +					"max8997,pmic-buck125-dvs-gpios", i);
 +		if (!gpio_is_valid(gpio)) {
 +			dev_err(iodev->dev, "invalid gpio[%d]: %d\n", i, gpio);
 +			return -EINVAL;
 +		}
 +		pdata->buck125_gpios[i] = gpio;
 +	}
 +	return 0;
 +}
 +
 +static int max8997_pmic_dt_parse_pdata(struct max8997_dev *iodev,
 +					struct max8997_platform_data *pdata)
 +{
 +	struct device_node *pmic_np, *regulators_np, *reg_np;
 +	struct max8997_regulator_data *rdata;
 +	unsigned int i, dvs_voltage_nr = 1, ret;
 +
 +	pmic_np = iodev->dev->of_node;
 +	if (!pmic_np) {
 +		dev_err(iodev->dev, "could not find pmic sub-node\n");
 +		return -ENODEV;
 +	}
 +
 +	regulators_np = of_find_node_by_name(pmic_np, "regulators");
 +	if (!regulators_np) {
 +		dev_err(iodev->dev, "could not find regulators sub-node\n");
 +		return -EINVAL;
 +	}
 +
 +	/* count the number of regulators to be supported in pmic */
 +	pdata->num_regulators = 0;
 +	for_each_child_of_node(regulators_np, reg_np)
 +		pdata->num_regulators++;
 +
 +	rdata = devm_kzalloc(iodev->dev, sizeof(*rdata) *
 +				pdata->num_regulators, GFP_KERNEL);
 +	if (!rdata) {
 +		dev_err(iodev->dev, "could not allocate memory for "
 +						"regulator data\n");
 +		return -ENOMEM;
 +	}
 +
 +	pdata->regulators = rdata;
 +	for_each_child_of_node(regulators_np, reg_np) {
 +		for (i = 0; i < ARRAY_SIZE(regulators); i++)
 +			if (!of_node_cmp(reg_np->name, regulators[i].name))
 +				break;
 +
 +		if (i == ARRAY_SIZE(regulators)) {
 +			dev_warn(iodev->dev, "don't know how to configure "
 +				"regulator %s\n", reg_np->name);
 +			continue;
 +		}
 +
 +		rdata->id = i;
 +		rdata->initdata = of_get_regulator_init_data(
 +						iodev->dev, reg_np);
 +		rdata->reg_node = reg_np;
 +		rdata++;
 +	}
 +
 +	if (of_get_property(pmic_np, "max8997,pmic-buck1-uses-gpio-dvs", NULL))
 +		pdata->buck1_gpiodvs = true;
 +
 +	if (of_get_property(pmic_np, "max8997,pmic-buck2-uses-gpio-dvs", NULL))
 +		pdata->buck2_gpiodvs = true;
 +
 +	if (of_get_property(pmic_np, "max8997,pmic-buck5-uses-gpio-dvs", NULL))
 +		pdata->buck5_gpiodvs = true;
 +
 +	if (pdata->buck1_gpiodvs || pdata->buck2_gpiodvs ||
 +						pdata->buck5_gpiodvs) {
 +		ret = max8997_pmic_dt_parse_dvs_gpio(iodev, pdata, pmic_np);
 +		if (ret)
 +			return -EINVAL;
 +
 +		if (of_property_read_u32(pmic_np,
 +				"max8997,pmic-buck125-default-dvs-idx",
 +				&pdata->buck125_default_idx)) {
 +			pdata->buck125_default_idx = 0;
 +		} else {
 +			if (pdata->buck125_default_idx >= 8) {
 +				pdata->buck125_default_idx = 0;
 +				dev_info(iodev->dev, "invalid value for "
 +				"default dvs index, using 0 instead\n");
 +			}
 +		}
 +
 +		if (of_get_property(pmic_np,
 +			"max8997,pmic-ignore-gpiodvs-side-effect", NULL))
 +			pdata->ignore_gpiodvs_side_effect = true;
 +
 +		dvs_voltage_nr = 8;
 +	}
 +
 +	if (of_property_read_u32_array(pmic_np,
 +				"max8997,pmic-buck1-dvs-voltage",
 +				pdata->buck1_voltage, dvs_voltage_nr)) {
 +		dev_err(iodev->dev, "buck1 voltages not specified\n");
 +		return -EINVAL;
 +	}
 +
 +	if (of_property_read_u32_array(pmic_np,
 +				"max8997,pmic-buck2-dvs-voltage",
 +				pdata->buck2_voltage, dvs_voltage_nr)) {
 +		dev_err(iodev->dev, "buck2 voltages not specified\n");
 +		return -EINVAL;
 +	}
 +
 +	if (of_property_read_u32_array(pmic_np,
 +				"max8997,pmic-buck5-dvs-voltage",
 +				pdata->buck5_voltage, dvs_voltage_nr)) {
 +		dev_err(iodev->dev, "buck5 voltages not specified\n");
 +		return -EINVAL;
 +	}
 +
 +	return 0;
 +}
 +#else
 +static int max8997_pmic_dt_parse_pdata(struct max8997_dev *iodev,
 +					struct max8997_platform_data *pdata)
 +{
 +	return 0;
 +}
 +#endif /* CONFIG_OF */
 +
- static __devinit int max8997_pmic_probe(struct platform_device *pdev)
+ static int max8997_pmic_probe(struct platform_device *pdev)
  {
  	struct max8997_dev *iodev = dev_get_drvdata(pdev->dev.parent);
 -	struct max8997_platform_data *pdata = dev_get_platdata(iodev->dev);
 +	struct max8997_platform_data *pdata = iodev->pdata;
  	struct regulator_config config = { };
  	struct regulator_dev **rdev;
  	struct max8997_data *max8997;