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

Commit 1b04cbea authored by Sonic Zhang's avatar Sonic Zhang Committed by Mike Frysinger
Browse files

Blackfin: bf537-stamp: re-use the fixed regulator voltage driver 



Rather than write our own ADP switch driver, use the existing fixed
regulator driver and rewrite the platform resources accordingly.

Signed-off-by: default avatarSonic Zhang <sonic.zhang@analog.com>
Signed-off-by: default avatarMike Frysinger <vapier@gentoo.org>
parent 2adcf194

arch/blackfin/mach-bf537/boards/stamp.c

+25 −55
Original line number Original line Diff line number Diff line
@@ -35,12 +35,13 @@ 
#include <asm/reboot.h>

#include <asm/reboot.h>

#include <asm/portmux.h>

#include <asm/portmux.h>

#include <asm/dpmc.h>

#include <asm/dpmc.h>

#ifdef CONFIG_REGULATOR_ADP_SWITCH

#ifdef CONFIG_REGULATOR_FIXED_VOLTAGE

#include <linux/regulator/adp_switch.h>

#include <linux/regulator/fixed.h>

#endif

#endif

#ifdef CONFIG_REGULATOR_AD5398

#ifdef CONFIG_REGULATOR_AD5398

#include <linux/regulator/ad5398.h>

#include <linux/regulator/ad5398.h>

#endif

#endif

#include <linux/regulator/machine.h>

#include <linux/regulator/consumer.h>

#include <linux/regulator/consumer.h>

#include <linux/regulator/userspace-consumer.h>

#include <linux/regulator/userspace-consumer.h>
@@ -2590,50 +2591,38 @@ static struct platform_device bfin_ac97 = { 
};

};

#endif

#endif





#if defined(CONFIG_REGULATOR_ADP_SWITCH) || defined(CONFIG_REGULATOR_ADP_SWITCH_MODULE)

#if defined(CONFIG_REGULATOR_FIXED_VOLTAGE) || defined(CONFIG_REGULATOR_FIXED_VOLTAGE_MODULE)

#define REGULATOR_ADP122	"adp122"

#define REGULATOR_ADP122	"adp122"

#define REGULATOR_ADP150        "adp150"

#define REGULATOR_ADP122_UV	2500000





static struct regulator_consumer_supply adp122_consumers = {

static struct regulator_consumer_supply adp122_consumers = {

		.supply = REGULATOR_ADP122,

		.supply = REGULATOR_ADP122,

};

};





static struct regulator_consumer_supply adp150_consumers = {

static struct regulator_init_data adp_switch_regulator_data = {

		.supply = REGULATOR_ADP150,

};



static struct regulator_init_data adp_switch_regulator_data[] = {

	{

	.constraints = {

	.constraints = {

		.name = REGULATOR_ADP122,

		.name = REGULATOR_ADP122,

		.valid_ops_mask = REGULATOR_CHANGE_STATUS,

		.valid_ops_mask = REGULATOR_CHANGE_STATUS,

		.min_uV = REGULATOR_ADP122_UV,

		.max_uV = REGULATOR_ADP122_UV,

		.min_uA = 0,

		.min_uA = 0,

		.max_uA = 300000,

		.max_uA = 300000,

	},

	},

	.num_consumer_supplies = 1,	/* only 1 */

	.num_consumer_supplies = 1,	/* only 1 */

	.consumer_supplies     = &adp122_consumers,

	.consumer_supplies     = &adp122_consumers,

		.driver_data	       = (void *)GPIO_PF2, /* gpio port only */

	},

	{

		.constraints = {

			.name = REGULATOR_ADP150,

			.valid_ops_mask = REGULATOR_CHANGE_STATUS,

			.min_uA = 0,

			.max_uA = 150000,

		},

		.num_consumer_supplies = 1,	/* only 1 */

		.consumer_supplies     = &adp150_consumers,

		.driver_data	       = (void *)GPIO_PF3, /* gpio port only */

	},

};

};





static struct adp_switch_platform_data adp_switch_pdata = {

static struct fixed_voltage_config adp_switch_pdata = {

	.regulator_num = ARRAY_SIZE(adp_switch_regulator_data),

	.supply_name = REGULATOR_ADP122,

	.regulator_data = adp_switch_regulator_data,

	.microvolts = REGULATOR_ADP122_UV,

	.gpio = GPIO_PF2,

	.enable_high = 1,

	.enabled_at_boot = 0,

	.init_data = &adp_switch_regulator_data,

};

};





static struct platform_device adp_switch_device = {

static struct platform_device adp_switch_device = {

	.name = "adp_switch",

	.name = "reg-fixed-voltage",

	.id = 0,

	.id = 0,

	.dev = {

	.dev = {

		.platform_data = &adp_switch_pdata,

		.platform_data = &adp_switch_pdata,
@@ -2659,24 +2648,6 @@ static struct platform_device adp122_userspace_consumer_device = { 
		.platform_data = &adp122_userspace_comsumer_data,

		.platform_data = &adp122_userspace_comsumer_data,

	},

	},

};

};



static struct regulator_bulk_data adp150_bulk_data = {

	.supply = REGULATOR_ADP150,

};



static struct regulator_userspace_consumer_data adp150_userspace_comsumer_data = {

	.name = REGULATOR_ADP150,

	.num_supplies = 1,

	.supplies = &adp150_bulk_data,

};



static struct platform_device adp150_userspace_consumer_device = {

	.name = "reg-userspace-consumer",

	.id = 1,

	.dev = {

		.platform_data = &adp150_userspace_comsumer_data,

	},

};

#endif

#endif

#endif

#endif
@@ -2829,12 +2800,11 @@ static struct platform_device *stamp_devices[] __initdata = { 
#endif

#endif

#endif

#endif





#if defined(CONFIG_REGULATOR_ADP_SWITCH) || defined(CONFIG_REGULATOR_ADP_SWITCH_MODULE)

#if defined(CONFIG_REGULATOR_FIXED_VOLTAGE) || defined(CONFIG_REGULATOR_FIXED_VOLTAGE_MODULE)

	&adp_switch_device,

	&adp_switch_device,

#if defined(CONFIG_REGULATOR_USERSPACE_CONSUMER) || \

#if defined(CONFIG_REGULATOR_USERSPACE_CONSUMER) || \

	defined(CONFIG_REGULATOR_USERSPACE_CONSUMER_MODULE)

	defined(CONFIG_REGULATOR_USERSPACE_CONSUMER_MODULE)

	&adp122_userspace_consumer_device,

	&adp122_userspace_consumer_device,

	&adp150_userspace_consumer_device,

#endif

#endif

#endif

#endif