1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter.git synced 2025-03-09 15:40:20 +00:00

Update 950-0785-ARM-dts-Add-bcm2711-rpi-cm4.dts.patch

This commit is contained in:
suyuan168 2022-01-04 01:17:12 +08:00
parent d36661d265
commit 2dae477062

View file

@ -9,7 +9,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
---
arch/arm/boot/dts/Makefile | 3 +-
arch/arm/boot/dts/bcm2711-rpi-cm4.dts | 586 ++++++++++++++++++++++++++
3 files changed, 594 insertions(+), 1 deletion(-)
3 files changed, 485 insertions(+), 1 deletion(-)
create mode 100644 arch/arm/boot/dts/bcm2711-rpi-cm4.dts
--- a/arch/arm/boot/dts/Makefile
@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
alpine-db.dtb
--- /dev/null
+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
@@ -0,0 +1,536 @@
@@ -0,0 +1,485 @@
+// SPDX-License-Identifier: GPL-2.0
+/dts-v1/;
+#include "bcm2711.dtsi"
@ -48,7 +48,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
+ };
+
+ aliases {
+ emmc2bus = &emmc2bus;
+ ethernet0 = &genet;
+ pcie0 = &pcie0;
+ };
+
+ leds {
@ -59,6 +61,8 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
+ pwr {
+ label = "PWR";
+ gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
+ default-state = "keep";
+ linux,default-trigger = "default-on";
+ };
+ };
+
@ -172,50 +176,11 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
+ interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
+};
+
+&vc4 {
+ status = "okay";
+};
+
+&pixelvalve0 {
+ status = "okay";
+};
+
+&pixelvalve1 {
+ status = "okay";
+};
+
+&pixelvalve2 {
+ status = "okay";
+};
+
+&pixelvalve3 {
+ status = "okay";
+};
+
+&pixelvalve4 {
+ status = "okay";
+};
+
+&hdmi0 {
+ status = "okay";
+};
+
+&ddc0 {
+ status = "okay";
+};
+
+&hdmi1 {
+ status = "okay";
+};
+
+&ddc1 {
+ status = "okay";
+};
+
+// =============================================
+// Downstream rpi- changes
+
+#include "bcm270x.dtsi"
+#include "bcm271x-rpi-bt.dtsi"
+
+/ {
+ soc {
@ -225,14 +190,13 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
+};
+
+#include "bcm2711-rpi.dtsi"
+#include "bcm283x-rpi-csi1-2lane.dtsi"
+#include "bcm283x-rpi-csi0-2lane.dtsi"
+#include "bcm283x-rpi-csi1-4lane.dtsi"
+#include "bcm283x-rpi-i2c0mux_0_44.dtsi"
+
+/delete-node/ &emmc2;
+
+/ {
+ chosen {
+ bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1 snd_bcm2835.enable_headphones=1";
+ bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1";
+ };
+
+ aliases {
@ -246,34 +210,16 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
+ i2c4 = &i2c4;
+ i2c5 = &i2c5;
+ i2c6 = &i2c6;
+ /delete-property/ ethernet;
+ /delete-property/ intc;
+ pcie0 = &pcie0;
+ emmc2bus = &emmc2bus;
+ };
+
+ emmc2bus: emmc2bus {
+ compatible = "simple-bus";
+ #address-cells = <2>;
+ #size-cells = <1>;
+
+ ranges = <0x0 0x7e000000 0x0 0xfe000000 0x01800000>;
+ dma-ranges = <0x0 0xc0000000 0x0 0x00000000 0x40000000>;
+
+ emmc2: emmc2@7e340000 {
+ compatible = "brcm,bcm2711-emmc2";
+ status = "okay";
+ interrupts = <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&clocks BCM2711_CLOCK_EMMC2>;
+ reg = <0x0 0x7e340000 0x100>;
+ vqmmc-supply = <&sd_io_1v8_reg>;
+ broken-cd;
+ };
+ };
+
+ /delete-node/ wifi-pwrseq;
+};
+
+&pcie0 {
+ brcm,enable-l1ss;
+};
+
+&mmcnr {
+ pinctrl-names = "default";
+ pinctrl-0 = <&sdio_pins>;
@ -284,8 +230,6 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
+&uart0 {
+ pinctrl-0 = <&uart0_pins &bt_pins>;
+ status = "okay";
+
+ /delete-node/ bluetooth;
+};
+
+&uart1 {
@ -293,16 +237,16 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
+};
+
+&gpio {
+ spi0_pins: spi0_pins {
+ brcm,pins = <9 10 11>;
+ brcm,function = <BCM2835_FSEL_ALT0>;
+ };
+
+ spi0_cs_pins: spi0_cs_pins {
+ brcm,pins = <8 7>;
+ brcm,function = <BCM2835_FSEL_GPIO_OUT>;
+ };
+
+ spi3_pins: spi3_pins {
+ brcm,pins = <1 2 3>;
+ brcm,function = <BCM2835_FSEL_ALT3>;
+ };
+
+ spi4_pins: spi4_pins {
+ brcm,pins = <5 6 7>;
+ brcm,function = <BCM2835_FSEL_ALT3>;
@ -373,6 +317,10 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
+ clock-frequency = <100000>;
+};
+
+&firmwarekms {
+ compatible = "raspberrypi,rpi-firmware-kms-2711";
+};
+
+// =============================================
+// Board specific stuff here
+
@ -403,8 +351,8 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
+
+&gpio {
+ audio_pins: audio_pins {
+ brcm,pins = <40 41>;
+ brcm,function = <4>;
+ brcm,pins = <>;
+ brcm,function = <>;
+ };
+};
+
@ -419,10 +367,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
+ label = "led1";
+ linux,default-trigger = "default-on";
+ gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
+ default-state = "keep";
+ linux,default-trigger = "default-on";
+ };
+
+ wlan2g {
+ label = "wlan2g";
+ gpios = <&gpio 17 GPIO_ACTIVE_HIGH>;
@ -506,6 +451,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
+&audio {
+ pinctrl-names = "default";
+ pinctrl-0 = <&audio_pins>;
+ brcm,disable-headphones = <1>;
+};
+
+&vc4 {
@ -561,6 +507,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
+ eth_led0 = <&phy1>,"led-modes:0";
+ eth_led1 = <&phy1>,"led-modes:4";
+
+ sd_poll_once = <&emmc2>, "non-removable?";
+ spi_dma4 = <&spi0>, "dmas:0=", <&dma40>,
+ <&spi0>, "dmas:8=", <&dma40>;
+ };