target/linux/bcm27xx/patches-5.15/950-0858-clk-bcm-rpi-Add-variant-structure.patch

   1 From cc7262a6c84f9a19c61307587d441e3347962388 Mon Sep 17 00:00:00 2001
   2 From: Maxime Ripard <maxime@cerno.tech>
   3 Date: Mon, 17 Jan 2022 17:19:30 +0100
   4 Subject: [PATCH] clk: bcm: rpi: Add variant structure
   5
   6 We only export a bunch of firmware clocks, and some of them require
   7 special treatment.
   8
   9 This has been do so far using some tests on the clock id in various
  10 places, but this is fairly hard to extend and doesn't scale very well.
  11
  12 Since we'll need some more cases in the next patches, let's switch to a
  13 variant structure that defines the behaviour we need to have for a given
  14 clock.
  15
  16 Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  17 ---
  18  drivers/clk/bcm/clk-raspberrypi.c | 76 +++++++++++++++++++++++--------
  19  1 file changed, 56 insertions(+), 20 deletions(-)
  20
  21 --- a/drivers/clk/bcm/clk-raspberrypi.c
  22 +++ b/drivers/clk/bcm/clk-raspberrypi.c
  23 @@ -58,6 +58,8 @@ static char *rpi_firmware_clk_names[] =
  24  #define RPI_FIRMWARE_STATE_ENABLE_BIT  BIT(0)
  25  #define RPI_FIRMWARE_STATE_WAIT_BIT    BIT(1)
  26
  27 +struct raspberrypi_clk_variant;
  28 +
  29  struct raspberrypi_clk {
  30         struct device *dev;
  31         struct rpi_firmware *firmware;
  32 @@ -68,10 +70,45 @@ struct raspberrypi_clk_data {
  33         struct clk_hw hw;
  34
  35         unsigned int id;
  36 +       struct raspberrypi_clk_variant *variant;
  37
  38         struct raspberrypi_clk *rpi;
  39  };
  40
  41 +struct raspberrypi_clk_variant {
  42 +       bool            export;
  43 +       char            *clkdev;
  44 +};
  45 +
  46 +static struct raspberrypi_clk_variant
  47 +raspberrypi_clk_variants[RPI_FIRMWARE_NUM_CLK_ID] = {
  48 +       [RPI_FIRMWARE_ARM_CLK_ID] = {
  49 +               .export = true,
  50 +               .clkdev = "cpu0",
  51 +       },
  52 +       [RPI_FIRMWARE_CORE_CLK_ID] = {
  53 +               .export = true,
  54 +       },
  55 +       [RPI_FIRMWARE_M2MC_CLK_ID] = {
  56 +               .export = true,
  57 +       },
  58 +       [RPI_FIRMWARE_V3D_CLK_ID] = {
  59 +               .export = true,
  60 +       },
  61 +       [RPI_FIRMWARE_HEVC_CLK_ID] = {
  62 +               .export = true,
  63 +       },
  64 +       [RPI_FIRMWARE_PIXEL_BVB_CLK_ID] = {
  65 +               .export = true,
  66 +       },
  67 +       [RPI_FIRMWARE_VEC_CLK_ID] = {
  68 +               .export = true,
  69 +       },
  70 +       [RPI_FIRMWARE_PIXEL_CLK_ID] = {
  71 +               .export = true,
  72 +       },
  73 +};
  74 +
  75  /*
  76   * Structure of the message passed to Raspberry Pi's firmware in order to
  77   * change clock rates. The 'disable_turbo' option is only available to the ARM
  78 @@ -185,7 +222,8 @@ static const struct clk_ops raspberrypi_
  79
  80  static struct clk_hw *raspberrypi_clk_register(struct raspberrypi_clk *rpi,
  81                                                unsigned int parent,
  82 -                                              unsigned int id)
  83 +                                              unsigned int id,
  84 +                                              struct raspberrypi_clk_variant *variant)
  85  {
  86         struct raspberrypi_clk_data *data;
  87         struct clk_init_data init = {};
  88 @@ -197,6 +235,7 @@ static struct clk_hw *raspberrypi_clk_re
  89                 return ERR_PTR(-ENOMEM);
  90         data->rpi = rpi;
  91         data->id = id;
  92 +       data->variant = variant;
  93
  94         init.name = devm_kasprintf(rpi->dev, GFP_KERNEL,
  95                                    "fw-clk-%s",
  96 @@ -230,9 +269,9 @@ static struct clk_hw *raspberrypi_clk_re
  97
  98         clk_hw_set_rate_range(&data->hw, min_rate, max_rate);
  99
 100 -       if (id == RPI_FIRMWARE_ARM_CLK_ID) {
 101 +       if (variant->clkdev) {
 102                 ret = devm_clk_hw_register_clkdev(rpi->dev, &data->hw,
 103 -                                                 NULL, "cpu0");
 104 +                                                 NULL, variant->clkdev);
 105                 if (ret) {
 106                         dev_err(rpi->dev, "Failed to initialize clkdev\n");
 107                         return ERR_PTR(ret);
 108 @@ -271,30 +310,27 @@ static int raspberrypi_discover_clocks(s
 109                 return ret;
 110
 111         while (clks->id) {
 112 -               struct clk_hw *hw;
 113 +               struct raspberrypi_clk_variant *variant;
 114 +
 115 +               if (clks->id > RPI_FIRMWARE_NUM_CLK_ID) {
 116 +                       dev_err(rpi->dev, "Unknown clock id: %u", clks->id);
 117 +                       return -EINVAL;
 118 +               }
 119 +
 120 +               variant = &raspberrypi_clk_variants[clks->id];
 121 +               if (variant->export) {
 122 +                       struct clk_hw *hw;
 123
 124 -               switch (clks->id) {
 125 -               case RPI_FIRMWARE_ARM_CLK_ID:
 126 -               case RPI_FIRMWARE_CORE_CLK_ID:
 127 -               case RPI_FIRMWARE_M2MC_CLK_ID:
 128 -               case RPI_FIRMWARE_V3D_CLK_ID:
 129 -               case RPI_FIRMWARE_HEVC_CLK_ID:
 130 -               case RPI_FIRMWARE_PIXEL_BVB_CLK_ID:
 131 -               case RPI_FIRMWARE_VEC_CLK_ID:
 132 -               case RPI_FIRMWARE_PIXEL_CLK_ID:
 133                         hw = raspberrypi_clk_register(rpi, clks->parent,
 134 -                                                     clks->id);
 135 +                                                     clks->id, variant);
 136                         if (IS_ERR(hw))
 137                                 return PTR_ERR(hw);
 138
 139                         data->hws[clks->id] = hw;
 140                         data->num = clks->id + 1;
 141 -                       fallthrough;
 142 -
 143 -               default:
 144 -                       clks++;
 145 -                       break;
 146                 }
 147 +
 148 +               clks++;
 149         }
 150
 151         return 0;