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

Commit 36e52873 authored by Margarita Olaya's avatar Margarita Olaya Committed by Samuel Ortiz
Browse files

mfd: tps65912: Add new mfd device 



The tps65912 chip is a power management IC. It contains the following
components:

- Regulators
- GPIO controller

The core driver is registered as a platform driver, it provides communication
through I2C and SPI interfaces.

Signed-off-by: default avatarMargarita Olaya Cabrera <magi@slimlogic.co.uk>
Acked-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
Acked-by: default avatarLiam Girdwood <lrg@ti.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 8504d638

drivers/mfd/Kconfig

+22 −0
Original line number Original line Diff line number Diff line
@@ -171,6 +171,28 @@ config MFD_TPS6586X 
	  This driver can also be built as a module.  If so, the module

	  This driver can also be built as a module.  If so, the module

	  will be called tps6586x.

	  will be called tps6586x.





config MFD_TPS65912

	bool "TPS65912 PMIC"

	depends on GPIOLIB



config MFD_TPS65912_I2C

	bool "TPS95612 Power Management chip with I2C"

	select MFD_CORE

	select MFD_TPS65912

	depends on I2C=y && GPIOLIB

	help

	  If you say yes here you get support for the TPS65912 series of

	  PM chips with I2C interface.



config MFD_TPS65912_SPI

	bool "TPS65912 Power Management chip with SPI"

	select MFD_CORE

	select MFD_TPS65912

	depends on SPI_MASTER && GPIOLIB

	help

	  If you say yes here you get support for the TPS65912 series of

	  PM chips with SPI interface.



config MENELAUS

config MENELAUS

	bool "Texas Instruments TWL92330/Menelaus PM chip"

	bool "Texas Instruments TWL92330/Menelaus PM chip"

	depends on I2C=y && ARCH_OMAP2

	depends on I2C=y && ARCH_OMAP2

drivers/mfd/Makefile

+4 −0
Original line number Original line Diff line number Diff line
@@ -36,6 +36,10 @@ obj-$(CONFIG_MFD_WM8994) += wm8994-core.o wm8994-irq.o 
obj-$(CONFIG_TPS6105X)		+= tps6105x.o

obj-$(CONFIG_TPS6105X)		+= tps6105x.o

obj-$(CONFIG_TPS65010)		+= tps65010.o

obj-$(CONFIG_TPS65010)		+= tps65010.o

obj-$(CONFIG_TPS6507X)		+= tps6507x.o

obj-$(CONFIG_TPS6507X)		+= tps6507x.o

tps65912-objs                   := tps65912-core.o

obj-$(CONFIG_MFD_TPS65912)	+= tps65912.o

obj-$(CONFIG_MFD_TPS65912_I2C)	+= tps65912-i2c.o

obj-$(CONFIG_MFD_TPS65912_SPI)  += tps65912-spi.o

obj-$(CONFIG_MENELAUS)		+= menelaus.o

obj-$(CONFIG_MENELAUS)		+= menelaus.o





obj-$(CONFIG_TWL4030_CORE)	+= twl-core.o twl4030-irq.o twl6030-irq.o

obj-$(CONFIG_TWL4030_CORE)	+= twl-core.o twl4030-irq.o twl6030-irq.o

drivers/mfd/tps65912-core.c

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

 * tps65912-core.c  --  TI TPS65912x

 *

 * Copyright 2011 Texas Instruments Inc.

 *

 * Author: Margarita Olaya Cabrera <magi@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.

 *

 *  This driver is based on wm8350 implementation.

 */



#include <linux/module.h>

#include <linux/moduleparam.h>

#include <linux/init.h>

#include <linux/slab.h>

#include <linux/gpio.h>

#include <linux/mfd/core.h>

#include <linux/mfd/tps65912.h>



static struct mfd_cell tps65912s[] = {

	{

		.name = "tps65912-pmic",

	},

};



int tps65912_set_bits(struct tps65912 *tps65912, u8 reg, u8 mask)

