mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 22:23:27 +00:00
7d7aa2fd92
This change makes the names of Broadcom targets consistent by using the common notation based on SoC/CPU ID (which is used internally anyway), bcmXXXX instead of brcmXXXX. This is even used for target TITLE in make menuconfig already, only the short target name used brcm so far. Despite, since subtargets range from bcm2708 to bcm2711, it seems appropriate to use bcm27xx instead of bcm2708 (again, as already done for BOARDNAME). This also renames the packages brcm2708-userland and brcm2708-gpu-fw. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> Acked-by: Álvaro Fernández Rojas <noltari@gmail.com>
72 lines
1.9 KiB
Diff
72 lines
1.9 KiB
Diff
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
|
|
};
|