Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into xxh_d…

…evelop
geekboxzone · Jan 9, 2015 · bacbbaa · bacbbaa
2 parents 81feaac + d9a7d4e
commit bacbbaa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/arch/arm/boot/dts/rk312x-pinctrl.dtsi b/arch/arm/boot/dts/rk312x-pinctrl.dtsi
@@ -96,7 +96,7 @@
 			uart0_xfer: uart0-xfer {
 				rockchip,pins = <UART0_SIN>,
 						<UART0_SOUT>;
-				rockchip,pull = <VALUE_PULL_DEFAULT>;
+				rockchip,pull = <VALUE_PULL_UPDOWN_DISABLE>;
 
 
 			};

diff --git a/drivers/video/rockchip/rk_fb.c b/drivers/video/rockchip/rk_fb.c
@@ -1632,11 +1632,9 @@ void rk_fb_free_dma_buf(struct rk_lcdc_driver *dev_drv,
 						area_data->ion_handle);
 		}
 #endif
-		if (area_data->ion_handle != NULL) {
-			ion_unmap_kernel(rk_fb->ion_client,
-					 area_data->ion_handle);
+		if (area_data->ion_handle != NULL)
 			ion_free(rk_fb->ion_client, area_data->ion_handle);
-		}
+
 		if (area_data->acq_fence)
 			sync_fence_put(area_data->acq_fence);
 	}
@@ -2203,8 +2201,6 @@ static int rk_fb_set_win_buffer(struct fb_info *info,
 					/*return -EINVAL; */
 					break;
 				}
-				fbi->screen_base =
-				    ion_map_kernel(rk_fb->ion_client, hdl);
 				reg_win_data->area_num++;
 				reg_win_data->reg_area_data[i].ion_handle = hdl;
 #ifndef CONFIG_ROCKCHIP_IOMMU