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

Commit bc5bbc45 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-torvalds' of... 

Merge branch 'for-torvalds' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson

* 'for-torvalds' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  mach-ux500: configure board for the TPS61052 regulator v2
  mach-ux500: provide ab8500 init vector
  mach-ux500: board support for AB8500 GPIO driver
  gpio: driver for 42 AB8500 GPIO pins
parents 32836e08 fe67dfc8

arch/arm/mach-ux500/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ menu "Ux500 target platform" 
config MACH_U8500

	bool "U8500 Development platform"

	depends on UX500_SOC_DB8500

	select TPS6105X

	help

	  Include support for the mop500 development platform.

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

+201 −0
Original line number Diff line number Diff line
@@ -13,6 +13,30 @@ 
#include <linux/regulator/ab8500.h>

#include "board-mop500-regulators.h"



/*

 * TPS61052 regulator

 */

static struct regulator_consumer_supply tps61052_vaudio_consumers[] = {

	/*

	 * Boost converter supply to raise voltage on audio speaker, this

	 * is actually connected to three pins, VInVhfL (left amplifier)

	 * VInVhfR (right amplifier) and VIntDClassInt - all three must

	 * be connected to the same voltage.

	 */

	REGULATOR_SUPPLY("vintdclassint", "ab8500-codec.0"),

};



struct regulator_init_data tps61052_regulator = {

	.constraints = {

		.name = "vaudio-hf",

		.min_uV = 4500000,

		.max_uV = 4500000,

		.valid_ops_mask = REGULATOR_CHANGE_STATUS,

	},

	.num_consumer_supplies = ARRAY_SIZE(tps61052_vaudio_consumers),

	.consumer_supplies = tps61052_vaudio_consumers,

};



static struct regulator_consumer_supply ab8500_vaux1_consumers[] = {

	/* External displays, connector on board 2v5 power supply */

