diff options
| author | WalkerChenL <walker.chen@starfivetech.com> | 2022-01-18 05:59:19 +0300 |
|---|---|---|
| committer | WalkerChenL <walker.chen@starfivetech.com> | 2022-01-18 05:59:19 +0300 |
| commit | 68324b5a97bce25584dd7317287b2c0b19d2ec9d (patch) | |
| tree | 8a9bad699d02ddab0576029da562d336601454c7 | |
| parent | ee5cbe5ea3e661c6362b9f021c451e27d9cd0303 (diff) | |
| parent | 119a8c72252b60788d6c24605cdb6c384fb112ec (diff) | |
| download | linux-68324b5a97bce25584dd7317287b2c0b19d2ec9d.tar.xz | |
Merge branch 'visionfive-5.15.y-devel' of https://github.com/starfive-tech/linux into visionfive-5.15.y-devel
| -rwxr-xr-x | arch/riscv/boot/dts/starfive/jh7100.dtsi | 14 | ||||
| -rwxr-xr-x[-rw-r--r--] | drivers/gpu/drm/starfive/README.txt | 25 |
2 files changed, 14 insertions, 25 deletions
diff --git a/arch/riscv/boot/dts/starfive/jh7100.dtsi b/arch/riscv/boot/dts/starfive/jh7100.dtsi index 089866b58ae0..08c22b2445ec 100755 --- a/arch/riscv/boot/dts/starfive/jh7100.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7100.dtsi @@ -634,8 +634,18 @@ compatible = "cm,cm521-vpu"; reg = <0x0 0x118e0000 0x0 0x4000>; reg-names = "control"; - clocks = <&clkgen JH7100_CLK_VP6_CORE>; - clock-names = "vcodec"; + clocks =<&clkgen JH7100_CLK_VENC_AXI>, + <&clkgen JH7100_CLK_VENCBRG_MAIN>, + <&clkgen JH7100_CLK_VENC_BCLK>, + <&clkgen JH7100_CLK_VENC_CCLK>, + <&clkgen JH7100_CLK_VENC_APB>; + clock-names = "venc_axi", "vencbrg_main", "venc_bclk", "venc_cclk", "venc_apb"; + resets = <&rstgen JH7100_RSTN_VENC_AXI>, + <&rstgen JH7100_RSTN_VENCBRG_MAIN>, + <&rstgen JH7100_RSTN_VENC_BCLK>, + <&rstgen JH7100_RSTN_VENC_CCLK>, + <&rstgen JH7100_RSTN_VENC_APB>; + reset-names = "venc_axi", "vencbrg_main", "venc_bclk", "venc_cclk", "venc_apb"; interrupts = <26>; }; diff --git a/drivers/gpu/drm/starfive/README.txt b/drivers/gpu/drm/starfive/README.txt index dadec80c98bf..3af5052a147c 100644..100755 --- a/drivers/gpu/drm/starfive/README.txt +++ b/drivers/gpu/drm/starfive/README.txt @@ -1,4 +1,4 @@ -Display Subsystem:(default FBdev) +Display Subsystem:(default FBdev) Steps switch to DRM: 1、Disable fbdev,close below config items： @@ -11,6 +11,7 @@ CONFIG_DRM_I2C_NXP_TDA998X=y CONFIG_DRM_I2C_NXP_TDA9950=y CONFIG_DRM_STARFIVE=y CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_PHY_M31_DPHY_RX0=y Precautions：when use DRM hdmi pipeline,please make sure CONFIG_DRM_STARFIVE_MIPI_DSI is disable , or will cause color abnormal. @@ -18,31 +19,9 @@ Precautions：when use DRM hdmi pipeline,please make sure CONFIG_DRM_STARFIVE_MI 3、open DRM mipi pipeline enable items: - CONFIG_PHY_M31_DPHY_RX0=y CONFIG_DRM_STARFIVE_MIPI_DSI=y -change jh7100.dtsi display-encoder as below： - - display-encoder { - compatible = "starfive,display-encoder"; - encoder-type = <6>; //2-TMDS, 3-LVDS, 6-DSI, 8-DPI - status = "okay"; - - ports { - port@0 { - endpoint { - remote-endpoint = <&dsi_out_port>; - }; - }; - - port@1 { - endpoint { - remote-endpoint = <&crtc_0_out>; - }; - }; - }; - }; install libdrm: make buildroot_initramfs-menuconfig |