20ea6adbf1
Build system: x86_64 Build-tested: bcm2708, bcm2709, bcm2710, bcm2711 Run-tested: bcm2708/RPiB+, bcm2709/RPi3B, bcm2710/RPi3B, bcm2711/RPi4B Signed-off-by: Marty Jones <mj8263788@gmail.com> Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
50 lines
1.5 KiB
Diff
50 lines
1.5 KiB
Diff
From 46fbde5380a7a1707e19ac46842cb9ce526c5216 Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
Date: Tue, 14 Dec 2021 14:54:15 +0000
|
|
Subject: [PATCH] ARM: dts: bcm2711-cm4s Correct i2c0mux to use 0/1 and
|
|
28/29 & 2 regulators
|
|
|
|
CM4S follows CM1/3, so based on the documentation cameras/displays
|
|
connect to 0/1 and 28/29, not 0/1 and 44/45.
|
|
|
|
Likewise the camera regulator controls are independent as on CM1/3.
|
|
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
---
|
|
arch/arm/boot/dts/bcm2711-rpi-cm4s.dts | 18 ++++++++++++++++--
|
|
1 file changed, 16 insertions(+), 2 deletions(-)
|
|
|
|
--- a/arch/arm/boot/dts/bcm2711-rpi-cm4s.dts
|
|
+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4s.dts
|
|
@@ -155,14 +155,28 @@
|
|
|
|
#include "bcm283x-rpi-csi0-2lane.dtsi"
|
|
#include "bcm283x-rpi-csi1-4lane.dtsi"
|
|
-#include "bcm283x-rpi-i2c0mux_0_44.dtsi"
|
|
-#include "bcm283x-rpi-cam1-regulator.dtsi"
|
|
+#include "bcm283x-rpi-i2c0mux_0_28.dtsi"
|
|
|
|
/ {
|
|
chosen {
|
|
bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1";
|
|
};
|
|
|
|
+ cam1_reg: cam1_reg {
|
|
+ compatible = "regulator-fixed";
|
|
+ regulator-name = "cam1-regulator";
|
|
+ gpio = <&gpio 2 GPIO_ACTIVE_HIGH>;
|
|
+ enable-active-high;
|
|
+ status = "disabled";
|
|
+ };
|
|
+ cam0_reg: cam0_reg {
|
|
+ compatible = "regulator-fixed";
|
|
+ regulator-name = "cam0-regulator";
|
|
+ gpio = <&gpio 30 GPIO_ACTIVE_HIGH>;
|
|
+ enable-active-high;
|
|
+ status = "disabled";
|
|
+ };
|
|
+
|
|
aliases {
|
|
serial0 = &uart0;
|
|
mmc0 = &emmc2;
|