From 37c1aa1abcdcf426c96721d6e93320c1d553ee1e Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 15 Dec 2022 16:13:07 +0000 Subject: [PATCH 535/726] dt: Add camX_reg_gpio to CM4 To make it easier for custom routing of camera control GPIOs, add the camX_reg_gpio parameter to CM4 DT as well. Signed-off-by: Dave Stevenson --- arch/arm/boot/dts/bcm2711-rpi-cm4.dts | 7 +++++++ arch/arm/boot/dts/overlays/README | 18 ++++++++++++------ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts index 5510a1b731c1..58a7d541a938 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts @@ -574,5 +574,12 @@ __overrides__ { sd_poll_once = <&emmc2>, "non-removable?"; spi_dma4 = <&spi0>, "dmas:0=", <&dma40>, <&spi0>, "dmas:8=", <&dma40>; + + cam0_reg = <&cam0_reg>,"status"; + cam0_reg_gpio = <&cam0_reg>,"gpio:4", + <&cam0_reg>,"gpio:0=", <&gpio>; + cam1_reg = <&cam1_reg>,"status"; + cam1_reg_gpio = <&cam1_reg>,"gpio:4", + <&cam1_reg>,"gpio:0=", <&gpio>; }; }; diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README index e48dfc34a944..e4d3812678b1 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -144,15 +144,21 @@ Params: See /sys/kernel/debug/raspberrypi_axi_monitor for the results. - cam0_reg Enables CAM 0 regulator. CM1 & 3 only. + cam0_reg Enables CAM 0 regulator. + Only required on CM1 & 3. - cam0_reg_gpio Set GPIO for CAM 0 regulator. Default 31. - CM1 & 3 only. + cam0_reg_gpio Set GPIO for CAM 0 regulator. + Default 31 on CM1 & 3. + Default of GPIO expander 5 on CM4, but override + switches to normal GPIO. - cam1_reg Enables CAM 1 regulator. CM1 & 3 only. + cam1_reg Enables CAM 1 regulator. + Only required on CM1 & 3. - cam1_reg_gpio Set GPIO for CAM 1 regulator. Default 3. - CM1 & 3 only. + cam1_reg_gpio Set GPIO for CAM 1 regulator. + Default 3 on CM1 & 3. + Default of GPIO expander 5 on CM4, but override + switches to normal GPIO. eee Enable Energy Efficient Ethernet support for compatible devices (default "on"). See also -- 2.33.1