git.openwrt.org Git - openwrt/staging/wigyori.git/blob

   1 From 7958a59b6cf1b5f80d12282c9182cae72a1d4f16 Mon Sep 17 00:00:00 2001
   2 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
   3 Date: Thu, 17 Jun 2021 17:27:46 +0100
   4 Subject: [PATCH] media: i2c: imx290: Fix clock setup register
   5  assignments
   6
   7 When the clock setups were added for the alternate external clocks,
   8 the settings for 2 lane 720p and 4 lane 1080p were transposed.
   9 2 lane 720p still worked, but 4 lane 1080p didn't.
  10
  11 Correct the assignments.
  12
  13 Fixes: 6b0c094a5b58 (media: i2c: imx290: Add support for 74.25MHz clock")
  14
  15 Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  16 ---
  17  drivers/media/i2c/imx290.c | 12 ++++++------
  18  1 file changed, 6 insertions(+), 6 deletions(-)
  19
  20 --- a/drivers/media/i2c/imx290.c
  21 +++ b/drivers/media/i2c/imx290.c
  22 @@ -485,10 +485,10 @@ static const struct imx290_mode imx290_m
  23                 .lane_data = imx290_720p_2lane_settings,
  24                 .lane_data_size = ARRAY_SIZE(imx290_720p_2lane_settings),
  25                 .clk_data = {
  26 -                       [CLK_37_125] = imx290_37_125mhz_clock_1080p,
  27 -                       [CLK_74_25] = imx290_74_250mhz_clock_1080p,
  28 +                       [CLK_37_125] = imx290_37_125mhz_clock_720p,
  29 +                       [CLK_74_25] = imx290_74_250mhz_clock_720p,
  30                 },
  31 -               .clk_size = ARRAY_SIZE(imx290_37_125mhz_clock_1080p),
  32 +               .clk_size = ARRAY_SIZE(imx290_37_125mhz_clock_720p),
  33         },
  34  };
  35
  36 @@ -510,10 +510,10 @@ static const struct imx290_mode imx290_m
  37                 .lane_data = imx290_1080p_4lane_settings,
  38                 .lane_data_size = ARRAY_SIZE(imx290_1080p_4lane_settings),
  39                 .clk_data = {
  40 -                       [CLK_37_125] = imx290_37_125mhz_clock_720p,
  41 -                       [CLK_74_25] = imx290_74_250mhz_clock_720p,
  42 +                       [CLK_37_125] = imx290_37_125mhz_clock_1080p,
  43 +                       [CLK_74_25] = imx290_74_250mhz_clock_1080p,
  44                 },
  45 -               .clk_size = ARRAY_SIZE(imx290_37_125mhz_clock_720p),
  46 +               .clk_size = ARRAY_SIZE(imx290_37_125mhz_clock_1080p),
  47         },
  48         {
  49                 .width = 1280,