{

	u8 data;

	int err;



	mutex_lock(&tps65912->io_mutex);



	err = tps65912->read(tps65912, reg, 1, &data);

	if (err) {

		dev_err(tps65912->dev, "Read from reg 0x%x failed\n", reg);

		goto out;

	}



	data |= mask;

	err = tps65912->write(tps65912, reg, 1, &data);

	if (err)

		dev_err(tps65912->dev, "Write to reg 0x%x failed\n", reg);



out:

	mutex_unlock(&tps65912->io_mutex);

	return err;

}

EXPORT_SYMBOL_GPL(tps65912_set_bits);



int tps65912_clear_bits(struct tps65912 *tps65912, u8 reg, u8 mask)

{

	u8 data;

	int err;



	mutex_lock(&tps65912->io_mutex);

	err = tps65912->read(tps65912, reg, 1, &data);

	if (err) {

		dev_err(tps65912->dev, "Read from reg 0x%x failed\n", reg);

		goto out;

	}



	data &= ~mask;

	err = tps65912->write(tps65912, reg, 1, &data);

	if (err)

		dev_err(tps65912->dev, "Write to reg 0x%x failed\n", reg);



out:

	mutex_unlock(&tps65912->io_mutex);

	return err;

}

EXPORT_SYMBOL_GPL(tps65912_clear_bits);



static inline int tps65912_read(struct tps65912 *tps65912, u8 reg)

{

	u8 val;

	int err;



	err = tps65912->read(tps65912, reg, 1, &val);

	if (err < 0)

		return err;



	return val;

}



static inline int tps65912_write(struct tps65912 *tps65912, u8 reg, u8 val)

{

	return tps65912->write(tps65912, reg, 1, &val);

}



int tps65912_reg_read(struct tps65912 *tps65912, u8 reg)

{

	int data;



	mutex_lock(&tps65912->io_mutex);



	data = tps65912_read(tps65912, reg);

	if (data < 0)

		dev_err(tps65912->dev, "Read from reg 0x%x failed\n", reg);



	mutex_unlock(&tps65912->io_mutex);

	return data;

}

EXPORT_SYMBOL_GPL(tps65912_reg_read);



int tps65912_reg_write(struct tps65912 *tps65912, u8 reg, u8 val)

{

	int err;



	mutex_lock(&tps65912->io_mutex);



	err = tps65912_write(tps65912, reg, val);

	if (err < 0)

		dev_err(tps65912->dev, "Write for reg 0x%x failed\n", reg);



	mutex_unlock(&tps65912->io_mutex);

	return err;

}

EXPORT_SYMBOL_GPL(tps65912_reg_write);



int tps65912_device_init(struct tps65912 *tps65912)

{

	struct tps65912_board *pmic_plat_data = tps65912->dev->platform_data;

	int ret, dcdc_avs, value;



	mutex_init(&tps65912->io_mutex);

	dev_set_drvdata(tps65912->dev, tps65912);



	dcdc_avs = (pmic_plat_data->is_dcdc1_avs << 0 |

			pmic_plat_data->is_dcdc2_avs  << 1 |

				pmic_plat_data->is_dcdc3_avs << 2 |

					pmic_plat_data->is_dcdc4_avs << 3);

	if (dcdc_avs) {

		tps65912->read(tps65912, TPS65912_I2C_SPI_CFG, 1, &value);

		dcdc_avs |= value;

		tps65912->write(tps65912, TPS65912_I2C_SPI_CFG, 1, &dcdc_avs);

	}



	ret = mfd_add_devices(tps65912->dev, -1,

			      tps65912s, ARRAY_SIZE(tps65912s),

			      NULL, 0);

	if (ret < 0)

		goto err;



	return ret;



err:

	mfd_remove_devices(tps65912->dev);

	kfree(tps65912);

	return ret;

}



void tps65912_device_exit(struct tps65912 *tps65912)

{

	mfd_remove_devices(tps65912->dev);

	kfree(tps65912);

}



MODULE_AUTHOR("Margarita Olaya	<magi@slimlogic.co.uk>");

MODULE_DESCRIPTION("TPS65912x chip family multi-function driver");

MODULE_LICENSE("GPL");

