From c163e406135e50b52a41bba74b764f1d110ba9fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philippe=20R=C3=A9tornaz?= <philippe.retornaz@epfl.ch>
Date: Tue, 29 May 2012 11:06:28 +0200
Subject: [PATCH] --- yaml --- r: 311857 b: refs/heads/master c:
 44716ec2f423da1965d444cd349b14b994998299 h: refs/heads/master i:   311855:
 044b23cdb7423e1b4e3cfe7ab1b50be6399446de v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/mfd/mc13xxx-spi.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 43b4dfaf3be1..bac67be24167 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 00ba81c15276cd572c5a68b07936de4f1ae8597a
+refs/heads/master: 44716ec2f423da1965d444cd349b14b994998299
diff --git a/trunk/drivers/mfd/mc13xxx-spi.c b/trunk/drivers/mfd/mc13xxx-spi.c
index 3fcdab3eb8eb..5d1969f67d82 100644
--- a/trunk/drivers/mfd/mc13xxx-spi.c
+++ b/trunk/drivers/mfd/mc13xxx-spi.c
@@ -49,6 +49,7 @@ static struct regmap_config mc13xxx_regmap_spi_config = {
 	.reg_bits = 7,
 	.pad_bits = 1,
 	.val_bits = 24,
+	.write_flag_mask = 0x80,
 
 	.max_register = MC13XXX_NUMREGS,
 
@@ -73,7 +74,6 @@ static int mc13xxx_spi_probe(struct spi_device *spi)
 
 	dev_set_drvdata(&spi->dev, mc13xxx);
 	spi->mode = SPI_MODE_0 | SPI_CS_HIGH;
-	spi->bits_per_word = 32;
 
 	mc13xxx->dev = &spi->dev;
 	mutex_init(&mc13xxx->lock);