From 551fcbfe9f9cb249bb6771c7b9ffec7c61d17225 Mon Sep 17 00:00:00 2001
From: luowei <lw@rock-chips.com>
Date: Fri, 28 Mar 2014 17:13:25 +0800
Subject: [PATCH] delete RK3288_GRF_GPIO0_D_IOMUX according to new datasheet

---
 arch/arm/boot/dts/rk3288-pinctrl.dtsi         |  2 +-
 drivers/pinctrl/pinctrl-rockchip.c            |  7 +++++--
 include/dt-bindings/pinctrl/rockchip-rk3288.h | 15 ---------------
 include/linux/rockchip/grf.h                  |  1 -
 4 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/arch/arm/boot/dts/rk3288-pinctrl.dtsi b/arch/arm/boot/dts/rk3288-pinctrl.dtsi
index 5fd8547cd815..db96403a29d8 100755
--- a/arch/arm/boot/dts/rk3288-pinctrl.dtsi
+++ b/arch/arm/boot/dts/rk3288-pinctrl.dtsi
@@ -17,7 +17,7 @@
 		gpio0: gpio0@ff750000 {
 			compatible = "rockchip,rk3288-gpio-bank0";
 			reg =	<0xff750000 0x100>,
-				<0xff730084 0x10>,
+				<0xff730084 0x0c>,
 		      		<0xff730064 0x0c>,
 				<0xff730070 0x0c>;
 			reg-names = "base", "mux_bank0", "pull_bank0", "drv_bank0";
diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c
index 4614275677f1..b875374722c0 100755
--- a/drivers/pinctrl/pinctrl-rockchip.c
+++ b/drivers/pinctrl/pinctrl-rockchip.c
@@ -346,7 +346,7 @@ static ssize_t  pinctrl_show_regs(struct file *file, char __user *user_buf,
 		len += snprintf(buf + len, PINCTRL_REGS_BUFSIZE - len,
 				"=================================\n");			
 
-		for(i=0; i<0x10; i=i+4)
+		for(i=0; i<0x0c; i=i+4)
 		{
 			value = readl_relaxed(bank0->reg_mux_bank0 + i);
 			len += snprintf(buf + len, PINCTRL_REGS_BUFSIZE - len, "MUX_BANK0[0x%p+0x%x]=0x%08x\n",(int *)bank0->reg_mux_bank0, i, value);
@@ -654,7 +654,10 @@ static int rockchip_set_rk32_mux(struct rockchip_pin_bank *bank, int pin, int mu
 		case 0:
 		//pmu
 		reg = bank->reg_mux_bank0;
-		bits = 2;	
+		if((m.mux.goff == 0x0a) || (m.mux.goff == 0x0b) || (m.mux.goff == 0x0c))
+		{
+			bits = 2;
+		}
 		rk32_iomux_bit_op(bank, pin, mux, reg, bits);
 		break;
 		
diff --git a/include/dt-bindings/pinctrl/rockchip-rk3288.h b/include/dt-bindings/pinctrl/rockchip-rk3288.h
index 1d70f1f3cfbd..64afe3e61021 100755
--- a/include/dt-bindings/pinctrl/rockchip-rk3288.h
+++ b/include/dt-bindings/pinctrl/rockchip-rk3288.h
@@ -54,21 +54,6 @@
 #define GPIO0_C2 0x0c20
 
 
-
-/* GPIO0_D */
-#define GPIO0_D0 0x0d00
-#define LCDC0_HSYNC_GPIO0D 0x0d01
-
-#define GPIO0_D1 0x0d10
-#define LCDC0_VSYNC_GPIO0D 0x0d11
-
-#define GPIO0_D2 0x0d20
-#define LCDC0_DEN_GPIO0D 0x0d21
-
-#define GPIO0_D3 0x0d30
-#define LCDC0_DCLK_GPIO0D 0x0d31
-
-
 /* GPIO1_A */
 /* GPIO1_B */
 /* GPIO1_C */
diff --git a/include/linux/rockchip/grf.h b/include/linux/rockchip/grf.h
index 15a2c580b449..681919768552 100755
--- a/include/linux/rockchip/grf.h
+++ b/include/linux/rockchip/grf.h
@@ -110,7 +110,6 @@
 #define RK3288_GRF_GPIO0_A_IOMUX	0x0084
 #define RK3288_GRF_GPIO0_B_IOMUX	0x0088
 #define RK3288_GRF_GPIO0_C_IOMUX	0x008c
-#define RK3288_GRF_GPIO0_D_IOMUX	0x0090
 
 #define RK3288_GRF_GPIO1D_IOMUX         0x000c
 #define RK3288_GRF_GPIO2A_IOMUX         0x0010
-- 
2.34.1