target/linux/bcm27xx/patches-6.1/950-0899-soc-bcm-bcm2835-power-Add-support-for-BCM2712.patch

   1 From 9cf85a95eeb239a079a3485bd1d0447431bdc7f1 Mon Sep 17 00:00:00 2001
   2 From: Phil Elwell <phil@raspberrypi.com>
   3 Date: Wed, 8 Mar 2023 14:42:48 +0000
   4 Subject: [PATCH] soc: bcm: bcm2835-power: Add support for BCM2712
   5
   6 BCM2712 has a PM block but neither ASB nor RPIVID_ASB. Use the absence
   7 of the "asb" register range to indicate BCM2712 and its different PM
   8 register range.
   9
  10 Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  11 ---
  12  drivers/soc/bcm/bcm2835-power.c | 29 +++++++++++++++++++----------
  13  1 file changed, 19 insertions(+), 10 deletions(-)
  14
  15 --- a/drivers/soc/bcm/bcm2835-power.c
  16 +++ b/drivers/soc/bcm/bcm2835-power.c
  17 @@ -79,6 +79,7 @@
  18  #define PM_IMAGE                       0x108
  19  #define PM_GRAFX                       0x10c
  20  #define PM_PROC                                0x110
  21 +#define PM_GRAFX_2712                  0x304
  22  #define PM_ENAB                                BIT(12)
  23  #define PM_ISPRSTN                     BIT(8)
  24  #define PM_H264RSTN                    BIT(7)
  25 @@ -381,6 +382,9 @@ static int bcm2835_power_pd_power_on(str
  26                 return bcm2835_power_power_on(pd, PM_GRAFX);
  27
  28         case BCM2835_POWER_DOMAIN_GRAFX_V3D:
  29 +               if (!power->asb)
  30 +                       return bcm2835_asb_power_on(pd, PM_GRAFX_2712,
  31 +                                                   0, 0, PM_V3DRSTN);
  32                 return bcm2835_asb_power_on(pd, PM_GRAFX,
  33                                             ASB_V3D_M_CTRL, ASB_V3D_S_CTRL,
  34                                             PM_V3DRSTN);
  35 @@ -447,6 +451,9 @@ static int bcm2835_power_pd_power_off(st
  36                 return bcm2835_power_power_off(pd, PM_GRAFX);
  37
  38         case BCM2835_POWER_DOMAIN_GRAFX_V3D:
  39 +               if (!power->asb)
  40 +                       return bcm2835_asb_power_off(pd, PM_GRAFX_2712,
  41 +                                                   0, 0, PM_V3DRSTN);
  42                 return bcm2835_asb_power_off(pd, PM_GRAFX,
  43                                              ASB_V3D_M_CTRL, ASB_V3D_S_CTRL,
  44                                              PM_V3DRSTN);
  45 @@ -642,19 +649,21 @@ static int bcm2835_power_probe(struct pl
  46         power->asb = pm->asb;
  47         power->rpivid_asb = pm->rpivid_asb;
  48
  49 -       id = readl(power->asb + ASB_AXI_BRDG_ID);
  50 -       if (id != BCM2835_BRDG_ID /* "BRDG" */) {
  51 -               dev_err(dev, "ASB register ID returned 0x%08x\n", id);
  52 -               return -ENODEV;
  53 -       }
  54 -
  55 -       if (power->rpivid_asb) {
  56 -               id = readl(power->rpivid_asb + ASB_AXI_BRDG_ID);
  57 +       if (power->asb) {
  58 +               id = readl(power->asb + ASB_AXI_BRDG_ID);
  59                 if (id != BCM2835_BRDG_ID /* "BRDG" */) {
  60 -                       dev_err(dev, "RPiVid ASB register ID returned 0x%08x\n",
  61 -                                    id);
  62 +                       dev_err(dev, "ASB register ID returned 0x%08x\n", id);
  63                         return -ENODEV;
  64                 }
  65 +
  66 +               if (power->rpivid_asb) {
  67 +                       id = readl(power->rpivid_asb + ASB_AXI_BRDG_ID);
  68 +                       if (id != BCM2835_BRDG_ID /* "BRDG" */) {
  69 +                               dev_err(dev, "RPiVid ASB register ID returned 0x%08x\n",
  70 +                                       id);
  71 +                               return -ENODEV;
  72 +                       }
  73 +               }
  74         }
  75
  76         power->pd_xlate.domains = devm_kcalloc(dev,