From 1cf1e6fd429d87f6a181fabb4fa8659821ef1424 Mon Sep 17 00:00:00 2001 From: hwg Date: Fri, 9 Jan 2015 15:23:50 +0800 Subject: [PATCH 1/2] rk312x UART0_SOUT UART0_SIN default pull down disable may case bt can't open problem --- arch/arm/boot/dts/rk312x-pinctrl.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/rk312x-pinctrl.dtsi b/arch/arm/boot/dts/rk312x-pinctrl.dtsi index 55919bc0013..bea2fe80ced 100755 --- 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 = , ; - rockchip,pull = ; + rockchip,pull = ; }; From d9a7d4e949787da59950ae390c6d0ce385a2cdc7 Mon Sep 17 00:00:00 2001 From: zwl Date: Fri, 9 Jan 2015 16:34:08 +0800 Subject: [PATCH 2/2] rk fb: remove map fb which from android to economize vmalloc space Signed-off-by: zwl --- drivers/video/rockchip/rk_fb.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/video/rockchip/rk_fb.c b/drivers/video/rockchip/rk_fb.c index 041a40b9eef..134e1a7e186 100755 --- 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