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]>
raspberrypi · Sep 20, 2019 · ca662a7 · ca662a7
1 parent 855bab7
commit ca662a7
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
@@ -5,7 +5,7 @@
 #include "bcm283x-rpi-csi1-2lane.dtsi"
 
 / {
-	compatible = "raspberrypi,4-model-b", "brcm,bcm2838";
+	compatible = "raspberrypi,4-model-b", "brcm,bcm2711";
 	model = "Raspberry Pi 4 Model B";
 
 	memory {

diff --git a/arch/arm/boot/dts/bcm2838-rpi-4-b.dts b/arch/arm/boot/dts/bcm2838-rpi-4-b.dts
@@ -5,7 +5,7 @@
 #include "bcm2838-rpi.dtsi"
 
 / {
-	compatible = "raspberrypi,4-model-b", "brcm,bcm2838";
+	compatible = "raspberrypi,4-model-b", "brcm,bcm2711";
 	model = "Raspberry Pi 4 Model B";
 
 	chosen {

diff --git a/arch/arm/boot/dts/bcm2838.dtsi b/arch/arm/boot/dts/bcm2838.dtsi
@@ -440,7 +440,7 @@
 };
 
 &clocks {
-	compatible = "brcm,bcm2838-cprman";
+	compatible = "brcm,bcm2711-cprman";
 };
 
 &cpu_thermal {
@@ -456,7 +456,7 @@
 };
 
 &gpio {
-	compatible = "brcm,bcm2838-gpio", "brcm,bcm2835-gpio";
+	compatible = "brcm,bcm2711-gpio", "brcm,bcm2835-gpio";
 
 	gpclk0_gpio49: gpclk0_gpio49 {
 		brcm,pins = <49>;

diff --git a/arch/arm/mach-bcm/board_bcm2835.c b/arch/arm/mach-bcm/board_bcm2835.c
@@ -118,7 +118,7 @@ static const char * const bcm2835_compat[] = {
 #ifdef CONFIG_ARCH_MULTI_V7
 	"brcm,bcm2836",
 	"brcm,bcm2837",
-	"brcm,bcm2838",
+	"brcm,bcm2711",
 #endif
 	NULL
 };