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

Commit 94be70d4 authored by Linus Walleij's avatar Linus Walleij Committed by Samuel Ortiz
Browse files

mfd: Break out ab5500 debugfs code 



This breaks the debugfs portions of the AB5500 driver into its own
file. Split off a _raw function to access registers since we don't
want to expose a generically named function globally. Move all
required data structures to a shared ab5500-core.h file.

Cc: Mattias 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 b7ddac53

drivers/mfd/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -572,6 +572,14 @@ config AB5500_CORE 
	  chip. This connects to the db5500 chip via the I2C bus via PRCMU.

	  This chip embeds various other multimedia funtionalities as well.



config AB5500_DEBUG

	bool "Enable debug info via debugfs"

	depends on AB5500_CORE && DEBUG_FS

	default y if DEBUG_FS

	help

	  Select this option if you want debug information from the AB5500

	  using the debug filesystem, debugfs.



config AB8500_CORE

	bool "ST-Ericsson AB8500 Mixed Signal Power Management chip"

	depends on GENERIC_HARDIRQS && ABX500_CORE

drivers/mfd/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ obj-$(CONFIG_AB3100_CORE) += ab3100-core.o 
obj-$(CONFIG_AB3100_OTP)	+= ab3100-otp.o

obj-$(CONFIG_AB3550_CORE)	+= ab3550-core.o

obj-$(CONFIG_AB5500_CORE)	+= ab5500-core.o

obj-$(CONFIG_AB5500_DEBUG)	+= ab5500-debugfs.o

obj-$(CONFIG_AB8500_CORE)	+= ab8500-core.o ab8500-sysctrl.o

obj-$(CONFIG_AB8500_DEBUG)	+= ab8500-debugfs.o

obj-$(CONFIG_AB8500_GPADC)	+= ab8500-gpadc.o

drivers/mfd/ab5500-core.c

+17 −890

File changed.

Preview size limit exceeded, changes collapsed.

drivers/mfd/ab5500-core.h

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

 * Copyright (C) 2011 ST-Ericsson

 * License terms: GNU General Public License (GPL) version 2

 * Shared definitions and data structures for the AB5500 MFD driver

 */



/* Read/write operation values. */

#define AB5500_PERM_RD (0x01)

#define AB5500_PERM_WR (0x02)



/* Read/write permissions. */

#define AB5500_PERM_RO (AB5500_PERM_RD)

#define AB5500_PERM_RW (AB5500_PERM_RD | AB5500_PERM_WR)



#define AB5500_MASK_BASE (0x60)

#define AB5500_MASK_END (0x79)

#define AB5500_CHIP_ID (0x20)



/**

 * struct ab5500_reg_range

 * @first: the first address of the range

 * @last: the last address of the range

 * @perm: access permissions for the range

 */

struct ab5500_reg_range {

	u8 first;

	u8 last;

	u8 perm;

};



/**

 * struct ab5500_i2c_ranges

 * @count: the number of ranges in the list

 * @range: the list of register ranges

 */

struct ab5500_i2c_ranges {

	u8 nranges;

	u8 bankid;

	const struct ab5500_reg_range *range;

};



/**

 * struct ab5500_i2c_banks

 * @count: the number of ranges in the list

 * @range: the list of register ranges

 */

struct ab5500_i2c_banks {

	u8 nbanks;

	const struct ab5500_i2c_ranges *bank;

};



/**

 * struct ab5500_bank

 * @slave_addr: I2C slave_addr found in AB5500 specification

 * @name: Documentation name of the bank. For reference

 */

struct ab5500_bank {

	u8 slave_addr;

	const char *name;

};



static const struct ab5500_bank bankinfo[AB5500_NUM_BANKS] = {

	[AB5500_BANK_VIT_IO_I2C_CLK_TST_OTP] = {

		AB5500_ADDR_VIT_IO_I2C_CLK_TST_OTP, "VIT_IO_I2C_CLK_TST_OTP"},

	[AB5500_BANK_VDDDIG_IO_I2C_CLK_TST] = {

		AB5500_ADDR_VDDDIG_IO_I2C_CLK_TST, "VDDDIG_IO_I2C_CLK_TST"},

	[AB5500_BANK_VDENC] = {AB5500_ADDR_VDENC, "VDENC"},

	[AB5500_BANK_SIM_USBSIM] = {AB5500_ADDR_SIM_USBSIM, "SIM_USBSIM"},

	[AB5500_BANK_LED] = {AB5500_ADDR_LED, "LED"},

	[AB5500_BANK_ADC] = {AB5500_ADDR_ADC, "ADC"},

	[AB5500_BANK_RTC] = {AB5500_ADDR_RTC, "RTC"},

	[AB5500_BANK_STARTUP] = {AB5500_ADDR_STARTUP, "STARTUP"},

	[AB5500_BANK_DBI_ECI] = {AB5500_ADDR_DBI_ECI, "DBI-ECI"},

	[AB5500_BANK_CHG] = {AB5500_ADDR_CHG, "CHG"},

	[AB5500_BANK_FG_BATTCOM_ACC] = {

		AB5500_ADDR_FG_BATTCOM_ACC, "FG_BATCOM_ACC"},

	[AB5500_BANK_USB] = {AB5500_ADDR_USB, "USB"},

	[AB5500_BANK_IT] = {AB5500_ADDR_IT, "IT"},

	[AB5500_BANK_VIBRA] = {AB5500_ADDR_VIBRA, "VIBRA"},

	[AB5500_BANK_AUDIO_HEADSETUSB] = {

		AB5500_ADDR_AUDIO_HEADSETUSB, "AUDIO_HEADSETUSB"},

};



int ab5500_get_register_interruptible_raw(struct ab5500 *ab, u8 bank, u8 reg,

	u8 *value);

int ab5500_mask_and_set_register_interruptible_raw(struct ab5500 *ab, u8 bank,

	u8 reg, u8 bitmask, u8 bitvalues);

drivers/mfd/ab5500-debugfs.c

0 → 100644
+806 −0

File added.

Preview size limit exceeded, changes collapsed.