drivers/mfd/tps65912-i2c.c

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

 * tps65912-i2c.c  --  I2C access for TI TPS65912x PMIC

 *

 * Copyright 2011 Texas Instruments Inc.

 *

 * Author: Margarita Olaya Cabrera <magi@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.

 *

 *  This driver is based on wm8350 implementation.

 */



#include <linux/module.h>

#include <linux/moduleparam.h>

#include <linux/init.h>

#include <linux/slab.h>

#include <linux/gpio.h>

#include <linux/i2c.h>

#include <linux/mfd/core.h>

#include <linux/mfd/tps65912.h>



static int tps65912_i2c_read(struct tps65912 *tps65912, u8 reg,

				  int bytes, void *dest)

{

	struct i2c_client *i2c = tps65912->control_data;

	struct i2c_msg xfer[2];

	int ret;



	/* Write register */

	xfer[0].addr = i2c->addr;

	xfer[0].flags = 0;

	xfer[0].len = 1;

	xfer[0].buf = &reg;



	/* Read data */

	xfer[1].addr = i2c->addr;

	xfer[1].flags = I2C_M_RD;

	xfer[1].len = bytes;

	xfer[1].buf = dest;



	ret = i2c_transfer(i2c->adapter, xfer, 2);

	if (ret == 2)

		ret = 0;

	else if (ret >= 0)

		ret = -EIO;

	return ret;

}



static int tps65912_i2c_write(struct tps65912 *tps65912, u8 reg,

				   int bytes, void *src)

{

	struct i2c_client *i2c = tps65912->control_data;

	/* we add 1 byte for device register */

	u8 msg[TPS6591X_MAX_REGISTER + 1];

	int ret;



	if (bytes > (TPS6591X_MAX_REGISTER + 1))

		return -EINVAL;



	msg[0] = reg;

	memcpy(&msg[1], src, bytes);



	ret = i2c_master_send(i2c, msg, bytes + 1);

	if (ret < 0)

		return ret;

	if (ret != bytes + 1)

		return -EIO;



	return 0;

}



static int tps65912_i2c_probe(struct i2c_client *i2c,

			    const struct i2c_device_id *id)

{

	struct tps65912 *tps65912;



	tps65912 = kzalloc(sizeof(struct tps65912), GFP_KERNEL);

	if (tps65912 == NULL)

		return -ENOMEM;



	i2c_set_clientdata(i2c, tps65912);

	tps65912->dev = &i2c->dev;

	tps65912->control_data = i2c;

	tps65912->read = tps65912_i2c_read;

	tps65912->write = tps65912_i2c_write;



	return tps65912_device_init(tps65912);

}



static int tps65912_i2c_remove(struct i2c_client *i2c)

{

	struct tps65912 *tps65912 = i2c_get_clientdata(i2c);



	tps65912_device_exit(tps65912);



	return 0;

}



static const struct i2c_device_id tps65912_i2c_id[] = {

	{"tps65912", 0 },

	{ }

};

MODULE_DEVICE_TABLE(i2c, tps65912_i2c_id);



static struct i2c_driver tps65912_i2c_driver = {

	.driver = {

		   .name = "tps65912",

		   .owner = THIS_MODULE,

	},

	.probe = tps65912_i2c_probe,

	.remove = tps65912_i2c_remove,

	.id_table = tps65912_i2c_id,

};



static int __init tps65912_i2c_init(void)

{

	int ret;



	ret = i2c_add_driver(&tps65912_i2c_driver);

	if (ret != 0)

		pr_err("Failed to register TPS65912 I2C driver: %d\n", ret);



	return ret;

}

/* init early so consumer devices can complete system boot */

subsys_initcall(tps65912_i2c_init);



static void __exit tps65912_i2c_exit(void)

{

	i2c_del_driver(&tps65912_i2c_driver);

}

module_exit(tps65912_i2c_exit);



MODULE_AUTHOR("Margarita Olaya	<magi@slimlogic.co.uk>");

MODULE_DESCRIPTION("TPS6591x chip family multi-function driver");

MODULE_LICENSE("GPL");

