From: zyw <zyw@rock-chips.com>
Date: Sat, 26 Feb 2011 02:49:09 +0000 (+0800)
Subject: update fb for win1 buf -1
X-Git-Tag: firefly_0821_release~10748
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ba3f49dd47f5ef6af382e69e1cc3fba4dd70a382;p=firefly-linux-kernel-4.4.55.git

update fb for win1 buf -1
---

diff --git a/arch/arm/mach-rk29/board-malata.c b/arch/arm/mach-rk29/board-malata.c
index caca88cfb8db..a9a4e4dde9c0 100644
--- a/arch/arm/mach-rk29/board-malata.c
+++ b/arch/arm/mach-rk29/board-malata.c
@@ -231,7 +231,7 @@ static struct resource rk29_fb_resource[] = {
 	[2] = {
 	    .name   = "win1 buf",
         .start  = MEM_FB_BASE,
-        .end    = MEM_FB_BASE + MEM_FB_SIZE,
+        .end    = MEM_FB_BASE + MEM_FB_SIZE - 1,
         .flags  = IORESOURCE_MEM,
     },
 };
@@ -617,7 +617,7 @@ static struct i2c_board_info __initdata board_i2c2_devices[] = {
      .platform_data  = &sintek_touch_info,
   },
 
-#endif 
+#endif
 };
 #endif
 
@@ -633,7 +633,7 @@ static struct i2c_board_info __initdata board_i2c3_devices[] = {
      .platform_data  = &synaptics_touchkey_info,
   },
 
-#endif 
+#endif
 };
 #endif
 
@@ -694,7 +694,7 @@ static struct i2c_board_info __initdata board_i2c3_devices[] = {
 #define SENSOR_RESETACTIVE_LEVEL_1 RK29_CAM_RESETACTIVE_L
 #define SENSOR_POWERDNACTIVE_LEVEL_1 RK29_CAM_POWERDNACTIVE_H
 #define SENSOR_FLASHACTIVE_LEVEL_1 RK29_CAM_FLASHACTIVE_L
-#endif 
+#endif
 
 static int rk29_sensor_io_init(void);
 static int rk29_sensor_io_deinit(int sensor);
@@ -1094,7 +1094,7 @@ static void rk29_backlight_close(void){
    gpio_direction_output(FB_DISPLAY_ON_PIN, 0);
    gpio_set_value(FB_DISPLAY_ON_PIN, GPIO_LOW);
    gpio_free(FB_DISPLAY_ON_PIN);
-   
+
    rk29_mux_api_set(PWM_MUX_NAME, PWM_MUX_MODE);
    ret = gpio_request(PWM_GPIO_PIN, NULL);
    if(ret != 0)
diff --git a/arch/arm/mach-rk29/board-rk29-aigo.c b/arch/arm/mach-rk29/board-rk29-aigo.c
index e0fb50d881e5..6dc091759b79 100644
--- a/arch/arm/mach-rk29/board-rk29-aigo.c
+++ b/arch/arm/mach-rk29/board-rk29-aigo.c
@@ -213,7 +213,7 @@ struct resource rk29_fb_resource[] = {
 	[2] = {
 	    .name   = "win1 buf",
         .start  = MEM_FB_BASE,
-        .end    = MEM_FB_BASE + MEM_FB_SIZE,
+        .end	  = MEM_FB_BASE + MEM_FB_SIZE - 1,
         .flags  = IORESOURCE_MEM,
     },
 };
diff --git a/arch/arm/mach-rk29/board-rk29-winaccord.c b/arch/arm/mach-rk29/board-rk29-winaccord.c
index 39cc2e81640c..e091ecef29e6 100644
--- a/arch/arm/mach-rk29/board-rk29-winaccord.c
+++ b/arch/arm/mach-rk29/board-rk29-winaccord.c
@@ -213,7 +213,7 @@ struct resource rk29_fb_resource[] = {
 	[2] = {
 	    .name   = "win1 buf",
         .start  = MEM_FB_BASE,
-        .end    = MEM_FB_BASE + MEM_FB_SIZE,
+        .end    = MEM_FB_BASE + MEM_FB_SIZE - 1,
         .flags  = IORESOURCE_MEM,
     },
 };
diff --git a/arch/arm/mach-rk29/board-rk29sdk.c b/arch/arm/mach-rk29/board-rk29sdk.c
index 5217787af3a9..7290ba847f3e 100755
--- a/arch/arm/mach-rk29/board-rk29sdk.c
+++ b/arch/arm/mach-rk29/board-rk29sdk.c
@@ -231,7 +231,7 @@ static struct resource rk29_fb_resource[] = {
 	[2] = {
 	    .name   = "win1 buf",
         .start  = MEM_FB_BASE,
-        .end    = MEM_FB_BASE + MEM_FB_SIZE,
+        .end    = MEM_FB_BASE + MEM_FB_SIZE - 1,
         .flags  = IORESOURCE_MEM,
     },
 };
diff --git a/drivers/video/rk29_fb.c b/drivers/video/rk29_fb.c
index 064dfa702be4..05428474c863 100755
--- a/drivers/video/rk29_fb.c
+++ b/drivers/video/rk29_fb.c
@@ -2163,7 +2163,7 @@ static int __init rk29fb_probe (struct platform_device *pdev)
         goto release_win1fb;
     }
     inf->fb0->fix.smem_start = res->start;
-    inf->fb0->fix.smem_len = res->end - res->start;
+    inf->fb0->fix.smem_len = res->end - res->start + 1;
     inf->fb0->screen_base = ioremap(res->start, inf->fb0->fix.smem_len);
     memset(inf->fb0->screen_base, 0, inf->fb0->fix.smem_len);