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

Commit bc628fd1 authored by Mattias Nilsson's avatar Mattias Nilsson Committed by Samuel Ortiz
Browse files

mfd: Make use of the ab8500 firmware read-modify-write service 



This patch updates the AB8500 driver to make use of the I2C
read-modify-write service in the PRCMU firmware.

Signed-off-by: default avatarMattias Nilsson <mattias.i.nilsson@stericsson.com>
Reviewed-by: default avatarMattias Wallin <mattias.wallin@stericsson.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 3c3e4898

drivers/mfd/ab8500-core.c

+23 −14
Original line number Diff line number Diff line
@@ -201,13 +201,15 @@ static int mask_and_set_register_interruptible(struct ab8500 *ab8500, u8 bank, 
	u8 reg, u8 bitmask, u8 bitvalues)

{

	int ret;

	u8 data;

	/* put the u8 bank and u8 reg together into a an u16.

	 * bank on higher 8 bits and reg in lower */

	u16 addr = ((u16)bank) << 8 | reg;



	mutex_lock(&ab8500->lock);



	if (ab8500->write_masked == NULL) {

		u8 data;



		ret = ab8500->read(ab8500, addr);

		if (ret < 0) {

			dev_err(ab8500->dev, "failed to read reg %#x: %d\n",
@@ -223,7 +225,14 @@ static int mask_and_set_register_interruptible(struct ab8500 *ab8500, u8 bank, 
			dev_err(ab8500->dev, "failed to write reg %#x: %d\n",

				addr, ret);



	dev_vdbg(ab8500->dev, "mask: addr %#x => data %#x\n", addr, data);

		dev_vdbg(ab8500->dev, "mask: addr %#x => data %#x\n", addr,

			data);

		goto out;

	}

	ret = ab8500->write_masked(ab8500, addr, bitmask, bitvalues);

	if (ret < 0)

		dev_err(ab8500->dev, "failed to modify reg %#x: %d\n", addr,

			ret);

out:

	mutex_unlock(&ab8500->lock);

	return ret;

drivers/mfd/ab8500-i2c.c

+14 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
#include <linux/module.h>

#include <linux/platform_device.h>

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

#include <linux/mfd/db8500-prcmu.h>

#include <linux/mfd/dbx500-prcmu.h>



static int ab8500_i2c_write(struct ab8500 *ab8500, u16 addr, u8 data)

{
@@ -23,6 +23,18 @@ static int ab8500_i2c_write(struct ab8500 *ab8500, u16 addr, u8 data) 
	return ret;

}



static int ab8500_i2c_write_masked(struct ab8500 *ab8500, u16 addr, u8 mask,

	u8 data)

{

	int ret;



	ret = prcmu_abb_write_masked((u8)(addr >> 8), (u8)(addr & 0xFF), &data,

		&mask, 1);

	if (ret < 0)

		dev_err(ab8500->dev, "prcmu i2c error %d\n", ret);

	return ret;

}



static int ab8500_i2c_read(struct ab8500 *ab8500, u16 addr)

{

	int ret;
@@ -59,6 +71,7 @@ static int __devinit ab8500_i2c_probe(struct platform_device *plf) 


	ab8500->read = ab8500_i2c_read;

	ab8500->write = ab8500_i2c_write;

	ab8500->write_masked = ab8500_i2c_write_masked;



	platform_set_drvdata(plf, ab8500);

include/linux/mfd/abx500/ab8500.h

+4 −2
Original line number Diff line number Diff line
@@ -217,6 +217,7 @@ enum ab8500_version { 
 * @version: chip version id (e.g. ab8500 or ab9540)

 * @chip_id: chip revision id

 * @write: register write

 * @write_masked: masked register write

 * @read: register read

 * @rx_buf: rx buf for SPI

 * @tx_buf: tx buf for SPI
@@ -236,8 +237,9 @@ struct ab8500 { 
	enum ab8500_version version;

	u8		chip_id;



	int (*write) (struct ab8500 *a8500, u16 addr, u8 data);

	int (*read) (struct ab8500 *a8500, u16 addr);

	int (*write)(struct ab8500 *ab8500, u16 addr, u8 data);

	int (*write_masked)(struct ab8500 *ab8500, u16 addr, u8 mask, u8 data);

	int (*read)(struct ab8500 *ab8500, u16 addr);



	unsigned long	tx_buf[4];

	unsigned long	rx_buf[4];