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

diff --git a/arch/arm/boot/dts/rk312x-pinctrl.dtsi b/arch/arm/boot/dts/rk312x-pinctrl.dtsi
index 55919bc001314fac7708c8cf1b2698f29d5316f3..bea2fe80cedc02021df19ab88e7d29f6971eda4e 100755 (executable)
--- 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
index 041a40b9eefa47d1d0736da774a7bd15ef96330a..134e1a7e1862cc90229b87970d62a66e4d64feae 100755 (executable)
--- 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