Merge branch develop-3.10

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
Conflicts:
	drivers/video/rockchip/rk_fb.c

diff --cc drivers/usb/dwc_otg_310/dwc_otg_hcd_linux.c
Simple merge

diff --cc drivers/usb/host/ehci-rockchip.c
Simple merge

diff --cc drivers/video/rockchip/rk_fb.c
index f568c47ef165f0719df6a6160cae31b5c1d1cec5,837e2c34dfa693f7a3d2363a061c0aa73baf878f..25fa86b2a097f4d1feb0a4588ebf93c8c07cab7b
mode 100644,100755..100644
--- 1/drivers/video/rockchip/rk_fb.c
--- 2/drivers/video/rockchip/rk_fb.c
+++ b/drivers/video/rockchip/rk_fb.c
@@@ -3101,12 -3104,11 +3103,14 @@@ int rk_fb_switch_screen(struct rk_scree
  
                        if (dev_drv->ops->dsp_black)
                                dev_drv->ops->dsp_black(dev_drv, 0);
-               } else if (rk_fb->num_lcdc > 1 && rk_fb->disp_policy == DISPLAY_POLICY_BOX) {
 +                      if ((dev_drv->ops->backlight_close) &&
 +                          (rk_fb->disp_policy != DISPLAY_POLICY_BOX))
 +                              dev_drv->ops->backlight_close(dev_drv, 0);
+               } else if (rk_fb->num_lcdc > 1) {
                        /* If there is more than one lcdc device, we disable
                           the layer which attached to this device */
+                       dev_drv->suspend_flag = 1;
+                       flush_kthread_worker(&dev_drv->update_regs_worker);
                        for (i = 0; i < dev_drv->lcdc_win_num; i++) {
                                if (dev_drv->win[i] && dev_drv->win[i]->state)
                                        dev_drv->ops->open(dev_drv, i, 0);