test3

4 files changed, 20 insertions, 14 deletions

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
index 3fb499da039e..3d84acaa7d42 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
@@ -364,6 +364,11 @@
 &i2c2 {
 	status = "okay";
 
+//	clock-frequency = <400000>;
+	/* These are relatively safe rise/fall times; TODO: measure */
+//	i2c-scl-rising-time-ns = <168>;
+//	i2c-scl-falling-time-ns = <4>;
+
 	camera0: ov5645@3c {
 		compatible = "ovti,ov5645";
 		reg = <0x3c>;
@@ -379,16 +384,13 @@
 		enable-gpios = <&gpio4 RK_PA4 GPIO_ACTIVE_HIGH>;
 		reset-gpios = <&gpio3 RK_PD5 GPIO_ACTIVE_LOW>;
 
-		status = "disabled";
-/*
 		port {
 			ov5645_0_out: endpoint {
 				remote-endpoint = <&ov5645_0_in>;
-				clock-lanes = <1>;
 				data-lanes = <1 2>;
 			};
 		};
-*/	};
+	};
 };
 
 &i2c3 {
@@ -401,7 +403,7 @@
 
 &i2c6 {
 	status = "okay";
-
+/*
 	camera1: ov5645@3c {
 		compatible = "ovti,ov5645";
 		reg = <0x3c>;
@@ -424,7 +426,7 @@
 			};
 		};
 	};
-};
+*/};
 
 &i2s2 {
         status = "okay";
@@ -752,7 +754,7 @@
  	ports {
 		#address-cells = <1>;
 		#size-cells = <0>;
-/*
+
 		port@0 {
 			reg = <0>;
  			ov5645_0_in: endpoint {
@@ -760,7 +762,7 @@
 				data-lanes = <1 2>;
 			};
 		};
-*/
+/*
 		port@0 {
 			reg = <0>;
  			ov5645_1_in: endpoint {
@@ -768,7 +770,7 @@
 				data-lanes = <1 2>;
 			};
 		};
-
+*/
 		port@1 {
 			reg = <1>;
  			dphy_rx0_out: endpoint {
diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
index 582c3b22efbd..04ddd9e48388 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
@@ -1388,7 +1388,6 @@
 				<&cru PCLK_VIO_GRF>;
 			clock-names = "dphy-ref", "dphy-cfg", "grf";
 			power-domains = <&power RK3399_PD_VIO>;
-			rockchip,grf = <&grf>;
 			status = "disabled";
 		};
 
@@ -1726,7 +1725,7 @@
 		reg = <0x0 0xff914000 0x0 0x100>, <0x0 0xff915000 0x0 0x100>;
 		interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH 0>;
 		interrupt-names = "isp0_mmu";
-		clocks = <&cru ACLK_ISP0_NOC>, <&cru HCLK_ISP0_NOC>,
+		clocks = <&cru ACLK_ISP0>, <&cru HCLK_ISP0>,
 			 <&cru ACLK_ISP0_WRAPPER>, <&cru HCLK_ISP0_WRAPPER>;
 		clock-names = "aclk", "iface", "aclk_wrapper", "iface_wrapper";
 		#iommu-cells = <0>;
@@ -2166,8 +2165,8 @@
 		i2c2 {
 			i2c2_xfer: i2c2-xfer {
 				rockchip,pins =
-					<2 1 RK_FUNC_2 &pcfg_pull_none_12ma>,
-					<2 0 RK_FUNC_2 &pcfg_pull_none_12ma>;
+					<2 1 RK_FUNC_2 &pcfg_pull_none_20ma>,
+					<2 0 RK_FUNC_2 &pcfg_pull_none_20ma>;
 			};
 		};
 
diff --git a/drivers/media/i2c/ov5645.c b/drivers/media/i2c/ov5645.c
index 785f326ac519..7fff7216d2d0 100644
--- a/drivers/media/i2c/ov5645.c
+++ b/drivers/media/i2c/ov5645.c
@@ -688,6 +688,7 @@ static int ov5645_set_power_on(struct ov5645 *ov5645)
 {
 	int ret;
 
+	pr_info("%s: %d\n", __func__, __LINE__);
 	ret = ov5645_regulators_enable(ov5645);
 	if (ret < 0) {
 		return ret;
@@ -708,6 +709,7 @@ static int ov5645_set_power_on(struct ov5645 *ov5645)
 
 	msleep(20);
 
+	pr_info("%s: %d\n", __func__, __LINE__);
 	return 0;
 }
 
@@ -731,6 +733,7 @@ static int ov5645_s_power(struct v4l2_subdev *sd, int on)
 	 */
 	if (ov5645->power_count == !on) {
 		if (on) {
+			pr_info("%s: %d\n", __func__, __LINE__);
 			ret = ov5645_set_power_on(ov5645);
 			if (ret < 0)
 				goto exit;
@@ -752,6 +755,7 @@ static int ov5645_s_power(struct v4l2_subdev *sd, int on)
 				goto exit;
 			}
 		} else {
+			pr_info("%s: %d\n", __func__, __LINE__);
 			ov5645_set_power_off(ov5645);
 		}
 	}
@@ -1043,6 +1047,7 @@ static int ov5645_s_stream(struct v4l2_subdev *subdev, int enable)
 	int ret;
 
 	if (enable) {
+		pr_info("%s: %d\n", __func__, __LINE__);
 		ret = ov5645_set_register_array(ov5645,
 					ov5645->current_mode->data,
 					ov5645->current_mode->data_size);
@@ -1062,6 +1067,7 @@ static int ov5645_s_stream(struct v4l2_subdev *subdev, int enable)
 		if (ret < 0)
 			return ret;
 	} else {
+		pr_info("%s: %d\n", __func__, __LINE__);
 		ret = ov5645_write_reg(ov5645, OV5645_SYSTEM_CTRL0,
 				       OV5645_SYSTEM_CTRL0_STOP);
 		if (ret < 0)
diff --git a/drivers/media/platform/rockchip/isp1/capture.c b/drivers/media/platform/rockchip/isp1/capture.c
index 0880eb1add22..09d1acaba9b9 100644
--- a/drivers/media/platform/rockchip/isp1/capture.c
+++ b/drivers/media/platform/rockchip/isp1/capture.c
@@ -653,7 +653,6 @@ static int rkisp1_config_dcrop(struct rkisp1_stream *stream, bool async)
 /* configure scale unit */
 static int rkisp1_config_rsz(struct rkisp1_stream *stream, bool async)
 {
-	pr_info("%s: %d\n", __func__, __LINE__);
 	struct rkisp1_device *dev = stream->ispdev;
 	struct v4l2_pix_format_mplane output_fmt = stream->out_fmt;
 	struct capture_fmt *output_isp_fmt = &stream->out_isp_fmt;