Merge branch 'stable-4.19-rk356x' of ssh://gitlab.ebf.local/rockchip/linux/kernel into stable-4.19-rk356x

This commit is contained in:
hejiawencc
2022-09-05 13:35:22 +08:00
2 changed files with 7 additions and 11 deletions

View File

@ -1145,7 +1145,7 @@
port {
/* MIPI CSI-2 bus endpoint */
cam0_ov5648_out: endpoint {
remote-endpoint = <&dphy1_in>;
remote-endpoint = <&dphy0_in>;
clock-lanes = <0>;
data-lanes = <1 2>;
};
@ -1157,13 +1157,9 @@
status = "okay";
};
&csi2_dphy1 {
&csi2_dphy0 {
status = "okay";
/*
* dphy1 only used for split mode,
* can be used concurrently with dphy2
* full mode and split mode are mutually exclusive
*/
ports {
#address-cells = <1>;
#size-cells = <0>;
@ -1173,7 +1169,7 @@
#address-cells = <1>;
#size-cells = <0>;
dphy1_in: endpoint@1 {
dphy0_in: endpoint@1 {
reg = <1>;
remote-endpoint = <&cam0_ov5648_out>;
data-lanes = <1 2>;
@ -1185,7 +1181,7 @@
#address-cells = <1>;
#size-cells = <0>;
dphy1_out: endpoint@1 {
dphy0_out: endpoint@1 {
reg = <1>;
remote-endpoint = <&isp0_in>;
};
@ -1214,7 +1210,7 @@
isp0_in: endpoint@0 {
reg = <0>;
remote-endpoint = <&dphy1_out>;
remote-endpoint = <&dphy0_out>;
};
};
};

View File

@ -1,6 +1,6 @@
uname_r=4.19.232
size=0x1000000
#dtb=rk3568-lubancat2.dtb
#dtb=rk3568-lubancat2-n.dtb
enable_uboot_overlays=1
#overlay_start