From 3a2f86ebb41a75a86e429df937e896b48138d1cc Mon Sep 17 00:00:00 2001
From: Magnus Damm <damm@opensource.se>
Date: Wed, 14 Dec 2011 01:01:14 +0900
Subject: [PATCH] --- yaml --- r: 283634 b: refs/heads/master c:
 e499ada829cf769ac6f16627cd9f09b855a7fd6d h: refs/heads/master v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/sh/pfc.c       | 22 ++++++++++------------
 trunk/include/linux/sh_pfc.h |  2 ++
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 83bc4ebc4bb4..d9d5349f9956 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f78a26f55b2438c439609fc90b473f7f08f5b697
+refs/heads/master: e499ada829cf769ac6f16627cd9f09b855a7fd6d
diff --git a/trunk/drivers/sh/pfc.c b/trunk/drivers/sh/pfc.c
index f975f4a33439..522c6c46d1be 100644
--- a/trunk/drivers/sh/pfc.c
+++ b/trunk/drivers/sh/pfc.c
@@ -210,7 +210,7 @@ static void write_config_reg(struct pinmux_info *gpioc,
 			     unsigned long field, unsigned long value)
 {
 	void __iomem *mapped_reg;
-	unsigned long mask, pos;
+	unsigned long mask, pos, data;
 
 	config_reg_helper(gpioc, crp, field, &mapped_reg, &mask, &pos);
 
@@ -221,17 +221,15 @@ static void write_config_reg(struct pinmux_info *gpioc,
 	mask = ~(mask << pos);
 	value = value << pos;
 
-	switch (crp->reg_width) {
-	case 8:
-		iowrite8((ioread8(mapped_reg) & mask) | value, mapped_reg);
-		break;
-	case 16:
-		iowrite16((ioread16(mapped_reg) & mask) | value, mapped_reg);
-		break;
-	case 32:
-		iowrite32((ioread32(mapped_reg) & mask) | value, mapped_reg);
-		break;
-	}
+	data = gpio_read_raw_reg(mapped_reg, crp->reg_width);
+	data &= mask;
+	data |= value;
+
+	if (gpioc->unlock_reg)
+		gpio_write_raw_reg(pfc_phys_to_virt(gpioc, gpioc->unlock_reg),
+				   32, ~data);
+
+	gpio_write_raw_reg(mapped_reg, crp->reg_width, data);
 }
 
 static int setup_data_reg(struct pinmux_info *gpioc, unsigned gpio)
diff --git a/trunk/include/linux/sh_pfc.h b/trunk/include/linux/sh_pfc.h
index 84538c42d64a..5c15aed9c4b2 100644
--- a/trunk/include/linux/sh_pfc.h
+++ b/trunk/include/linux/sh_pfc.h
@@ -116,6 +116,8 @@ struct pinmux_info {
 	unsigned int num_resources;
 	struct pfc_window *window;
 
+	unsigned long unlock_reg;
+
 	struct gpio_chip chip;
 };