Merge tag 'JH7110_515_SDK_v3.1.0' into vf2-515-devel

version JH7110_515_SDK_v3.1.0 for JH7110 EVB board

diff --cc arch/riscv/boot/dts/starfive/jh7110.dtsi
Simple merge

diff --cc drivers/gpu/drm/verisilicon/starfive_drm_dsi.c
index 78ac8b0,6cb8ba3..7437230
mode 100755,100644..100644
--- 1/drivers/gpu/drm/verisilicon/starfive_drm_dsi.c
--- 2/drivers/gpu/drm/verisilicon/starfive_drm_dsi.c
+++ b/drivers/gpu/drm/verisilicon/starfive_drm_dsi.c

diff --cc drivers/gpu/drm/verisilicon/starfive_drm_seeedpanel.c
index 05c5701,d4b5ad2..44b3ae6
mode 100755,100644..100644
--- 1/drivers/gpu/drm/verisilicon/starfive_drm_seeedpanel.c
--- 2/drivers/gpu/drm/verisilicon/starfive_drm_seeedpanel.c
+++ b/drivers/gpu/drm/verisilicon/starfive_drm_seeedpanel.c

diff --cc drivers/gpu/drm/verisilicon/vs_crtc.c
index 1e6b5f3,ff8603a..ff8603a
mode 100755,100644..100755
--- 1/drivers/gpu/drm/verisilicon/vs_crtc.c
--- 2/drivers/gpu/drm/verisilicon/vs_crtc.c
+++ b/drivers/gpu/drm/verisilicon/vs_crtc.c

diff --cc drivers/gpu/drm/verisilicon/vs_dc.c
index 48ec761,65bcf9f..0ffbe49
mode 100755,100644..100644
--- 1/drivers/gpu/drm/verisilicon/vs_dc.c
--- 2/drivers/gpu/drm/verisilicon/vs_dc.c
+++ b/drivers/gpu/drm/verisilicon/vs_dc.c
@@@ -810,10 -811,13 +811,12 @@@ static void vs_dc_enable(struct device 
                        clk_set_rate(dc->dc8200_pix0, mode->clock * 1000);
                        dc->pix_clk_rate = mode->clock;
                }
+               */
  
                clk_set_parent(dc->dc8200_clk_pix1, dc->dc8200_pix0);
 -              udelay(1000);
                dc_hw_set_out(&dc->hw, OUT_DPI, display.id);
        } else {
+               /*
                if (dc->pix_clk_rate != mode->clock) {
                        clk_set_rate(dc->dc8200_pix0, mode->clock * 1000);
                        dc->pix_clk_rate = mode->clock;

diff --cc drivers/gpu/drm/verisilicon/vs_dc.h
index d03eea6,b2e807a..085d6d4
mode 100755,100644..100644
--- 1/drivers/gpu/drm/verisilicon/vs_dc.h
--- 2/drivers/gpu/drm/verisilicon/vs_dc.h
+++ b/drivers/gpu/drm/verisilicon/vs_dc.h

diff --cc drivers/gpu/drm/verisilicon/vs_drv.h
index 68d4c35,9d0d046..9d0d046
mode 100755,100644..100755
--- 1/drivers/gpu/drm/verisilicon/vs_drv.h
--- 2/drivers/gpu/drm/verisilicon/vs_drv.h
+++ b/drivers/gpu/drm/verisilicon/vs_drv.h

diff --cc drivers/media/platform/starfive/v4l2_driver/imx219_mipi.c
Simple merge

diff --cc drivers/pci/controller/pcie-plda.c
Simple merge