mfd: arizona: Updates for v3.8

The following changes since commit f4a75d2eb7b1e2206094b901be09adb31ba63681:

Linux 3.7-rc6 (2012-11-16 17:42:40 -0800)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc.git tags/mfd-arizona-3.8

for you to fetch changes up to ffe70f1e526c43b9bb56c9b4408b6e39d2b8473c:

mfd: wm5102: Mark some more status registers as volatile (2012-11-20 13:21:54 +0900)

----------------------------------------------------------------
mfd: arizona: Enhancements for v3.8

These have all previously been posted.

----------------------------------------------------------------
Mark Brown (2):
mfd: wm5102: Update maximum register
mfd: wm5102: Mark some more status registers as volatile

 drivers/mfd/wm5102-tables.c |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

---
 drivers/mfd/wm5102-tables.c |    3 +++
 1 file changed, 3 insertions(+)

index ffeba98..1ade455 100644
@@ -2331,6 +2331,9 @@ static bool wm5102_volatile_register(struct device *dev, unsigned int reg)
 	case ARIZONA_SOFTWARE_RESET:
 	case ARIZONA_DEVICE_REVISION:
 	case ARIZONA_OUTPUT_STATUS_1:
+	case ARIZONA_RAW_OUTPUT_STATUS_1:
+	case ARIZONA_SLIMBUS_RX_PORT_STATUS:
+	case ARIZONA_SLIMBUS_TX_PORT_STATUS:
 	case ARIZONA_SAMPLE_RATE_1_STATUS:
 	case ARIZONA_SAMPLE_RATE_2_STATUS:
 	case ARIZONA_SAMPLE_RATE_3_STATUS:

1.7.10.4

The DSP memories are mapped into the register map, make them readable and writable by updating max_register appropriately.

---
 drivers/mfd/wm5102-tables.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

index 01b9255..ffeba98 100644
@@ -2369,12 +2369,14 @@ static bool wm5102_volatile_register(struct device *dev, unsigned int reg)
 	}
 }
 
+#define WM5102_MAX_REGISTER 0x1a8fff
+
 const struct regmap_config wm5102_spi_regmap = {
 	.reg_bits = 32,
 	.pad_bits = 16,
 	.val_bits = 16,
 
-	.max_register = ARIZONA_DSP1_STATUS_2,
+	.max_register = WM5102_MAX_REGISTER,
 	.readable_reg = wm5102_readable_register,
 	.volatile_reg = wm5102_volatile_register,
 

@@ -2388,7 +2390,7 @@ const struct regmap_config wm5102_i2c_regmap = {
 	.reg_bits = 32,
 	.val_bits = 16,
 
-	.max_register = ARIZONA_DSP1_STATUS_2,
+	.max_register = WM5102_MAX_REGISTER,
 	.readable_reg = wm5102_readable_register,
 	.volatile_reg = wm5102_volatile_register,
 

1.7.10.4

Hi mark

Both patches applied to my for-next branch, thanks.

Cheers,
Samuel.

Intel Open Source Technology Centre
http://oss.intel.com/