Commit a1e516e3 authored by Bengt Jonsson's avatar Bengt Jonsson Committed by Liam Girdwood
Browse files

mach-ux500: Updated and connected ab8500 regulator board configuration 



The ab8500 regulator board configuration is updated and put in an
array which can easily be used in the MFD board configuration. The
regulator board configuration is also added to the MFD
configuration in this patch.

Signed-off-by: default avatarBengt Jonsson <bengt.g.jonsson@stericsson.com>
Acked-by: default avatarLinus Walleij <linus.walleij@stericsson.com>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
parent 6909b452

arch/arm/mach-ux500/board-mop500-regulators.c

+74 −79
Original line number Diff line number Diff line
@@ -3,15 +3,19 @@ 
 *

 * License Terms: GNU General Public License v2

 *

 * Author: Sundar Iyer <sundar.iyer@stericsson.com>

 * Authors: Sundar Iyer <sundar.iyer@stericsson.com>

 *          Bengt Jonsson <bengt.g.jonsson@stericsson.com>

 *

 * MOP500 board specific initialization for regulators

 */

#include <linux/kernel.h>

#include <linux/regulator/machine.h>

#include <linux/regulator/ab8500.h>



/* AB8500 regulators */

struct regulator_init_data ab8500_regulators[AB8500_NUM_REGULATORS] = {

	/* supplies to the display/camera */

static struct regulator_init_data ab8500_vaux1_regulator = {

	[AB8500_LDO_AUX1] = {

		.constraints = {

			.name = "V-DISPLAY",

			.min_uV = 2500000,
@@ -19,10 +23,9 @@ static struct regulator_init_data ab8500_vaux1_regulator = { 
			.valid_ops_mask = REGULATOR_CHANGE_VOLTAGE |

					  REGULATOR_CHANGE_STATUS,

		},

};



	},

	/* supplies to the on-board eMMC */

static struct regulator_init_data ab8500_vaux2_regulator = {

	[AB8500_LDO_AUX2] = {

		.constraints = {

			.name = "V-eMMC1",

			.min_uV = 1100000,
@@ -30,10 +33,9 @@ static struct regulator_init_data ab8500_vaux2_regulator = { 
			.valid_ops_mask = REGULATOR_CHANGE_VOLTAGE |

					  REGULATOR_CHANGE_STATUS,

		},

};



	},

	/* supply for VAUX3, supplies to SDcard slots */

static struct regulator_init_data ab8500_vaux3_regulator = {

	[AB8500_LDO_AUX3] = {

		.constraints = {

			.name = "V-MMC-SD",

			.min_uV = 1100000,
@@ -41,61 +43,54 @@ static struct regulator_init_data ab8500_vaux3_regulator = { 
			.valid_ops_mask = REGULATOR_CHANGE_VOLTAGE |

					  REGULATOR_CHANGE_STATUS,

		},

};



	},

	/* supply for tvout, gpadc, TVOUT LDO */

static struct regulator_init_data ab8500_vtvout_init = {

	[AB8500_LDO_TVOUT] = {

		.constraints = {

			.name = "V-TVOUT",

			.valid_ops_mask = REGULATOR_CHANGE_STATUS,

		},

};



	},

	/* supply for ab8500-vaudio, VAUDIO LDO */

static struct regulator_init_data ab8500_vaudio_init = {

	[AB8500_LDO_AUDIO] = {

		.constraints = {

			.name = "V-AUD",

			.valid_ops_mask = REGULATOR_CHANGE_STATUS,

		},

};



	},

	/* supply for v-anamic1 VAMic1-LDO */

static struct regulator_init_data ab8500_vamic1_init = {

	[AB8500_LDO_ANAMIC1] = {

		.constraints = {

			.name = "V-AMIC1",

			.valid_ops_mask = REGULATOR_CHANGE_STATUS,

		},

};



	},

	/* supply for v-amic2, VAMIC2 LDO, reuse constants for AMIC1 */

static struct regulator_init_data ab8500_vamic2_init = {

	[AB8500_LDO_ANAMIC2] = {

		.constraints = {

			.name = "V-AMIC2",

			.valid_ops_mask = REGULATOR_CHANGE_STATUS,

		},

};



	},

	/* supply for v-dmic, VDMIC LDO */

static struct regulator_init_data ab8500_vdmic_init = {

	[AB8500_LDO_DMIC] = {

		.constraints = {

			.name = "V-DMIC",

			.valid_ops_mask = REGULATOR_CHANGE_STATUS,

		},

};



	},

	/* supply for v-intcore12, VINTCORE12 LDO */

static struct regulator_init_data ab8500_vintcore_init = {

	[AB8500_LDO_INTCORE] = {

		.constraints = {

			.name = "V-INTCORE",

			.valid_ops_mask = REGULATOR_CHANGE_STATUS,

		},

};



	},

	/* supply for U8500 CSI/DSI, VANA LDO */

static struct regulator_init_data ab8500_vana_init = {

	[AB8500_LDO_ANA] = {

		.constraints = {

			.name = "V-CSI/DSI",

			.valid_ops_mask = REGULATOR_CHANGE_STATUS,

		},

	},

};

arch/arm/mach-ux500/board-mop500-regulators.h

0 → 100644
+19 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) ST-Ericsson SA 2010

 *

 * License Terms: GNU General Public License v2

 *

 * Author: Bengt Jonsson <bengt.g.jonsson@stericsson.com> for ST-Ericsson

 *

 * MOP500 board specific initialization for regulators

 */



#ifndef __BOARD_MOP500_REGULATORS_H

#define __BOARD_MOP500_REGULATORS_H



#include <linux/regulator/machine.h>

#include <linux/regulator/ab8500.h>



extern struct regulator_init_data ab8500_regulators[AB8500_NUM_REGULATORS];



#endif

arch/arm/mach-ux500/board-mop500.c

+3 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include "devices-db8500.h"

#include "pins-db8500.h"

#include "board-mop500.h"

#include "board-mop500-regulators.h"



static pin_cfg_t mop500_pins[] = {

	/* SSP0 */
@@ -80,6 +81,8 @@ static pin_cfg_t mop500_pins[] = { 


static struct ab8500_platform_data ab8500_platdata = {

	.irq_base	= MOP500_AB8500_IRQ_BASE,

	.regulator	= ab8500_regulators,

	.num_regulator	= ARRAY_SIZE(ab8500_regulators),

};



static struct resource ab8500_resources[] = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE