c06fb25d1f
Some checks failed
Build Kernel / Build all affected Kernels (push) Has been cancelled
Build all core packages / Build all core packages for selected target (push) Has been cancelled
Build and Push prebuilt tools container / Build and Push all prebuilt containers (push) Has been cancelled
Build Toolchains / Build Toolchains for each target (push) Has been cancelled
Build host tools / Build host tools for linux and macos based systems (push) Has been cancelled
Coverity scan build / Coverity x86/64 build (push) Has been cancelled
98 lines
2.8 KiB
Diff
98 lines
2.8 KiB
Diff
From aece59283a161dfad67c700c2ae97f9dd996eb2f Mon Sep 17 00:00:00 2001
|
|
From: Phil Elwell <phil@raspberrypi.com>
|
|
Date: Tue, 23 Jul 2024 15:55:54 +0100
|
|
Subject: [PATCH 1344/1350] dts: Move some common rpi settings into rpi files
|
|
|
|
Most 2711 devices and all 2712 device share common bootargs (command
|
|
lines). Make the common values shared defaults, overriding them were
|
|
necessary.
|
|
|
|
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
|
---
|
|
arch/arm/boot/dts/broadcom/bcm2711-rpi-4-b.dts | 4 ----
|
|
arch/arm/boot/dts/broadcom/bcm2711-rpi-cm4.dts | 4 ----
|
|
arch/arm/boot/dts/broadcom/bcm2711-rpi-ds.dtsi | 1 +
|
|
arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts | 5 -----
|
|
arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5.dtsi | 5 -----
|
|
arch/arm64/boot/dts/broadcom/bcm2712-rpi.dtsi | 5 +++++
|
|
6 files changed, 6 insertions(+), 18 deletions(-)
|
|
|
|
--- a/arch/arm/boot/dts/broadcom/bcm2711-rpi-4-b.dts
|
|
+++ b/arch/arm/boot/dts/broadcom/bcm2711-rpi-4-b.dts
|
|
@@ -265,10 +265,6 @@
|
|
#include "bcm283x-rpi-i2c0mux_0_44.dtsi"
|
|
|
|
/ {
|
|
- chosen {
|
|
- bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_headphones=0";
|
|
- };
|
|
-
|
|
/delete-node/ wifi-pwrseq;
|
|
};
|
|
|
|
--- a/arch/arm/boot/dts/broadcom/bcm2711-rpi-cm4.dts
|
|
+++ b/arch/arm/boot/dts/broadcom/bcm2711-rpi-cm4.dts
|
|
@@ -274,10 +274,6 @@
|
|
#include "bcm283x-rpi-i2c0mux_0_44.dtsi"
|
|
|
|
/ {
|
|
- chosen {
|
|
- bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_headphones=0";
|
|
- };
|
|
-
|
|
/delete-node/ wifi-pwrseq;
|
|
};
|
|
|
|
--- a/arch/arm/boot/dts/broadcom/bcm2711-rpi-ds.dtsi
|
|
+++ b/arch/arm/boot/dts/broadcom/bcm2711-rpi-ds.dtsi
|
|
@@ -3,6 +3,7 @@
|
|
|
|
/ {
|
|
chosen: chosen {
|
|
+ bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_headphones=0";
|
|
};
|
|
|
|
__overrides__ {
|
|
--- a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts
|
|
+++ b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts
|
|
@@ -432,11 +432,6 @@ dpi_16bit_gpio2: &rp1_dpi_16bit_g
|
|
};
|
|
|
|
/ {
|
|
- chosen: chosen {
|
|
- bootargs = "reboot=w coherent_pool=1M 8250.nr_uarts=1 pci=pcie_bus_safe";
|
|
- stdout-path = "serial10:115200n8";
|
|
- };
|
|
-
|
|
fan: cooling_fan {
|
|
status = "disabled";
|
|
compatible = "pwm-fan";
|
|
--- a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5.dtsi
|
|
+++ b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5.dtsi
|
|
@@ -422,11 +422,6 @@ dpi_16bit_gpio2: &rp1_dpi_16bit_g
|
|
};
|
|
|
|
/ {
|
|
- chosen: chosen {
|
|
- bootargs = "reboot=w coherent_pool=1M 8250.nr_uarts=1 pci=pcie_bus_safe";
|
|
- stdout-path = "serial10:115200n8";
|
|
- };
|
|
-
|
|
fan: cooling_fan {
|
|
status = "disabled";
|
|
compatible = "pwm-fan";
|
|
--- a/arch/arm64/boot/dts/broadcom/bcm2712-rpi.dtsi
|
|
+++ b/arch/arm64/boot/dts/broadcom/bcm2712-rpi.dtsi
|
|
@@ -98,6 +98,11 @@
|
|
};
|
|
|
|
/ {
|
|
+ chosen: chosen {
|
|
+ bootargs = "reboot=w coherent_pool=1M 8250.nr_uarts=1 pci=pcie_bus_safe";
|
|
+ stdout-path = "serial10:115200n8";
|
|
+ };
|
|
+
|
|
aliases: aliases {
|
|
blconfig = &blconfig;
|
|
blpubkey = &blpubkey;
|