	REGULATOR_SUPPLY("vaux12v5", "mcde.0"),
@@ -62,6 +86,182 @@ static struct regulator_consumer_supply ab8500_vana_consumers[] = { 
	REGULATOR_SUPPLY("vsmps2", "mcde.0"),

};



/* ab8500 regulator register initialization */

struct ab8500_regulator_reg_init

ab8500_regulator_reg_init[AB8500_NUM_REGULATOR_REGISTERS] = {

	/*

	 * VanaRequestCtrl          = HP/LP depending on VxRequest

	 * VextSupply1RequestCtrl   = HP/LP depending on VxRequest

	 */

	INIT_REGULATOR_REGISTER(AB8500_REGUREQUESTCTRL2, 0x00),

	/*

	 * VextSupply2RequestCtrl   = HP/LP depending on VxRequest

	 * VextSupply3RequestCtrl   = HP/LP depending on VxRequest

	 * Vaux1RequestCtrl         = HP/LP depending on VxRequest

	 * Vaux2RequestCtrl         = HP/LP depending on VxRequest

	 */

	INIT_REGULATOR_REGISTER(AB8500_REGUREQUESTCTRL3, 0x00),

	/*

	 * Vaux3RequestCtrl         = HP/LP depending on VxRequest

	 * SwHPReq                  = Control through SWValid disabled

	 */

	INIT_REGULATOR_REGISTER(AB8500_REGUREQUESTCTRL4, 0x00),

	/*

	 * VanaSysClkReq1HPValid    = disabled

	 * Vaux1SysClkReq1HPValid   = disabled

	 * Vaux2SysClkReq1HPValid   = disabled

	 * Vaux3SysClkReq1HPValid   = disabled

	 */

	INIT_REGULATOR_REGISTER(AB8500_REGUSYSCLKREQ1HPVALID1, 0x00),

	/*

	 * VextSupply1SysClkReq1HPValid = disabled

	 * VextSupply2SysClkReq1HPValid = disabled

	 * VextSupply3SysClkReq1HPValid = SysClkReq1 controlled

	 */

	INIT_REGULATOR_REGISTER(AB8500_REGUSYSCLKREQ1HPVALID2, 0x40),

	/*

	 * VanaHwHPReq1Valid        = disabled

	 * Vaux1HwHPreq1Valid       = disabled

	 * Vaux2HwHPReq1Valid       = disabled

	 * Vaux3HwHPReqValid        = disabled

	 */

	INIT_REGULATOR_REGISTER(AB8500_REGUHWHPREQ1VALID1, 0x00),

	/*

	 * VextSupply1HwHPReq1Valid = disabled

	 * VextSupply2HwHPReq1Valid = disabled

	 * VextSupply3HwHPReq1Valid = disabled

	 */

	INIT_REGULATOR_REGISTER(AB8500_REGUHWHPREQ1VALID2, 0x00),

	/*

	 * VanaHwHPReq2Valid        = disabled

	 * Vaux1HwHPReq2Valid       = disabled

	 * Vaux2HwHPReq2Valid       = disabled

	 * Vaux3HwHPReq2Valid       = disabled

	 */

	INIT_REGULATOR_REGISTER(AB8500_REGUHWHPREQ2VALID1, 0x00),

	/*

	 * VextSupply1HwHPReq2Valid = disabled

	 * VextSupply2HwHPReq2Valid = disabled

	 * VextSupply3HwHPReq2Valid = HWReq2 controlled

	 */

	INIT_REGULATOR_REGISTER(AB8500_REGUHWHPREQ2VALID2, 0x04),

	/*

	 * VanaSwHPReqValid         = disabled

	 * Vaux1SwHPReqValid        = disabled

	 */

	INIT_REGULATOR_REGISTER(AB8500_REGUSWHPREQVALID1, 0x00),

	/*

	 * Vaux2SwHPReqValid        = disabled

	 * Vaux3SwHPReqValid        = disabled

	 * VextSupply1SwHPReqValid  = disabled

	 * VextSupply2SwHPReqValid  = disabled

	 * VextSupply3SwHPReqValid  = disabled

	 */

	INIT_REGULATOR_REGISTER(AB8500_REGUSWHPREQVALID2, 0x00),

	/*

	 * SysClkReq2Valid1         = SysClkReq2 controlled

	 * SysClkReq3Valid1         = disabled

	 * SysClkReq4Valid1         = SysClkReq4 controlled

	 * SysClkReq5Valid1         = disabled

	 * SysClkReq6Valid1         = SysClkReq6 controlled

	 * SysClkReq7Valid1         = disabled

	 * SysClkReq8Valid1         = disabled

	 */

	INIT_REGULATOR_REGISTER(AB8500_REGUSYSCLKREQVALID1, 0x2a),

	/*

	 * SysClkReq2Valid2         = disabled

	 * SysClkReq3Valid2         = disabled

	 * SysClkReq4Valid2         = disabled

	 * SysClkReq5Valid2         = disabled

	 * SysClkReq6Valid2         = SysClkReq6 controlled

	 * SysClkReq7Valid2         = disabled

	 * SysClkReq8Valid2         = disabled

	 */

	INIT_REGULATOR_REGISTER(AB8500_REGUSYSCLKREQVALID2, 0x20),

	/*

	 * VTVoutEna                = disabled

	 * Vintcore12Ena            = disabled

	 * Vintcore12Sel            = 1.25 V

	 * Vintcore12LP             = inactive (HP)

	 * VTVoutLP                 = inactive (HP)

	 */

	INIT_REGULATOR_REGISTER(AB8500_REGUMISC1, 0x10),

	/*

	 * VaudioEna                = disabled

	 * VdmicEna                 = disabled

	 * Vamic1Ena                = disabled

	 * Vamic2Ena                = disabled

	 */

	INIT_REGULATOR_REGISTER(AB8500_VAUDIOSUPPLY, 0x00),

	/*

	 * Vamic1_dzout             = high-Z when Vamic1 is disabled

	 * Vamic2_dzout             = high-Z when Vamic2 is disabled

	 */

	INIT_REGULATOR_REGISTER(AB8500_REGUCTRL1VAMIC, 0x00),

	/*

	 * VPll                     = Hw controlled

	 * VanaRegu                 = force off

	 */

	INIT_REGULATOR_REGISTER(AB8500_VPLLVANAREGU, 0x02),

	/*

	 * VrefDDREna               = disabled

	 * VrefDDRSleepMode         = inactive (no pulldown)

	 */

	INIT_REGULATOR_REGISTER(AB8500_VREFDDR, 0x00),

	/*

	 * VextSupply1Regu          = HW control

	 * VextSupply2Regu          = HW control

	 * VextSupply3Regu          = HW control

	 * ExtSupply2Bypass         = ExtSupply12LPn ball is 0 when Ena is 0

	 * ExtSupply3Bypass         = ExtSupply3LPn ball is 0 when Ena is 0

	 */

	INIT_REGULATOR_REGISTER(AB8500_EXTSUPPLYREGU, 0x2a),

	/*

	 * Vaux1Regu                = force HP

	 * Vaux2Regu                = force off

	 */

	INIT_REGULATOR_REGISTER(AB8500_VAUX12REGU, 0x01),

	/*

	 * Vaux3regu                = force off

	 */

	INIT_REGULATOR_REGISTER(AB8500_VRF1VAUX3REGU, 0x00),

	/*

	 * Vsmps1                   = 1.15V

	 */

	INIT_REGULATOR_REGISTER(AB8500_VSMPS1SEL1, 0x24),

	/*

	 * Vaux1Sel                 = 2.5 V

	 */

	INIT_REGULATOR_REGISTER(AB8500_VAUX1SEL, 0x08),

	/*

	 * Vaux2Sel                 = 2.9 V

	 */

	INIT_REGULATOR_REGISTER(AB8500_VAUX2SEL, 0x0d),

	/*

	 * Vaux3Sel                 = 2.91 V

	 */

	INIT_REGULATOR_REGISTER(AB8500_VRF1VAUX3SEL, 0x07),

	/*

	 * VextSupply12LP           = disabled (no LP)

	 */

	INIT_REGULATOR_REGISTER(AB8500_REGUCTRL2SPARE, 0x00),

	/*

	 * Vaux1Disch               = short discharge time

	 * Vaux2Disch               = short discharge time

	 * Vaux3Disch               = short discharge time

	 * Vintcore12Disch          = short discharge time

	 * VTVoutDisch              = short discharge time

	 * VaudioDisch              = short discharge time

	 */

	INIT_REGULATOR_REGISTER(AB8500_REGUCTRLDISCH, 0x00),

	/*

	 * VanaDisch                = short discharge time

	 * VdmicPullDownEna         = pulldown disabled when Vdmic is disabled

	 * VdmicDisch               = short discharge time

	 */

	INIT_REGULATOR_REGISTER(AB8500_REGUCTRLDISCH2, 0x00),

};



/* AB8500 regulators */

struct regulator_init_data ab8500_regulators[AB8500_NUM_REGULATORS] = {

