target/linux/brcm2708/patches-4.19/950-0771-fixup-clk-raspberrypi-Also-support-v3d-clock.patch

   1 From afb2cfe3056fc643cee8ae25991f4b9c22d48bef Mon Sep 17 00:00:00 2001
   2 From: popcornmix <popcornmix@gmail.com>
   3 Date: Thu, 7 Nov 2019 14:23:38 +0000
   4 Subject: [PATCH] fixup! clk-raspberrypi: Also support v3d clock
   5
   6 ---
   7  drivers/clk/bcm/clk-raspberrypi.c | 10 +++++++---
   8  1 file changed, 7 insertions(+), 3 deletions(-)
   9
  10 --- a/drivers/clk/bcm/clk-raspberrypi.c
  11 +++ b/drivers/clk/bcm/clk-raspberrypi.c
  12 @@ -208,6 +208,9 @@ static int raspberrypi_determine_rate(st
  13                                           u32 clock_id, const char *name, unsigned long min_rate, unsigned long max_rate,
  14                                           struct clk_rate_request *req)
  15  {
  16 +#if 1
  17 +       req->rate = clamp(req->rate, min_rate, max_rate);
  18 +#else
  19         u64 div, final_rate;
  20         u32 ndiv, fdiv;
  21
  22 @@ -225,6 +228,7 @@ static int raspberrypi_determine_rate(st
  23
  24         req->rate = final_rate >> A2W_PLL_FRAC_BITS;
  25
  26 +#endif
  27         return 0;
  28  }
  29
  30 @@ -351,21 +355,21 @@ static const struct clk_ops raspberrypi_
  31         .is_prepared = raspberrypi_fw_pll_is_on,
  32         .recalc_rate = raspberrypi_fw_pll_get_rate,
  33         .set_rate = raspberrypi_fw_pll_set_rate,
  34 -       //.determine_rate = raspberrypi_pll_determine_rate,
  35 +       .determine_rate = raspberrypi_pll_determine_rate,
  36  };
  37
  38  static const struct clk_ops raspberrypi_firmware_pll_divider_clk_ops = {
  39         .is_prepared = raspberrypi_fw_pll_div_is_on,
  40         .recalc_rate = raspberrypi_fw_pll_div_get_rate,
  41         .set_rate = raspberrypi_fw_pll_div_set_rate,
  42 -       //.determine_rate = raspberrypi_pll_div_determine_rate,
  43 +       .determine_rate = raspberrypi_pll_div_determine_rate,
  44  };
  45
  46  static const struct clk_ops raspberrypi_firmware_clk_ops = {
  47         .is_prepared = raspberrypi_fw_clock_is_on,
  48         .recalc_rate = raspberrypi_fw_clock_get_rate,
  49         .set_rate = raspberrypi_fw_clock_set_rate,
  50 -       //.determine_rate = raspberrypi_clock_determine_rate,
  51 +       .determine_rate = raspberrypi_clock_determine_rate,
  52  };
  53
  54