From 342badba9e3fabdcb2393141918646ddfddc7ecb Mon Sep 17 00:00:00 2001
From: Magnus Damm <damm@opensource.se>
Date: Tue, 26 Mar 2013 22:49:59 +0900
Subject: [PATCH] --- yaml --- r: 373849 b: refs/heads/master c:
 f365bfcc8723e41b9110c5e7eb292a39b26ad8ba h: refs/heads/master i:   373847:
 e5667a0f47163659fd3c5e4d0c826dc08b94b94e v: v3

---
 [refs]                                           |  2 +-
 .../arm/mach-shmobile/include/mach/r8a73a4.h     |  2 +-
 trunk/drivers/pinctrl/sh-pfc/pfc-r8a73a4.c       | 16 ++++++++++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b6b0a105abca..4d798e19f44b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c98f6c21afaf4692886cea0f5b63ead9945d85cc
+refs/heads/master: f365bfcc8723e41b9110c5e7eb292a39b26ad8ba
diff --git a/trunk/arch/arm/mach-shmobile/include/mach/r8a73a4.h b/trunk/arch/arm/mach-shmobile/include/mach/r8a73a4.h
index f0b1b4a962b3..2d4af4af3634 100644
--- a/trunk/arch/arm/mach-shmobile/include/mach/r8a73a4.h
+++ b/trunk/arch/arm/mach-shmobile/include/mach/r8a73a4.h
@@ -86,7 +86,7 @@ enum {
 	GPIO_PORT325, GPIO_PORT326, GPIO_PORT327, GPIO_PORT328, GPIO_PORT329,
 
 	/* Port0 */
-	GPIO_FN_LCDD0,
+	GPIO_FN_LCDD0 = 330,
 	GPIO_FN_PDM2_CLK_0,
 	GPIO_FN_DU0_DR0,
 	GPIO_FN_IRQ0,
diff --git a/trunk/drivers/pinctrl/sh-pfc/pfc-r8a73a4.c b/trunk/drivers/pinctrl/sh-pfc/pfc-r8a73a4.c
index 47d75d5548eb..5dd68fb96274 100644
--- a/trunk/drivers/pinctrl/sh-pfc/pfc-r8a73a4.c
+++ b/trunk/drivers/pinctrl/sh-pfc/pfc-r8a73a4.c
@@ -1424,6 +1424,20 @@ static struct sh_pfc_pin pinmux_pins[] = {
 	GPIO_PORT_ALL(),
 };
 
+static const struct pinmux_range pinmux_ranges[] = {
+	{.begin = 0, .end = 30,},
+	{.begin = 32, .end = 40,},
+	{.begin = 64, .end = 85,},
+	{.begin = 96, .end = 126,},
+	{.begin = 128, .end = 134,},
+	{.begin = 160, .end = 178,},
+	{.begin = 192, .end = 222,},
+	{.begin = 224, .end = 250,},
+	{.begin = 256, .end = 283,},
+	{.begin = 288, .end = 308,},
+	{.begin = 320, .end = 329,},
+};
+
 #define PINMUX_FN_BASE	ARRAY_SIZE(pinmux_pins)
 
 static const struct pinmux_func pinmux_func_gpios[] = {
@@ -2815,6 +2829,8 @@ const struct sh_pfc_soc_info r8a73a4_pinmux_info = {
 
 	.pins = pinmux_pins,
 	.nr_pins = ARRAY_SIZE(pinmux_pins),
+	.ranges = pinmux_ranges,
+	.nr_ranges = ARRAY_SIZE(pinmux_ranges),
 	.func_gpios = pinmux_func_gpios,
 	.nr_func_gpios = ARRAY_SIZE(pinmux_func_gpios),