Revert "clk: csi support get the 37.152MHz"

This reverts commit b75abf9.
lindenis-org · Jan 21, 2019 · 79712fc · 79712fc
1 parent 65a9c67
commit 79712fc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/arch/arm/boot/dts/sun8iw12p1.dtsi b/arch/arm/boot/dts/sun8iw12p1.dtsi
@@ -2034,11 +2034,11 @@
 			device_id = <0>;
 			vind0_clk = <432000000>;
 			reg = <0x0 0x06600000 0x0 0x1000>;
-			clocks = <&clk_csi_top>, <&clk_pll_video0>,
-				 <&clk_csi_master0>, <&clk_hosc>, <&clk_pll_video0>,
-				 <&clk_csi_master1>, <&clk_hosc>, <&clk_pll_video0>,
-				 <&clk_csi_master2>, <&clk_hosc>, <&clk_pll_video0>,
-				 <&clk_csi_master3>, <&clk_hosc>, <&clk_pll_video0>,
+			clocks = <&clk_csi_top>, <&clk_pll_isp>,
+				 <&clk_csi_master0>, <&clk_hosc>, <&clk_pll_isp>,
+				 <&clk_csi_master1>, <&clk_hosc>, <&clk_pll_isp>,
+				 <&clk_csi_master2>, <&clk_hosc>, <&clk_pll_isp>,
+				 <&clk_csi_master3>, <&clk_hosc>, <&clk_pll_isp>,
 				 <&clk_isp>;
 			pinctrl-names = "mclk0-default","mclk0-sleep","mclk1-default","mclk1-sleep",
 					"mclk2-default","mclk2-sleep","mclk3-default","mclk3-sleep";

diff --git a/drivers/media/platform/sunxi-vin/modules/sensor/imx385_mipi.c b/drivers/media/platform/sunxi-vin/modules/sensor/imx385_mipi.c
@@ -569,7 +569,6 @@ static struct sensor_format_struct sensor_formats[] = {
 
 static struct sensor_win_size sensor_win_sizes[] = {
 
-	/*
 	{
 	 .width = 1936,
 	 .height = 1096,
@@ -591,7 +590,6 @@ static struct sensor_win_size sensor_win_sizes[] = {
 	 .regs_size = ARRAY_SIZE(sensor_4lane_1080P30_regs),
 	 .set_size = NULL,
 	 },
-	 */
 
 	 {
 	  .width = 1920,