Skip to content

Commit 782d7dd

Browse files
committed
ARM: bcm: Switch board, clk and pinctrl to bcm2711 compatible
After the decision to use bcm2711 compatible for upstream, we should switch all accepted compatibles to bcm2711. So we can boot with one DTB the down- and the upstream kernel. Signed-off-by: Stefan Wahren <[email protected]>
1 parent e002c2d commit 782d7dd

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

arch/arm/boot/dts/bcm2711-rpi-4-b.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include "bcm283x-rpi-csi1-2lane.dtsi"
66

77
/ {
8-
compatible = "raspberrypi,4-model-b", "brcm,bcm2838";
8+
compatible = "raspberrypi,4-model-b", "brcm,bcm2711";
99
model = "Raspberry Pi 4 Model B";
1010

1111
memory {

arch/arm/boot/dts/bcm2838-rpi-4-b.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include "bcm2838-rpi.dtsi"
66

77
/ {
8-
compatible = "raspberrypi,4-model-b", "brcm,bcm2838";
8+
compatible = "raspberrypi,4-model-b", "brcm,bcm2711";
99
model = "Raspberry Pi 4 Model B";
1010

1111
chosen {

arch/arm/boot/dts/bcm2838.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@
440440
};
441441

442442
&clocks {
443-
compatible = "brcm,bcm2838-cprman";
443+
compatible = "brcm,bcm2711-cprman";
444444
};
445445

446446
&cpu_thermal {
@@ -456,7 +456,7 @@
456456
};
457457

458458
&gpio {
459-
compatible = "brcm,bcm2838-gpio", "brcm,bcm2835-gpio";
459+
compatible = "brcm,bcm2711-gpio", "brcm,bcm2835-gpio";
460460

461461
gpclk0_gpio49: gpclk0_gpio49 {
462462
brcm,pins = <49>;

arch/arm/mach-bcm/board_bcm2835.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ static const char * const bcm2835_compat[] = {
118118
#ifdef CONFIG_ARCH_MULTI_V7
119119
"brcm,bcm2836",
120120
"brcm,bcm2837",
121-
"brcm,bcm2838",
121+
"brcm,bcm2711",
122122
#endif
123123
NULL
124124
};

0 commit comments

Comments
 (0)