From f1ec29770d294e9491360d91b39275427c3ec1e3 Mon Sep 17 00:00:00 2001 From: hehaoyang Date: Fri, 22 Dec 2023 17:58:58 +0000 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3:=201.=20SATA=E7=A1=AC?= =?UTF-8?q?=E7=9B=98=E6=8C=82=E8=BD=BD;=202.=20Gstreamer=E5=91=BD=E4=BB=A4?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E6=AD=BB=E6=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi | 2 +- .../arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dtsi | 4 ++++ kernel/arch/arm64/boot/dts/rockchip/rk3568.dtsi | 2 +- kernel/drivers/media/platform/rockchip/cif/capture.c | 5 +++-- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/kernel/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi b/kernel/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi index d70986bc3b..5946dd49eb 100755 --- a/kernel/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi +++ b/kernel/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi @@ -1365,7 +1365,7 @@ data-lanes = <1 2 3 4>; }; }; - }; + }; }; &i2c5 { diff --git a/kernel/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dtsi b/kernel/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dtsi index 748e3d4859..4fcac7ea58 100755 --- a/kernel/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dtsi +++ b/kernel/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dtsi @@ -707,6 +707,10 @@ connect = <&vp1_out_dsi0>; }; +&sata1 { + status = "okay"; +}; + &sata2 { status = "okay"; }; diff --git a/kernel/arch/arm64/boot/dts/rockchip/rk3568.dtsi b/kernel/arch/arm64/boot/dts/rockchip/rk3568.dtsi index 8f26831148..af684e12e8 100755 --- a/kernel/arch/arm64/boot/dts/rockchip/rk3568.dtsi +++ b/kernel/arch/arm64/boot/dts/rockchip/rk3568.dtsi @@ -609,7 +609,7 @@ reg = <0x0 0xfd000000 0x0 0x400000>; interrupts = ; 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>; diff --git a/kernel/drivers/media/platform/rockchip/cif/capture.c b/kernel/drivers/media/platform/rockchip/cif/capture.c index ac8b596b75..054631b710 100644 --- a/kernel/drivers/media/platform/rockchip/cif/capture.c +++ b/kernel/drivers/media/platform/rockchip/cif/capture.c @@ -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);