1 From a38d7464ca20e1c0aaa3ed77e03e1ea6af4bc557 Mon Sep 17 00:00:00 2001
2 From: Phil Elwell <phil@raspberrypi.com>
3 Date: Wed, 31 Mar 2021 10:22:30 +0100
4 Subject: [PATCH] ARM: dts: update bcm2711-rpi-cm4.dts and -400
6 Neither CM4 nor Pi 400 have appeared upstream yet, and as a result
7 they have missed out on improvements to the Pi 4B platform.
9 Signed-off-by: Phil Elwell <phil@raspberrypi.com>
11 ARM: dts: Bring bcm2711-rpi-400.dts up-to-date
13 Pi 400 support has not appeared upstream yet, and as a result it has
14 missed out on improvements to the other Pi 4 platforms.
16 Signed-off-by: Phil Elwell <phil@raspberrypi.com>
18 arch/arm/boot/dts/bcm2711-rpi-400.dts | 17 +++++++
19 arch/arm/boot/dts/bcm2711-rpi-cm4.dts | 73 +++++++++++++++++++++------
20 2 files changed, 74 insertions(+), 16 deletions(-)
22 --- a/arch/arm/boot/dts/bcm2711-rpi-400.dts
23 +++ b/arch/arm/boot/dts/bcm2711-rpi-400.dts
28 + blconfig = &blconfig;
38 + * RPi4's co-processor will copy the board's bootloader configuration
39 + * into memory for the OS to consume. It'll also update this node with
40 + * its placement information.
43 + compatible = "raspberrypi,bootloader-config", "nvmem-rmem";
44 + #address-cells = <1>;
46 + reg = <0x0 0x0 0x0>;
48 + status = "disabled";
52 /* SDHCI is used to control the SDIO for wireless */
55 --- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
56 +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
58 #include "bcm2711.dtsi"
59 #include "bcm2835-rpi.dtsi"
61 +#include <dt-bindings/reset/raspberrypi,firmware-reset.h>
64 compatible = "raspberrypi,4-compute-module", "brcm,bcm2711";
65 model = "Raspberry Pi Compute Module 4";
70 + blconfig = &blconfig;
78 + firmware_clocks: clocks {
79 + compatible = "raspberrypi,firmware-clocks";
84 compatible = "raspberrypi,firmware-gpio";
92 + compatible = "raspberrypi,firmware-reset";
107 - status = "disabled";
111 pinctrl-names = "default";
112 pinctrl-0 = <&pwm1_0_gpio40 &pwm1_1_gpio41>;
118 + * RPi4's co-processor will copy the board's bootloader configuration
119 + * into memory for the OS to consume. It'll also update this node with
120 + * its placement information.
122 + blconfig: nvram@0 {
123 + compatible = "raspberrypi,bootloader-config", "nvmem-rmem";
124 + #address-cells = <1>;
126 + reg = <0x0 0x0 0x0>;
128 + status = "disabled";
132 /* SDHCI is used to control the SDIO for wireless */
134 #address-cells = <1>;
141 + #address-cells = <3>;
148 + reg = <0x10000 0 0 0 0>;
149 + resets = <&reset RASPBERRYPI_FIRMWARE_RESET_ID_USB>;
154 /* uart0 communicates with the BT module */
156 pinctrl-names = "default";
158 interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
166 + status = "disabled";
169 // =============================================
170 // Downstream rpi- changes
173 #include "bcm283x-rpi-csi0-2lane.dtsi"
174 #include "bcm283x-rpi-csi1-4lane.dtsi"
175 #include "bcm283x-rpi-i2c0mux_0_44.dtsi"
176 +#include "bcm283x-rpi-cam1-regulator.dtsi"
183 /delete-node/ wifi-pwrseq;
185 - cam0_reg: cam1_reg: cam1_reg {
186 - compatible = "regulator-fixed";
187 - regulator-name = "cam1-reg";
188 - gpio = <&expgpio 5 GPIO_ACTIVE_HIGH>;
189 - enable-active-high;
190 - status = "disabled";
196 brcm,disable-headphones = <1>;
199 +cam0_reg: &cam1_reg {
200 + gpio = <&expgpio 5 GPIO_ACTIVE_HIGH>;
205 act_led_gpio = <&act_led>,"gpios:4";