82bd6ce888d199e236ab08f54dc060f708e72d8a
[openwrt/staging/linusw.git] /
1 From 46fbde5380a7a1707e19ac46842cb9ce526c5216 Mon Sep 17 00:00:00 2001
2 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
3 Date: Tue, 14 Dec 2021 14:54:15 +0000
4 Subject: [PATCH] ARM: dts: bcm2711-cm4s Correct i2c0mux to use 0/1 and
5 28/29 & 2 regulators
6
7 CM4S follows CM1/3, so based on the documentation cameras/displays
8 connect to 0/1 and 28/29, not 0/1 and 44/45.
9
10 Likewise the camera regulator controls are independent as on CM1/3.
11
12 Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
13 ---
14 arch/arm/boot/dts/bcm2711-rpi-cm4s.dts | 18 ++++++++++++++++--
15 1 file changed, 16 insertions(+), 2 deletions(-)
16
17 --- a/arch/arm/boot/dts/bcm2711-rpi-cm4s.dts
18 +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4s.dts
19 @@ -155,14 +155,28 @@
20
21 #include "bcm283x-rpi-csi0-2lane.dtsi"
22 #include "bcm283x-rpi-csi1-4lane.dtsi"
23 -#include "bcm283x-rpi-i2c0mux_0_44.dtsi"
24 -#include "bcm283x-rpi-cam1-regulator.dtsi"
25 +#include "bcm283x-rpi-i2c0mux_0_28.dtsi"
26
27 / {
28 chosen {
29 bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1";
30 };
31
32 + cam1_reg: cam1_reg {
33 + compatible = "regulator-fixed";
34 + regulator-name = "cam1-regulator";
35 + gpio = <&gpio 2 GPIO_ACTIVE_HIGH>;
36 + enable-active-high;
37 + status = "disabled";
38 + };
39 + cam0_reg: cam0_reg {
40 + compatible = "regulator-fixed";
41 + regulator-name = "cam0-regulator";
42 + gpio = <&gpio 30 GPIO_ACTIVE_HIGH>;
43 + enable-active-high;
44 + status = "disabled";
45 + };
46 +
47 aliases {
48 serial0 = &uart0;
49 mmc0 = &emmc2;