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

Commit adceed62 authored by Mattias Wallin's avatar Mattias Wallin Committed by Samuel Ortiz
Browse files

mfd: ab8500 chip revision 3.0 support 



This patch adds support for ab8500 chip revision cut 3.0.
Also rephrased from Changes to Author in the header.

Signed-off-by: default avatarMattias Wallin <mattias.wallin@stericsson.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent e9300066

drivers/mfd/ab8500-core.c

+5 −4
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
 * License Terms: GNU General Public License v2

 * Author: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>

 * Author: Rabin Vincent <rabin.vincent@stericsson.com>

 * Changes: Mattias Wallin <mattias.wallin@stericsson.com>

 * Author: Mattias Wallin <mattias.wallin@stericsson.com>

 */



#include <linux/kernel.h>
@@ -686,9 +686,10 @@ int __devinit ab8500_init(struct ab8500 *ab8500) 
	 * 0x10 - Cut 1.0

	 * 0x11 - Cut 1.1

	 * 0x20 - Cut 2.0

	 * 0x30 - Cut 3.0

	 */

	if (value == 0x0 || value == 0x10 || value == 0x11 || value == 0x20) {

		ab8500->revision = value;

	if (value == 0x0 || value == 0x10 || value == 0x11 || value == 0x20 ||

		value == 0x30) {

		dev_info(ab8500->dev, "detected chip, revision: %#x\n", value);

	} else {

		dev_err(ab8500->dev, "unknown chip, revision: %#x\n", value);
@@ -764,6 +765,6 @@ int __devexit ab8500_exit(struct ab8500 *ab8500) 
	return 0;

}



MODULE_AUTHOR("Srinidhi Kasagar, Rabin Vincent");

MODULE_AUTHOR("Mattias Wallin, Srinidhi Kasagar, Rabin Vincent");

MODULE_DESCRIPTION("AB8500 MFD core");

MODULE_LICENSE("GPL v2");

include/linux/mfd/ab8500.h

+2 −2
Original line number Diff line number Diff line
@@ -111,8 +111,8 @@ 
 * @dev: parent device

 * @lock: read/write operations lock

 * @irq_lock: genirq bus lock

 * @revision: chip revision

 * @irq: irq line

 * @chip_id: chip revision id

 * @write: register write

 * @read: register read

 * @rx_buf: rx buf for SPI
@@ -124,7 +124,7 @@ struct ab8500 { 
	struct device	*dev;

	struct mutex	lock;

	struct mutex	irq_lock;

	int		revision;



	int		irq_base;

	int		irq;

	u8		chip_id;