mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-29 01:59:02 +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>
96 lines
1.9 KiB
Diff
96 lines
1.9 KiB
Diff
From 021d54e3ae67e2b02310b9e3e871876a2c3b7eee Mon Sep 17 00:00:00 2001
|
|
From: Phil Elwell <phil@raspberrypi.org>
|
|
Date: Wed, 29 May 2019 15:19:21 +0100
|
|
Subject: [PATCH] BCM270X_DT: Minor tidy up
|
|
|
|
Move arm_pmu out of soc on bcm2710, and labels aren't aliases.
|
|
|
|
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
|
---
|
|
arch/arm/boot/dts/bcm270x.dtsi | 14 +++++++-------
|
|
arch/arm/boot/dts/bcm2710.dtsi | 13 +++++--------
|
|
2 files changed, 12 insertions(+), 15 deletions(-)
|
|
|
|
--- a/arch/arm/boot/dts/bcm270x.dtsi
|
|
+++ b/arch/arm/boot/dts/bcm270x.dtsi
|
|
@@ -10,11 +10,11 @@
|
|
soc: soc {
|
|
|
|
watchdog: watchdog@7e100000 {
|
|
- /* Add alias */
|
|
+ /* Add label */
|
|
};
|
|
|
|
random: rng@7e104000 {
|
|
- /* Add alias */
|
|
+ /* Add label */
|
|
};
|
|
|
|
gpio@7e200000 { /* gpio */
|
|
@@ -40,18 +40,18 @@
|
|
};
|
|
|
|
spi0: spi@7e204000 {
|
|
- /* Add alias */
|
|
+ /* Add label */
|
|
dmas = <&dma 6>, <&dma 7>;
|
|
dma-names = "tx", "rx";
|
|
};
|
|
|
|
pixelvalve0: pixelvalve@7e206000 {
|
|
- /* Add alias */
|
|
+ /* Add label */
|
|
status = "disabled";
|
|
};
|
|
|
|
pixelvalve1: pixelvalve@7e207000 {
|
|
- /* Add alias */
|
|
+ /* Add label */
|
|
status = "disabled";
|
|
};
|
|
|
|
@@ -93,7 +93,7 @@
|
|
};
|
|
|
|
hvs: hvs@7e400000 {
|
|
- /* Add alias */
|
|
+ /* Add label */
|
|
status = "disabled";
|
|
};
|
|
|
|
@@ -119,7 +119,7 @@
|
|
};
|
|
|
|
pixelvalve2: pixelvalve@7e807000 {
|
|
- /* Add alias */
|
|
+ /* Add label */
|
|
status = "disabled";
|
|
};
|
|
|
|
--- a/arch/arm/boot/dts/bcm2710.dtsi
|
|
+++ b/arch/arm/boot/dts/bcm2710.dtsi
|
|
@@ -5,18 +5,15 @@
|
|
/ {
|
|
compatible = "brcm,bcm2837", "brcm,bcm2836";
|
|
|
|
- soc {
|
|
-
|
|
- arm-pmu {
|
|
+ arm-pmu {
|
|
#ifdef RPI364
|
|
- compatible = "arm,armv8-pmuv3", "arm,cortex-a7-pmu";
|
|
+ compatible = "arm,armv8-pmuv3", "arm,cortex-a7-pmu";
|
|
#else
|
|
- compatible = "arm,cortex-a7-pmu";
|
|
+ compatible = "arm,cortex-a7-pmu";
|
|
#endif
|
|
- interrupt-parent = <&local_intc>;
|
|
- interrupts = <9 IRQ_TYPE_LEVEL_HIGH>;
|
|
- };
|
|
+ };
|
|
|
|
+ soc {
|
|
/delete-node/ timer@7e003000;
|
|
};
|
|
|