target/linux/bcm27xx/patches-6.1/950-0518-dt-Add-camX_reg-and-camX_reg_gpio-overrides-to-CM4S.patch

   1 From d9bad36a8f7530ec17ffe93521a8a71bc1e54a20 Mon Sep 17 00:00:00 2001
   2 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
   3 Date: Thu, 15 Dec 2022 16:15:27 +0000
   4 Subject: [PATCH] dt: Add camX_reg and camX_reg_gpio overrides to CM4S
   5
   6 CM4S follows the pattern of CM1&3 for routing camera
   7 GPIO control, but didn't have the overrides defined to
   8 allow enabling and configuring the camera regulator
   9 GPIOs. Add them.
  10
  11 Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  12 ---
  13  arch/arm/boot/dts/bcm2711-rpi-cm4s.dts | 9 +++++++--
  14  arch/arm/boot/dts/overlays/README      | 4 ++--
  15  2 files changed, 9 insertions(+), 4 deletions(-)
  16
  17 --- a/arch/arm/boot/dts/bcm2711-rpi-cm4s.dts
  18 +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4s.dts
  19 @@ -403,12 +403,12 @@
  20  };
  21
  22  &cam1_reg {
  23 -       gpio = <&gpio 2 GPIO_ACTIVE_HIGH>;
  24 +       gpio = <&gpio 3 GPIO_ACTIVE_HIGH>;
  25         status = "disabled";
  26  };
  27
  28  cam0_reg: &cam0_regulator {
  29 -       gpio = <&gpio 30 GPIO_ACTIVE_HIGH>;
  30 +       gpio = <&gpio 31 GPIO_ACTIVE_HIGH>;
  31         status = "disabled";
  32  };
  33
  34 @@ -423,5 +423,10 @@ cam0_reg: &cam0_regulator {
  35                 sd_poll_once = <&emmc2>, "non-removable?";
  36                 spi_dma4 = <&spi0>, "dmas:0=", <&dma40>,
  37                            <&spi0>, "dmas:8=", <&dma40>;
  38 +
  39 +               cam0_reg = <&cam0_reg>,"status";
  40 +               cam0_reg_gpio = <&cam0_reg>,"gpio:4";
  41 +               cam1_reg = <&cam1_reg>,"status";
  42 +               cam1_reg_gpio = <&cam1_reg>,"gpio:4";
  43         };
  44  };
  45 --- a/arch/arm/boot/dts/overlays/README
  46 +++ b/arch/arm/boot/dts/overlays/README
  47 @@ -148,7 +148,7 @@ Params:
  48                                  Only required on CM1 & 3.
  49
  50          cam0_reg_gpio           Set GPIO for CAM 0 regulator.
  51 -                                Default 31 on CM1 & 3.
  52 +                                Default 31 on CM1, 3, and 4S.
  53                                  Default of GPIO expander 5 on CM4, but override
  54                                  switches to normal GPIO.
  55
  56 @@ -156,7 +156,7 @@ Params:
  57                                  Only required on CM1 & 3.
  58
  59          cam1_reg_gpio           Set GPIO for CAM 1 regulator.
  60 -                                Default 3 on CM1 & 3.
  61 +                                Default 3 on CM1, 3, and 4S.
  62                                  Default of GPIO expander 5 on CM4, but override
  63                                  switches to normal GPIO.
  64