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

Commit 8533bae3 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'renesas-board-common' into renesas-board 

* renesas-board-common:
  ARM: mach-shmobile: select the fixed regulator driver on several boards
  regulator: extend the fixed dummy voltage regulator to accept voltage
  regulator: support multiple dummy fixed regulators

Conflicts:
	arch/arm/mach-shmobile/Kconfig
parents 9d0db7ab 34767f8d

arch/arm/mach-shmobile/Kconfig

+10 −0
Original line number Original line Diff line number Diff line
@@ -59,6 +59,7 @@ config MACH_G4EVM 
	bool "G4EVM board"

	bool "G4EVM board"

	depends on ARCH_SH7377

	depends on ARCH_SH7377

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_REQUIRE_GPIOLIB

	select REGULATOR_FIXED_VOLTAGE if REGULATOR





config MACH_AP4EVB

config MACH_AP4EVB

	bool "AP4EVB board"

	bool "AP4EVB board"
@@ -66,6 +67,7 @@ config MACH_AP4EVB 
	select ARCH_REQUIRE_GPIOLIB

	select ARCH_REQUIRE_GPIOLIB

	select SH_LCD_MIPI_DSI

	select SH_LCD_MIPI_DSI

	select SND_SOC_AK4642 if SND_SIMPLE_CARD

	select SND_SOC_AK4642 if SND_SIMPLE_CARD

	select REGULATOR_FIXED_VOLTAGE if REGULATOR





choice

choice

	prompt "AP4EVB LCD panel selection"

	prompt "AP4EVB LCD panel selection"
@@ -84,6 +86,7 @@ config MACH_AG5EVM 
	bool "AG5EVM board"

	bool "AG5EVM board"

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_REQUIRE_GPIOLIB

	select SH_LCD_MIPI_DSI

	select SH_LCD_MIPI_DSI

	select REGULATOR_FIXED_VOLTAGE if REGULATOR

	depends on ARCH_SH73A0

	depends on ARCH_SH73A0





config MACH_MACKEREL

config MACH_MACKEREL
@@ -91,15 +94,18 @@ config MACH_MACKEREL 
	depends on ARCH_SH7372

	depends on ARCH_SH7372

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_REQUIRE_GPIOLIB

	select SND_SOC_AK4642 if SND_SIMPLE_CARD

	select SND_SOC_AK4642 if SND_SIMPLE_CARD

	select REGULATOR_FIXED_VOLTAGE if REGULATOR





config MACH_KOTA2

config MACH_KOTA2

	bool "KOTA2 board"

	bool "KOTA2 board"

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_REQUIRE_GPIOLIB

	select REGULATOR_FIXED_VOLTAGE if REGULATOR

	depends on ARCH_SH73A0

	depends on ARCH_SH73A0





config MACH_BONITO

config MACH_BONITO

	bool "bonito board"

	bool "bonito board"

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_REQUIRE_GPIOLIB

	select REGULATOR_FIXED_VOLTAGE if REGULATOR

	depends on ARCH_R8A7740

	depends on ARCH_R8A7740





config MACH_ARMADILLO800EVA

config MACH_ARMADILLO800EVA
@@ -107,16 +113,19 @@ config MACH_ARMADILLO800EVA 
	depends on ARCH_R8A7740

	depends on ARCH_R8A7740

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_REQUIRE_GPIOLIB

	select USE_OF

	select USE_OF

	select REGULATOR_FIXED_VOLTAGE if REGULATOR





config MACH_MARZEN

config MACH_MARZEN

	bool "MARZEN board"

	bool "MARZEN board"

	depends on ARCH_R8A7779

	depends on ARCH_R8A7779

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_REQUIRE_GPIOLIB

	select REGULATOR_FIXED_VOLTAGE if REGULATOR





config MACH_KZM9D

config MACH_KZM9D

	bool "KZM9D board"

	bool "KZM9D board"

	depends on ARCH_EMEV2

	depends on ARCH_EMEV2

	select USE_OF

	select USE_OF

	select REGULATOR_FIXED_VOLTAGE if REGULATOR





config MACH_KZM9G

config MACH_KZM9G

	bool "KZM-A9-GT board"

	bool "KZM-A9-GT board"
@@ -124,6 +133,7 @@ config MACH_KZM9G 
	select ARCH_REQUIRE_GPIOLIB

	select ARCH_REQUIRE_GPIOLIB

	select USE_OF

	select USE_OF

	select SND_SOC_AK4642 if SND_SIMPLE_CARD

	select SND_SOC_AK4642 if SND_SIMPLE_CARD

	select REGULATOR_FIXED_VOLTAGE if REGULATOR





comment "SH-Mobile System Configuration"

comment "SH-Mobile System Configuration"

drivers/regulator/fixed-helper.c

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

#include <linux/slab.h>

#include <linux/string.h>

#include <linux/platform_device.h>

#include <linux/platform_device.h>

#include <linux/regulator/machine.h>

#include <linux/regulator/machine.h>

#include <linux/regulator/fixed.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 *data = container_of(dev,

			struct fixed_regulator_data, pdev.dev);

			struct fixed_regulator_data, pdev.dev);

	kfree(data->cfg.supply_name);

	kfree(data);

	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

 * @id: platform device id

 * @name: name to be used for the regulator

 * @supplies: consumers for this regulator

 * @supplies: consumers for this regulator

 * @num_supplies: number of consumers

 * @num_supplies: number of consumers

 * @uv: voltage in microvolts

 */

 */

struct platform_device *regulator_register_fixed(int id,

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

		struct regulator_consumer_supply *supplies, int num_supplies)

	struct regulator_consumer_supply *supplies, int num_supplies, int uv)

{

{

	struct fixed_regulator_data *data;

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

	if (!data)

		return NULL;

		return NULL;





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

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

	data->cfg.microvolts = 0;

	if (!data->cfg.supply_name) {

		kfree(data);

		return NULL;

	}



	data->cfg.microvolts = uv;

	data->cfg.gpio = -EINVAL;

	data->cfg.gpio = -EINVAL;

	data->cfg.enabled_at_boot = 1;

	data->cfg.enabled_at_boot = 1;

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

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

include/linux/regulator/fixed.h

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

struct regulator_consumer_supply;





#if IS_ENABLED(CONFIG_REGULATOR)

#if IS_ENABLED(CONFIG_REGULATOR)

struct platform_device *regulator_register_fixed(int id,

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

		struct regulator_consumer_supply *supplies, int num_supplies);

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

#else

#else

static inline struct platform_device *regulator_register_fixed(int id,

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

		struct regulator_consumer_supply *supplies, int num_supplies)

		struct regulator_consumer_supply *supplies, int num_supplies, int uv)

{

{

	return NULL;

	return NULL;

}

}

#endif

#endif





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

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



#endif
 
#endif