drivers/mfd/tps65912-spi.c

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

 * tps65912-spi.c  --  SPI access for TI TPS65912x PMIC

 *

 * Copyright 2011 Texas Instruments Inc.

 *

 * Author: Margarita Olaya Cabrera <magi@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.

 *

 *  This driver is based on wm8350 implementation.

 */



#include <linux/module.h>

#include <linux/moduleparam.h>

#include <linux/init.h>

#include <linux/slab.h>

#include <linux/gpio.h>

#include <linux/spi/spi.h>

#include <linux/mfd/core.h>

#include <linux/mfd/tps65912.h>



static int tps65912_spi_write(struct tps65912 *tps65912, u8 addr,

							int bytes, void *src)

{

	struct spi_device *spi = tps65912->control_data;

	u8 *data = (u8 *) src;

	int ret;

	/* bit 23 is the read/write bit */

	unsigned long spi_data = 1 << 23 | addr << 15 | *data;

	struct spi_transfer xfer;

	struct spi_message msg;

	u32 tx_buf, rx_buf;



	tx_buf = spi_data;

	rx_buf = 0;



	xfer.tx_buf	= &tx_buf;

	xfer.rx_buf	= NULL;

	xfer.len	= sizeof(unsigned long);

	xfer.bits_per_word = 24;



	spi_message_init(&msg);

	spi_message_add_tail(&xfer, &msg);



	ret = spi_sync(spi, &msg);

	return ret;

}



static int tps65912_spi_read(struct tps65912 *tps65912, u8 addr,

							int bytes, void *dest)

{

	struct spi_device *spi = tps65912->control_data;

	/* bit 23 is the read/write bit */

	unsigned long spi_data = 0 << 23 | addr << 15;

	struct spi_transfer xfer;

	struct spi_message msg;

	int ret;

	u8 *data = (u8 *) dest;

	u32 tx_buf, rx_buf;



	tx_buf = spi_data;

	rx_buf = 0;



	xfer.tx_buf	= &tx_buf;

	xfer.rx_buf	= &rx_buf;

	xfer.len	= sizeof(unsigned long);

	xfer.bits_per_word = 24;



	spi_message_init(&msg);

	spi_message_add_tail(&xfer, &msg);



	if (spi == NULL)

		return 0;



	ret = spi_sync(spi, &msg);

	if (ret == 0)

		*data = (u8) (rx_buf & 0xFF);

	return ret;

}



static int __devinit tps65912_spi_probe(struct spi_device *spi)

{

	struct tps65912 *tps65912;



	tps65912 = kzalloc(sizeof(struct tps65912), GFP_KERNEL);

	if (tps65912 == NULL)

		return -ENOMEM;



	tps65912->dev = &spi->dev;

	tps65912->control_data = spi;

	tps65912->read = tps65912_spi_read;

	tps65912->write = tps65912_spi_write;



	spi_set_drvdata(spi, tps65912);



	return tps65912_device_init(tps65912);

}



static int __devexit tps65912_spi_remove(struct spi_device *spi)

{

	struct tps65912 *tps65912 = spi_get_drvdata(spi);



	tps65912_device_exit(tps65912);



	return 0;

}



static struct spi_driver tps65912_spi_driver = {

	.driver = {

		.name = "tps65912",

		.bus = &spi_bus_type,

		.owner = THIS_MODULE,

	},

	.probe	= tps65912_spi_probe,

	.remove = __devexit_p(tps65912_spi_remove),

};



static int __init tps65912_spi_init(void)

{

	int ret;



	ret = spi_register_driver(&tps65912_spi_driver);

	if (ret != 0)

		pr_err("Failed to register TPS65912 SPI driver: %d\n", ret);



	return 0;

}

/* init early so consumer devices can complete system boot */

subsys_initcall(tps65912_spi_init);



static void __exit tps65912_spi_exit(void)

{

	spi_unregister_driver(&tps65912_spi_driver);

}

module_exit(tps65912_spi_exit);



MODULE_AUTHOR("Margarita Olaya	<magi@slimlogic.co.uk>");

MODULE_DESCRIPTION("SPI support for TPS65912 chip family mfd");

MODULE_LICENSE("GPL");