	/* supplies to the display/camera */
@@ -72,6 +272,7 @@ struct regulator_init_data ab8500_regulators[AB8500_NUM_REGULATORS] = { 
			.max_uV = 2900000,

			.valid_ops_mask = REGULATOR_CHANGE_VOLTAGE |

					  REGULATOR_CHANGE_STATUS,

			.boot_on = 1, /* must be on for display */

		},

		.num_consumer_supplies = ARRAY_SIZE(ab8500_vaux1_consumers),

		.consumer_supplies = ab8500_vaux1_consumers,

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

+1 −0
Original line number Diff line number Diff line
@@ -17,5 +17,6 @@ 
extern struct ab8500_regulator_reg_init

ab8500_regulator_reg_init[AB8500_NUM_REGULATOR_REGISTERS];

extern struct regulator_init_data ab8500_regulators[AB8500_NUM_REGULATORS];

extern struct regulator_init_data tps61052_regulator;



#endif

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

+48 −1
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 
#include <linux/mfd/ab8500.h>

#include <linux/regulator/ab8500.h>

#include <linux/mfd/tc3589x.h>

#include <linux/mfd/tps6105x.h>

#include <linux/mfd/ab8500/gpio.h>

#include <linux/leds-lp5521.h>

#include <linux/input.h>

#include <linux/gpio_keys.h>
@@ -42,10 +44,35 @@ 
#include "board-mop500.h"

#include "board-mop500-regulators.h"



static struct ab8500_gpio_platform_data ab8500_gpio_pdata = {

	.gpio_base		= MOP500_AB8500_GPIO(0),

	.irq_base		= MOP500_AB8500_VIR_GPIO_IRQ_BASE,

