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

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

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6: (42 commits)
  regulator: Fix _regulator_get_voltage if get_voltage callback is NULL
  USB: TWL6025 allow different regulator name
  REGULATOR: TWL6025: add support to twl-regulator
  regulator: twl6030: do not write to _GRP for regulator disable
  regulator: twl6030: do not write to _GRP for regulator enable
  TPS65911: Comparator: Add comparator driver
  TPS65911: Add support for added GPIO lines
  GPIO: TPS65910: Move driver to drivers/gpio/
  TPS65911: Add new irq definitions
  regulator: tps65911: Add new chip version
  MFD: TPS65910: Add support for TPS65911 device
  regulator: Fix off-by-one value range checking for mc13xxx_regulator_get_voltage
  regulator: mc13892: Fix voltage unit in test case.
  regulator: Remove MAX8997_REG_BUCK1DVS/MAX8997_REG_BUCK2DVS/MAX8997_REG_BUCK5DVS macros
  mfd: Fix off-by-one value range checking for tps65910_i2c_write
  regulator: Only apply voltage constraints from consumers that set them
  regulator: If we can't configure optimum mode we're always in the best one
  regulator: max8997: remove useless code
  regulator: Fix memory leak in max8998_pmic_probe failure path
  regulator: Fix desc_id for tps65023/6507x/65910
  ...
parents ea0ca3a8 cb220d16

Documentation/power/regulator/machine.txt

+2 −2
Original line number Diff line number Diff line
@@ -53,11 +53,11 @@ static struct regulator_init_data regulator1_data = { 


Regulator-1 supplies power to Regulator-2. This relationship must be registered

with the core so that Regulator-1 is also enabled when Consumer A enables its

supply (Regulator-2). The supply regulator is set by the supply_regulator_dev

supply (Regulator-2). The supply regulator is set by the supply_regulator

field below:-



static struct regulator_init_data regulator2_data = {

	.supply_regulator_dev = &platform_regulator1_device.dev,

	.supply_regulator = "regulator_name",

	.constraints = {

		.min_uV = 1800000,

		.max_uV = 2000000,

drivers/gpio/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -424,4 +424,11 @@ config AB8500_GPIO 
	depends on AB8500_CORE && BROKEN

	help

	  Select this to enable the AB8500 IC GPIO driver



config GPIO_TPS65910

	bool "TPS65910 GPIO"

	depends on MFD_TPS65910

	help

	  Select this option to enable GPIO driver for the TPS65910

	  chip family.

endif

drivers/gpio/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -40,3 +40,4 @@ obj-$(CONFIG_GPIO_SX150X) += sx150x.o 
obj-$(CONFIG_GPIO_VX855)	+= vx855_gpio.o

obj-$(CONFIG_GPIO_ML_IOH)	+= ml_ioh_gpio.o

obj-$(CONFIG_AB8500_GPIO)       += ab8500-gpio.o

obj-$(CONFIG_GPIO_TPS65910)	+= tps65910-gpio.o

drivers/gpio/tps65910-gpio.c

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

 * tps65910-gpio.c  --  TI TPS6591x

 *

 * Copyright 2010 Texas Instruments Inc.

 *

 * Author: Graeme Gregory <gg@slimlogic.co.uk>

 * Author: Jorge Eduardo Candelaria jedu@slimlogic.co.uk>

 *

 *  This program is free software; you can redistribute it and/or modify it

 *  under  the terms of the GNU General  Public License as published by the

 *  Free Software Foundation;  either version 2 of the License, or (at your

 *  option) any later version.

 *

 */



#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/errno.h>

#include <linux/gpio.h>

#include <linux/i2c.h>

#include <linux/mfd/tps65910.h>



static int tps65910_gpio_get(struct gpio_chip *gc, unsigned offset)

{

	struct tps65910 *tps65910 = container_of(gc, struct tps65910, gpio);

	uint8_t val;



	tps65910->read(tps65910, TPS65910_GPIO0 + offset, 1, &val);



	if (val & GPIO_STS_MASK)

		return 1;



	return 0;

}



static void tps65910_gpio_set(struct gpio_chip *gc, unsigned offset,

			      int value)

{

	struct tps65910 *tps65910 = container_of(gc, struct tps65910, gpio);



	if (value)

		tps65910_set_bits(tps65910, TPS65910_GPIO0 + offset,

						GPIO_SET_MASK);

	else

		tps65910_clear_bits(tps65910, TPS65910_GPIO0 + offset,

						GPIO_SET_MASK);

}



static int tps65910_gpio_output(struct gpio_chip *gc, unsigned offset,

				int value)

{

	struct tps65910 *tps65910 = container_of(gc, struct tps65910, gpio);



	/* Set the initial value */

	tps65910_gpio_set(gc, 0, value);



	return tps65910_set_bits(tps65910, TPS65910_GPIO0 + offset,

						GPIO_CFG_MASK);

}



static int tps65910_gpio_input(struct gpio_chip *gc, unsigned offset)

{

	struct tps65910 *tps65910 = container_of(gc, struct tps65910, gpio);



	return tps65910_clear_bits(tps65910, TPS65910_GPIO0 + offset,

						GPIO_CFG_MASK);

}



void tps65910_gpio_init(struct tps65910 *tps65910, int gpio_base)

{

	int ret;



	if (!gpio_base)

		return;



	tps65910->gpio.owner		= THIS_MODULE;

	tps65910->gpio.label		= tps65910->i2c_client->name;

	tps65910->gpio.dev		= tps65910->dev;

	tps65910->gpio.base		= gpio_base;



	switch(tps65910_chip_id(tps65910)) {

	case TPS65910:

		tps65910->gpio.ngpio	= 6;

	case TPS65911:

		tps65910->gpio.ngpio	= 9;

	default:

		return;

	}

	tps65910->gpio.can_sleep	= 1;



	tps65910->gpio.direction_input	= tps65910_gpio_input;

	tps65910->gpio.direction_output	= tps65910_gpio_output;

	tps65910->gpio.set		= tps65910_gpio_set;

	tps65910->gpio.get		= tps65910_gpio_get;



	ret = gpiochip_add(&tps65910->gpio);



	if (ret)

		dev_warn(tps65910->dev, "GPIO registration failed: %d\n", ret);

}

drivers/mfd/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -719,6 +719,15 @@ config MFD_PM8XXX_IRQ 
	  This is required to use certain other PM 8xxx features, such as GPIO

	  and MPP.



config MFD_TPS65910

	bool "TPS65910 Power Management chip"

	depends on I2C=y

	select MFD_CORE

	select GPIO_TPS65910

	help

	  if you say yes here you get support for the TPS65910 series of

	  Power Management chips.



endif # MFD_SUPPORT



menu "Multimedia Capabilities Port drivers"