media: i2c: imx290: Fix clock setup register assignments

When the clock setups were added for the alternate external clocks,
the settings for 2 lane 720p and 4 lane 1080p were transposed.
2 lane 720p still worked, but 4 lane 1080p didn't.

Correct the assignments.

Fixes: 6b0c094a5b (media: i2c: imx290: Add support for 74.25MHz clock")

Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
This commit is contained in:
Dave Stevenson
2021-06-17 17:27:46 +01:00
committed by Dom Cobley
parent 6b9f591bbd
commit d938877cb1

View File

@@ -485,10 +485,10 @@ static const struct imx290_mode imx290_modes_2lanes[] = {
.lane_data = imx290_720p_2lane_settings, .lane_data = imx290_720p_2lane_settings,
.lane_data_size = ARRAY_SIZE(imx290_720p_2lane_settings), .lane_data_size = ARRAY_SIZE(imx290_720p_2lane_settings),
.clk_data = { .clk_data = {
[CLK_37_125] = imx290_37_125mhz_clock_1080p, [CLK_37_125] = imx290_37_125mhz_clock_720p,
[CLK_74_25] = imx290_74_250mhz_clock_1080p, [CLK_74_25] = imx290_74_250mhz_clock_720p,
}, },
.clk_size = ARRAY_SIZE(imx290_37_125mhz_clock_1080p), .clk_size = ARRAY_SIZE(imx290_37_125mhz_clock_720p),
}, },
}; };
@@ -510,10 +510,10 @@ static const struct imx290_mode imx290_modes_4lanes[] = {
.lane_data = imx290_1080p_4lane_settings, .lane_data = imx290_1080p_4lane_settings,
.lane_data_size = ARRAY_SIZE(imx290_1080p_4lane_settings), .lane_data_size = ARRAY_SIZE(imx290_1080p_4lane_settings),
.clk_data = { .clk_data = {
[CLK_37_125] = imx290_37_125mhz_clock_720p, [CLK_37_125] = imx290_37_125mhz_clock_1080p,
[CLK_74_25] = imx290_74_250mhz_clock_720p, [CLK_74_25] = imx290_74_250mhz_clock_1080p,
}, },
.clk_size = ARRAY_SIZE(imx290_37_125mhz_clock_720p), .clk_size = ARRAY_SIZE(imx290_37_125mhz_clock_1080p),
}, },
{ {
.width = 1280, .width = 1280,