	/* config_reg is the initial configuration of ab8500 pins.

	 * The pins can be configured as GPIO or alt functions based

	 * on value present in GpioSel1 to GpioSel6 and AlternatFunction

	 * register. This is the array of 7 configuration settings.

	 * One has to compile time decide these settings. Below is the

	 * explaination of these setting

	 * GpioSel1 = 0x00 => Pins GPIO1 to GPIO8 are not used as GPIO

	 * GpioSel2 = 0x1E => Pins GPIO10 to GPIO13 are configured as GPIO

	 * GpioSel3 = 0x80 => Pin GPIO24 is configured as GPIO

	 * GpioSel4 = 0x01 => Pin GPIo25 is configured as GPIO

	 * GpioSel5 = 0x7A => Pins GPIO34, GPIO36 to GPIO39 are conf as GPIO

	 * GpioSel6 = 0x00 => Pins GPIO41 & GPIo42 are not configured as GPIO

	 * AlternaFunction = 0x00 => If Pins GPIO10 to 13 are not configured

	 * as GPIO then this register selectes the alternate fucntions

	 */

	.config_reg		= {0x00, 0x1E, 0x80, 0x01,

					0x7A, 0x00, 0x00},

};



static struct ab8500_platform_data ab8500_platdata = {

	.irq_base	= MOP500_AB8500_IRQ_BASE,

	.regulator_reg_init = ab8500_regulator_reg_init,

	.num_regulator_reg_init	= ARRAY_SIZE(ab8500_regulator_reg_init),

	.regulator	= ab8500_regulators,

	.num_regulator	= ARRAY_SIZE(ab8500_regulators),

	.gpio		= &ab8500_gpio_pdata,

};



static struct resource ab8500_resources[] = {
@@ -66,6 +93,15 @@ struct platform_device ab8500_device = { 
	.resource = ab8500_resources,

};



/*

 * TPS61052

 */



static struct tps6105x_platform_data mop500_tps61052_data = {

	.mode = TPS6105X_MODE_VOLTAGE,

	.regulator_data = &tps61052_regulator,

};



/*

 * TC35892

 */
@@ -136,7 +172,7 @@ static struct lp5521_platform_data __initdata lp5521_sec_data = { 
       .clock_mode     = LP5521_CLOCK_EXT,

};



static struct i2c_board_info mop500_i2c0_devices[] = {

static struct i2c_board_info __initdata mop500_i2c0_devices[] = {

	{

		I2C_BOARD_INFO("tc3589x", 0x42),

		.irq		= NOMADIK_GPIO_TO_IRQ(217),
@@ -144,6 +180,14 @@ static struct i2c_board_info mop500_i2c0_devices[] = { 
	},

};



/* I2C0 devices only available prior to HREFv60 */

static struct i2c_board_info __initdata mop500_i2c0_old_devices[] = {

	{

		I2C_BOARD_INFO("tps61052", 0x33),

		.platform_data  = &mop500_tps61052_data,

	},

};



static struct i2c_board_info __initdata mop500_i2c2_devices[] = {

	{

		/* lp5521 LED driver, 1st device */
@@ -406,6 +450,9 @@ static void __init mop500_init_machine(void) 


	i2c_register_board_info(0, mop500_i2c0_devices,

				ARRAY_SIZE(mop500_i2c0_devices));

	if (!machine_is_hrefv60())

		i2c_register_board_info(0, mop500_i2c0_old_devices,

					ARRAY_SIZE(mop500_i2c0_old_devices));

	i2c_register_board_info(2, mop500_i2c2_devices,

				ARRAY_SIZE(mop500_i2c2_devices));

}

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

+4 −0
Original line number Diff line number Diff line
@@ -27,6 +27,10 @@ 
#define GPIO_BU21013_CS			MOP500_EGPIO(13)

#define GPIO_SDMMC_EN			MOP500_EGPIO(17)

#define GPIO_SDMMC_1V8_3V_SEL		MOP500_EGPIO(18)

#define MOP500_EGPIO_END		MOP500_EGPIO(24)



/* GPIOs on the AB8500 mixed-signals circuit */

#define MOP500_AB8500_GPIO(x)		(MOP500_EGPIO_END + (x))



struct i2c_board_info;