Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21503a86 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge tag 'topic/fixed' of... 

Merge tag 'topic/fixed' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into renesas-board-common

Several following board changes depend on this branch.
parents 485802a6 15719ccc

drivers/regulator/fixed-helper.c

+14 −5
Original line number Diff line number Diff line 
#include <linux/slab.h>

#include <linux/string.h>

#include <linux/platform_device.h>

#include <linux/regulator/machine.h>

#include <linux/regulator/fixed.h>
@@ -13,17 +14,20 @@ static void regulator_fixed_release(struct device *dev) 
{

	struct fixed_regulator_data *data = container_of(dev,

			struct fixed_regulator_data, pdev.dev);

	kfree(data->cfg.supply_name);

	kfree(data);

}



/**

 * regulator_register_fixed - register a no-op fixed regulator

 * regulator_register_fixed_name - register a no-op fixed regulator

 * @id: platform device id

 * @name: name to be used for the regulator

 * @supplies: consumers for this regulator

 * @num_supplies: number of consumers

 * @uv: voltage in microvolts

 */

struct platform_device *regulator_register_fixed(int id,

		struct regulator_consumer_supply *supplies, int num_supplies)

struct platform_device *regulator_register_always_on(int id, const char *name,

	struct regulator_consumer_supply *supplies, int num_supplies, int uv)

{

	struct fixed_regulator_data *data;
@@ -31,8 +35,13 @@ struct platform_device *regulator_register_fixed(int id, 
	if (!data)

		return NULL;



	data->cfg.supply_name = "fixed-dummy";

	data->cfg.microvolts = 0;

	data->cfg.supply_name = kstrdup(name, GFP_KERNEL);

	if (!data->cfg.supply_name) {

		kfree(data);

		return NULL;

	}



	data->cfg.microvolts = uv;

	data->cfg.gpio = -EINVAL;

	data->cfg.enabled_at_boot = 1;

	data->cfg.init_data = &data->init_data;

include/linux/regulator/fixed.h

+7 −4
Original line number Diff line number Diff line
@@ -58,14 +58,17 @@ struct fixed_voltage_config { 
struct regulator_consumer_supply;



#if IS_ENABLED(CONFIG_REGULATOR)

struct platform_device *regulator_register_fixed(int id,

		struct regulator_consumer_supply *supplies, int num_supplies);

struct platform_device *regulator_register_always_on(int id, const char *name,

		struct regulator_consumer_supply *supplies, int num_supplies, int uv);

#else

static inline struct platform_device *regulator_register_fixed(int id,

		struct regulator_consumer_supply *supplies, int num_supplies)

static inline struct platform_device *regulator_register_always_on(int id, const char *name,

		struct regulator_consumer_supply *supplies, int num_supplies, int uv)

{

	return NULL;

}

#endif



#define regulator_register_fixed(id, s, ns) regulator_register_always_on(id, \

						"fixed-dummy", s, ns, 0)



#endif