hehaoyang/rk3568_ubuntu_r60_v1.3.2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

解决: 1. SATA硬盘挂载; 2. Gstreamer命令执行死机

Browse Source
This commit is contained in:
hehaoyang 2023-12-22 17:58:58 +00:00
parent 66d290320f
commit f1ec29770d
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi
View File

@ -1365,7 +1365,7 @@
data-lanes = <1 2 3 4>;
};
};
};
};
};
&i2c5 {

4
kernel/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dtsi
View File

@ -707,6 +707,10 @@
connect = <&vp1_out_dsi0>;
};
&sata1 {
status = "okay";
};
&sata2 {
status = "okay";
};

2
kernel/arch/arm64/boot/dts/rockchip/rk3568.dtsi
View File

@ -609,7 +609,7 @@
reg = <0x0 0xfd000000 0x0 0x400000>;
interrupts = <GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH>;
dr_mode = "host";
phys = <&u2phy0_host>, <&combphy1_usq PHY_TYPE_USB3>;
phys = <&u2phy0_host>/*, <&combphy1_usq PHY_TYPE_USB3>*/;
phy-names = "usb2-phy", "usb3-phy";
phy_type = "utmi_wide";
power-domains = <&power RK3568_PD_PIPE>;

5
kernel/drivers/media/platform/rockchip/cif/capture.c
View File

@ -2790,6 +2790,7 @@ int rkcif_update_sensor_info(struct rkcif_stream *stream)
{
struct rkcif_sensor_info *sensor, *terminal_sensor;
struct v4l2_subdev *sensor_sd;
int stream_id = stream->id;
int ret = 0;
sensor_sd = get_remote_sensor(stream, NULL);
@ -2828,8 +2829,8 @@ int rkcif_update_sensor_info(struct rkcif_stream *stream)
__func__, terminal_sensor->sd->name);
return ret;
}
if (v4l2_subdev_call(terminal_sensor->sd, core, ioctl, RKMODULE_GET_CSI_DSI_INFO,
&terminal_sensor->dsi_input_en)) {
if (v4l2_subdev_call(terminal_sensor->sd, core, ioctl, RKMODULE_GET_CSI_DSI_INFO, &stream_id)) {
//&terminal_sensor->dsi_input_en)) {
v4l2_dbg(1, rkcif_debug, &stream->cifdev->v4l2_dev,
"%s: get terminal %s CSI/DSI sel failed, default csi input!\n",
__func__, terminal_sensor->sd->name);