From 79712fcb79c3211445d6b5dfe7d5ca3bada4bb36 Mon Sep 17 00:00:00 2001 From: Given He Date: Mon, 21 Jan 2019 13:42:33 +0800 Subject: [PATCH] Revert "clk: csi support get the 37.152MHz" This reverts commit b75abf9bae9574fa63a0d857bd382ca87693073f. --- arch/arm/boot/dts/sun8iw12p1.dtsi | 10 +++++----- .../platform/sunxi-vin/modules/sensor/imx385_mipi.c | 2 -- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/arch/arm/boot/dts/sun8iw12p1.dtsi b/arch/arm/boot/dts/sun8iw12p1.dtsi index 56423a77..cdf393f8 100644 --- 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 index 7a8ce063..cf16ca6f 100755 --- 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,