Merge remote-tracking branches 'regulator/topic/doc',... (794016f9) · Commits · e / devices / android_kernel_oneplus_sm8150

Documentation/devicetree/bindings/regulator/gpio-regulator.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -8,8 +8,12 @@ Required properties:
		Optional properties:
		- enable-gpio : GPIO to use to enable/disable the regulator.
		- gpios : GPIO group used to control voltage.
		- gpios-states : gpios pin's initial states array. 0: LOW, 1: HIGH.
		defualt is LOW if nothing is specified.
		- startup-delay-us : Startup time in microseconds.
		- enable-active-high : Polarity of GPIO is active high (default is low).
		- regulator-type : Specifies what is being regulated, must be either
		"voltage" or "current", defaults to current.

		Any property defined as part of the core regulator binding defined in
		regulator.txt can also be used.

drivers/base/devres.c

+26 −0

Original line number	Diff line number	Diff line
		@@ -790,6 +790,32 @@ void * devm_kmalloc(struct device *dev, size_t size, gfp_t gfp)
		}
		EXPORT_SYMBOL_GPL(devm_kmalloc);

		/**
		* devm_kstrdup - Allocate resource managed space and
		* copy an existing string into that.
		* @dev: Device to allocate memory for
		* @s: the string to duplicate
		* @gfp: the GFP mask used in the devm_kmalloc() call when
		* allocating memory
		* RETURNS:
		* Pointer to allocated string on success, NULL on failure.
		*/
		char devm_kstrdup(struct device dev, const char *s, gfp_t gfp)
		{
		size_t size;
		char *buf;

		if (!s)
		return NULL;

		size = strlen(s) + 1;
		buf = devm_kmalloc(dev, size, gfp);
		if (buf)
		memcpy(buf, s, size);
		return buf;
		}
		EXPORT_SYMBOL_GPL(devm_kstrdup);

		/**
		* devm_kfree - Resource-managed kfree
		* @dev: Device this memory belongs to

drivers/of/base.c

+32 −0

Original line number	Diff line number	Diff line
		@@ -903,6 +903,38 @@ struct device_node *of_find_node_by_phandle(phandle handle)
		}
		EXPORT_SYMBOL(of_find_node_by_phandle);

		/**
		* of_property_count_elems_of_size - Count the number of elements in a property
		*
		* @np: device node from which the property value is to be read.
		* @propname: name of the property to be searched.
		* @elem_size: size of the individual element
		*
		* Search for a property in a device node and count the number of elements of
		* size elem_size in it. Returns number of elements on sucess, -EINVAL if the
		* property does not exist or its length does not match a multiple of elem_size
		* and -ENODATA if the property does not have a value.
		*/
		int of_property_count_elems_of_size(const struct device_node *np,
		const char *propname, int elem_size)
		{
		struct property *prop = of_find_property(np, propname, NULL);

		if (!prop)
		return -EINVAL;
		if (!prop->value)
		return -ENODATA;

		if (prop->length % elem_size != 0) {
		pr_err("size of %s in node %s is not a multiple of %d\n",
		propname, np->full_name, elem_size);
		return -EINVAL;
		}

		return prop->length / elem_size;
		}
		EXPORT_SYMBOL_GPL(of_property_count_elems_of_size);

		/**
		* of_find_property_value_of_size
		*

drivers/regulator/fan53555.c

+6 −7

Original line number	Diff line number	Diff line
		@@ -90,11 +90,11 @@ static int fan53555_set_suspend_voltage(struct regulator_dev *rdev, int uV)
		return 0;
		ret = regulator_map_voltage_linear(rdev, uV, uV);
		if (ret < 0)
		return -EINVAL;
		return ret;
		ret = regmap_update_bits(di->regmap, di->sleep_reg,
		VSEL_NSEL_MASK, ret);
		if (ret < 0)
		return -EINVAL;
		return ret;
		/* Cache the sleep voltage setting.
		* Might not be the real voltage which is rounded */
		di->sleep_vol_cache = uV;
		@@ -244,10 +244,9 @@ static int fan53555_regulator_probe(struct i2c_client *client,

		di = devm_kzalloc(&client->dev, sizeof(struct fan53555_device_info),
		GFP_KERNEL);
		if (!di) {
		dev_err(&client->dev, "Failed to allocate device info data!\n");
		if (!di)
		return -ENOMEM;
		}

		di->regmap = devm_regmap_init_i2c(client, &fan53555_regmap_config);
		if (IS_ERR(di->regmap)) {
		dev_err(&client->dev, "Failed to allocate regmap!\n");
		@@ -260,14 +259,14 @@ static int fan53555_regulator_probe(struct i2c_client *client,
		ret = regmap_read(di->regmap, FAN53555_ID1, &val);
		if (ret < 0) {
		dev_err(&client->dev, "Failed to get chip ID!\n");
		return -ENODEV;
		return ret;
		}
		di->chip_id = val & DIE_ID;
		/* Get chip revision */
		ret = regmap_read(di->regmap, FAN53555_ID2, &val);
		if (ret < 0) {
		dev_err(&client->dev, "Failed to get chip Rev!\n");
		return -ENODEV;
		return ret;
		}
		di->chip_rev = val & DIE_REV;
		dev_info(&client->dev, "FAN53555 Option[%d] Rev[%d] Detected!\n",

drivers/regulator/fixed.c

+13 −33

Original line number	Diff line number	Diff line
		@@ -130,17 +130,15 @@ static int reg_fixed_voltage_probe(struct platform_device *pdev)

		drvdata = devm_kzalloc(&pdev->dev, sizeof(struct fixed_voltage_data),
		GFP_KERNEL);
		if (drvdata == NULL) {
		dev_err(&pdev->dev, "Failed to allocate device data\n");
		ret = -ENOMEM;
		goto err;
		}
		if (!drvdata)
		return -ENOMEM;

		drvdata->desc.name = kstrdup(config->supply_name, GFP_KERNEL);
		drvdata->desc.name = devm_kstrdup(&pdev->dev,
		config->supply_name,
		GFP_KERNEL);
		if (drvdata->desc.name == NULL) {
		dev_err(&pdev->dev, "Failed to allocate supply name\n");
		ret = -ENOMEM;
		goto err;
		return -ENOMEM;
		}
		drvdata->desc.type = REGULATOR_VOLTAGE;
		drvdata->desc.owner = THIS_MODULE;
		@@ -149,13 +147,13 @@ static int reg_fixed_voltage_probe(struct platform_device *pdev)
		drvdata->desc.enable_time = config->startup_delay;

		if (config->input_supply) {
		drvdata->desc.supply_name = kstrdup(config->input_supply,
		drvdata->desc.supply_name = devm_kstrdup(&pdev->dev,
		config->input_supply,
		GFP_KERNEL);
		if (!drvdata->desc.supply_name) {
		dev_err(&pdev->dev,
		"Failed to allocate input supply\n");
		ret = -ENOMEM;
		goto err_name;
		return -ENOMEM;
		}
		}

		@@ -186,11 +184,12 @@ static int reg_fixed_voltage_probe(struct platform_device *pdev)
		cfg.driver_data = drvdata;
		cfg.of_node = pdev->dev.of_node;

		drvdata->dev = regulator_register(&drvdata->desc, &cfg);
		drvdata->dev = devm_regulator_register(&pdev->dev, &drvdata->desc,
		&cfg);
		if (IS_ERR(drvdata->dev)) {
		ret = PTR_ERR(drvdata->dev);
		dev_err(&pdev->dev, "Failed to register regulator: %d\n", ret);
		goto err_input;
		return ret;
		}

		platform_set_drvdata(pdev, drvdata);
		@@ -199,24 +198,6 @@ static int reg_fixed_voltage_probe(struct platform_device *pdev)
		drvdata->desc.fixed_uV);

		return 0;

		err_input:
		kfree(drvdata->desc.supply_name);
		err_name:
		kfree(drvdata->desc.name);
		err:
		return ret;
		}

		static int reg_fixed_voltage_remove(struct platform_device *pdev)
		{
		struct fixed_voltage_data *drvdata = platform_get_drvdata(pdev);

		regulator_unregister(drvdata->dev);
		kfree(drvdata->desc.supply_name);
		kfree(drvdata->desc.name);

		return 0;
		}

		#if defined(CONFIG_OF)
		@@ -229,7 +210,6 @@ MODULE_DEVICE_TABLE(of, fixed_of_match);

		static struct platform_driver regulator_fixed_voltage_driver = {
		.probe = reg_fixed_voltage_probe,
		.remove = reg_fixed_voltage_remove,
		.driver = {
		.name = "reg-fixed-voltage",
		.owner = THIS_MODULE,