1 From 34e658087e54db26ebd86f86a1549a393002a9ad Mon Sep 17 00:00:00 2001
2 From: Phil Elwell <phil@raspberrypi.com>
3 Date: Fri, 26 Nov 2021 15:20:06 +0000
4 Subject: [PATCH] ARM: dts: Update rpi-400 and cm4 dts to match 4-b
6 The Pi 4B dts file has had numerous updates since the Pi 400 and CM4
7 dts files were written. Apply those updates to the other files to
8 minimise the differences. The change is largely cosmetic, except for
9 the PCI "device-type" to "device_type" rename, and the correction of
10 the labels on the Pi 400 GPIO expander pins.
12 Signed-off-by: Phil Elwell <phil@raspberrypi.com>
14 arch/arm/boot/dts/bcm2711-rpi-400.dts | 90 ++++--------------------
15 arch/arm/boot/dts/bcm2711-rpi-cm4.dts | 98 ++++++---------------------
16 2 files changed, 36 insertions(+), 152 deletions(-)
18 --- a/arch/arm/boot/dts/bcm2711-rpi-400.dts
19 +++ b/arch/arm/boot/dts/bcm2711-rpi-400.dts
21 // SPDX-License-Identifier: GPL-2.0
23 #include "bcm2711.dtsi"
24 -#include "bcm2835-rpi.dtsi"
26 -#include <dt-bindings/reset/raspberrypi,firmware-reset.h>
27 +#include "bcm2711-rpi.dtsi"
28 +//#include "bcm283x-rpi-usb-peripheral.dtsi"
31 compatible = "raspberrypi,400", "brcm,bcm2711";
33 stdout-path = "serial1:115200n8";
36 - /* Will be filled by the bootloader */
38 - device_type = "memory";
43 - emmc2bus = &emmc2bus;
46 - blconfig = &blconfig;
51 gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
54 regulator-settling-time-us = <5000>;
55 gpios = <&expgpio 4 GPIO_ACTIVE_HIGH>;
56 - states = <1800000 0x1
58 + states = <1800000 0x1>,
67 - clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 0>, <&clk_27MHz>;
68 - clock-names = "hdmi", "bvb", "audio", "cec";
69 - wifi-2.4ghz-coexistence;
74 - clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 1>, <&clk_27MHz>;
75 - clock-names = "hdmi", "bvb", "audio", "cec";
76 - wifi-2.4ghz-coexistence;
81 - clocks = <&firmware_clocks 4>;
93 - * RPi4's co-processor will copy the board's bootloader configuration
94 - * into memory for the OS to consume. It'll also update this node with
95 - * its placement information.
98 - compatible = "raspberrypi,bootloader-config", "nvmem-rmem";
99 - #address-cells = <1>;
101 - reg = <0x0 0x0 0x0>;
103 - status = "disabled";
107 /* SDHCI is used to control the SDIO for wireless */
109 #address-cells = <1>;
114 - device-type = "pci";
115 + device_type = "pci";
116 #address-cells = <3>;
123 - reg = <0x0 0 0 0 0>;
125 resets = <&reset RASPBERRYPI_FIRMWARE_RESET_ID_USB>;
133 - interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
139 --- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
140 +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
142 // SPDX-License-Identifier: GPL-2.0
144 #include "bcm2711.dtsi"
145 -#include "bcm2835-rpi.dtsi"
147 -#include <dt-bindings/reset/raspberrypi,firmware-reset.h>
148 +#include "bcm2711-rpi.dtsi"
149 +//#include "bcm283x-rpi-usb-peripheral.dtsi"
152 compatible = "raspberrypi,4-compute-module", "brcm,bcm2711";
154 stdout-path = "serial1:115200n8";
157 - /* Will be filled by the bootloader */
159 - device_type = "memory";
164 - emmc2bus = &emmc2bus;
165 - ethernet0 = &genet;
167 - blconfig = &blconfig;
172 gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
175 regulator-settling-time-us = <5000>;
176 gpios = <&expgpio 4 GPIO_ACTIVE_HIGH>;
177 - states = <1800000 0x1
179 + states = <1800000 0x1>,
189 - firmware_clocks: clocks {
190 - compatible = "raspberrypi,firmware-clocks";
191 - #clock-cells = <1>;
195 - compatible = "raspberrypi,firmware-gpio";
198 - gpio-line-names = "BT_ON",
210 - gpios = <3 GPIO_ACTIVE_HIGH>;
216 - gpios = <7 GPIO_ACTIVE_HIGH>;
222 - compatible = "raspberrypi,firmware-reset";
223 - #reset-cells = <1>;
225 + gpio-line-names = "BT_ON",
236 + gpios = <3 GPIO_ACTIVE_HIGH>;
242 + gpios = <7 GPIO_ACTIVE_HIGH>;
247 @@ -191,23 +161,13 @@
251 - clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 0>, <&clk_27MHz>;
252 - clock-names = "hdmi", "bvb", "audio", "cec";
253 - wifi-2.4ghz-coexistence;
258 - clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 1>, <&clk_27MHz>;
259 - clock-names = "hdmi", "bvb", "audio", "cec";
260 - wifi-2.4ghz-coexistence;
265 - clocks = <&firmware_clocks 4>;
277 - * RPi4's co-processor will copy the board's bootloader configuration
278 - * into memory for the OS to consume. It'll also update this node with
279 - * its placement information.
281 - blconfig: nvram@0 {
282 - compatible = "raspberrypi,bootloader-config", "nvmem-rmem";
283 - #address-cells = <1>;
285 - reg = <0x0 0x0 0x0>;
287 - status = "disabled";
291 /* SDHCI is used to control the SDIO for wireless */
293 #address-cells = <1>;