1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
|
From 30972497979c65781bb8170743447b45b6dfd3cd Mon Sep 17 00:00:00 2001
From: Stefan Wahren <wahrenst@gmx.net>
Date: Thu, 19 Sep 2019 20:45:30 +0200
Subject: [PATCH] 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 <wahrenst@gmx.net>
---
arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 2 +-
arch/arm/boot/dts/bcm2838-rpi-4-b.dts | 2 +-
arch/arm/boot/dts/bcm2838.dtsi | 4 ++--
arch/arm/mach-bcm/board_bcm2835.c | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
--- 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@0 {
--- 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 {
--- 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>;
--- 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
};
|
