Skip to content

Commit

Permalink
dts: Simplify bootargs
Browse files Browse the repository at this point in the history
Reduce the number of different places that bootargs is set in Pi dts
files. The variants are all combinations of with/without Bluetooth
and with/without NUMA support (2711).

This is effectively a cosmetic change - the resulting dtbs are
unchanged.

Signed-off-by: Phil Elwell <[email protected]>
  • Loading branch information
pelwell authored and popcornmix committed Nov 6, 2024
1 parent 0c79e1e commit b8e5ac0
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 17 deletions.
4 changes: 4 additions & 0 deletions arch/arm/boot/dts/broadcom/bcm2708-rpi-bt.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@
};

/ {
chosen {
bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_headphones=0";
};

aliases {
bluetooth = &bt;
};
Expand Down
4 changes: 0 additions & 4 deletions arch/arm/boot/dts/broadcom/bcm2708-rpi-zero-w.dts
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@
compatible = "raspberrypi,model-zero-w", "brcm,bcm2835";
model = "Raspberry Pi Zero W";

chosen {
bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_headphones=0";
};

aliases {
serial0 = &uart1;
serial1 = &uart0;
Expand Down
4 changes: 0 additions & 4 deletions arch/arm/boot/dts/broadcom/bcm2710-rpi-3-b-plus.dts
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@
compatible = "raspberrypi,3-model-b-plus", "brcm,bcm2837";
model = "Raspberry Pi 3 Model B+";

chosen {
bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_headphones=0";
};

aliases {
serial0 = &uart1;
serial1 = &uart0;
Expand Down
4 changes: 0 additions & 4 deletions arch/arm/boot/dts/broadcom/bcm2710-rpi-3-b.dts
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@
compatible = "raspberrypi,3-model-b", "brcm,bcm2837";
model = "Raspberry Pi 3 Model B";

chosen {
bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_headphones=0";
};

aliases {
serial0 = &uart1;
serial1 = &uart0;
Expand Down
4 changes: 0 additions & 4 deletions arch/arm/boot/dts/broadcom/bcm2710-rpi-zero-2-w.dts
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@
compatible = "raspberrypi,model-zero-2-w", "brcm,bcm2837";
model = "Raspberry Pi Zero 2 W";

chosen {
bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_headphones=0";
};

aliases {
serial0 = &uart1;
serial1 = &uart0;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/broadcom/bcm2711-rpi-ds.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#include "bcm270x-rpi.dtsi"

/ {
chosen: chosen {
chosen {
bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_headphones=0 numa_policy=interleave";
};

Expand Down
4 changes: 4 additions & 0 deletions arch/arm/boot/dts/broadcom/bcm271x-rpi-bt.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@
};

/ {
chosen {
bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_headphones=0";
};

aliases {
bluetooth = &bt;
};
Expand Down

0 comments on commit b8e5ac0

Please sign in to comment.