mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 15:32:33 +00:00
bcm4908: update DTS files with the latest changes
The most affecting change is move of files from bcm4908/ to the bcmbca/. That required updating few paths. Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
This commit is contained in:
Rafał Miłecki
parent
047d471317
commit
45ac906c64
@ -77,7 +77,7 @@ endef
|
||||
define Device/asus_gt-ac5300
|
||||
DEVICE_VENDOR := Asus
|
||||
DEVICE_MODEL := GT-AC5300
|
||||
DEVICE_DTS := broadcom/bcm4908/bcm4908-asus-gt-ac5300
|
||||
DEVICE_DTS := broadcom/bcmbca/bcm4908-asus-gt-ac5300
|
||||
IMAGES := bin
|
||||
IMAGE/bin := append-ubi | bcm4908img | bcm4908asus
|
||||
ASUS_PRODUCTID := GT-AC5300
|
||||
@ -100,7 +100,7 @@ endef
|
||||
define Device/netgear_r8000p
|
||||
DEVICE_VENDOR := Netgear
|
||||
DEVICE_MODEL := R8000P
|
||||
DEVICE_DTS := broadcom/bcm4908/bcm4906-netgear-r8000p
|
||||
DEVICE_DTS := broadcom/bcmbca/bcm4906-netgear-r8000p
|
||||
IMAGES := bin
|
||||
IMAGE/chk := append-ubi | bcm4908img | netgear-chk
|
||||
NETGEAR_BOARD_ID := U12H359T00_NETGEAR
|
||||
@ -112,7 +112,7 @@ define Device/tplink_archer-c2300-v1
|
||||
DEVICE_VENDOR := TP-Link
|
||||
DEVICE_MODEL := Archer C2300
|
||||
DEVICE_VARIANT := v1
|
||||
DEVICE_DTS := broadcom/bcm4908/bcm4906-tplink-archer-c2300-v1
|
||||
DEVICE_DTS := broadcom/bcmbca/bcm4906-tplink-archer-c2300-v1
|
||||
IMAGES := bin
|
||||
IMAGE/bin := append-ubi | bcm4908img
|
||||
BROKEN := y
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
|
||||
fdt_linux_RAX220 {
|
||||
description = "dtb";
|
||||
data = /incbin/("${dts_dir}/broadcom/bcm4908/bcm4908-netgear-raxe500.dtb");
|
||||
data = /incbin/("${dts_dir}/broadcom/bcmbca/bcm4908-netgear-raxe500.dtb");
|
||||
arch = "arm64";
|
||||
type = "flat_dt";
|
||||
compression = "none";
|
||||
|
||||
@ -0,0 +1,66 @@
|
||||
From 4fdcbde682291fba2c3f45a41decd656d92a314f Mon Sep 17 00:00:00 2001
|
||||
From: William Zhang <william.zhang@broadcom.com>
|
||||
Date: Wed, 3 Aug 2022 10:54:49 -0700
|
||||
Subject: [PATCH] arm64: dts: bcmbca: update BCM4908 board dts files
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Append "brcm,bcmbca" to compatible strings based on the new bcmbca
|
||||
binding rule for BCM4908 family based boards.
|
||||
|
||||
Signed-off-by: William Zhang <william.zhang@broadcom.com>
|
||||
Acked-by: Rafał Miłecki <rafal@milecki.pl>
|
||||
Link: https://lore.kernel.org/r/20220803175455.47638-4-william.zhang@broadcom.com
|
||||
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
|
||||
---
|
||||
arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-netgear-r8000p.dts | 2 +-
|
||||
.../dts/broadcom/bcm4908/bcm4906-tplink-archer-c2300-v1.dts | 2 +-
|
||||
arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts | 2 +-
|
||||
.../arm64/boot/dts/broadcom/bcm4908/bcm4908-netgear-raxe500.dts | 2 +-
|
||||
4 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
--- a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-netgear-r8000p.dts
|
||||
+++ b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-netgear-r8000p.dts
|
||||
@@ -7,7 +7,7 @@
|
||||
#include "bcm4906.dtsi"
|
||||
|
||||
/ {
|
||||
- compatible = "netgear,r8000p", "brcm,bcm4906", "brcm,bcm4908";
|
||||
+ compatible = "netgear,r8000p", "brcm,bcm4906", "brcm,bcm4908", "brcm,bcmbca";
|
||||
model = "Netgear R8000P";
|
||||
|
||||
memory@0 {
|
||||
--- a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-tplink-archer-c2300-v1.dts
|
||||
+++ b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-tplink-archer-c2300-v1.dts
|
||||
@@ -7,7 +7,7 @@
|
||||
#include "bcm4906.dtsi"
|
||||
|
||||
/ {
|
||||
- compatible = "tplink,archer-c2300-v1", "brcm,bcm4906", "brcm,bcm4908";
|
||||
+ compatible = "tplink,archer-c2300-v1", "brcm,bcm4906", "brcm,bcm4908", "brcm,bcmbca";
|
||||
model = "TP-Link Archer C2300 V1";
|
||||
|
||||
memory@0 {
|
||||
--- a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts
|
||||
+++ b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts
|
||||
@@ -7,7 +7,7 @@
|
||||
#include "bcm4908.dtsi"
|
||||
|
||||
/ {
|
||||
- compatible = "asus,gt-ac5300", "brcm,bcm4908";
|
||||
+ compatible = "asus,gt-ac5300", "brcm,bcm4908", "brcm,bcmbca";
|
||||
model = "Asus GT-AC5300";
|
||||
|
||||
memory@0 {
|
||||
--- a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-netgear-raxe500.dts
|
||||
+++ b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-netgear-raxe500.dts
|
||||
@@ -3,7 +3,7 @@
|
||||
#include "bcm4908.dtsi"
|
||||
|
||||
/ {
|
||||
- compatible = "netgear,raxe500", "brcm,bcm4908";
|
||||
+ compatible = "netgear,raxe500", "brcm,bcm4908", "brcm,bcmbca";
|
||||
model = "Netgear RAXE500";
|
||||
|
||||
memory@0 {
|
||||
@ -0,0 +1,85 @@
|
||||
From ded8f22945899f4e87dd6d952bbc4abce6e64b7e Mon Sep 17 00:00:00 2001
|
||||
From: William Zhang <william.zhang@broadcom.com>
|
||||
Date: Wed, 3 Aug 2022 10:54:50 -0700
|
||||
Subject: [PATCH] arm64: dts: Move BCM4908 dts to bcmbca folder
|
||||
|
||||
As part of ARCH_BCM4908 to ARCH_BCMBCA migration, move the BCM4908 dts
|
||||
files to bcmbca folder and use CONFIG_ARCH_BCMBCA to build all the
|
||||
BCM4908 board dts. Delete bcm4908 folder and its makefile as well.
|
||||
|
||||
Signed-off-by: William Zhang <william.zhang@broadcom.com>
|
||||
Link: https://lore.kernel.org/r/20220803175455.47638-5-william.zhang@broadcom.com
|
||||
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
|
||||
---
|
||||
arch/arm64/boot/dts/broadcom/Makefile | 1 -
|
||||
arch/arm64/boot/dts/broadcom/bcm4908/Makefile | 5 -----
|
||||
arch/arm64/boot/dts/broadcom/bcmbca/Makefile | 4 ++++
|
||||
.../broadcom/{bcm4908 => bcmbca}/bcm4906-netgear-r8000p.dts | 0
|
||||
.../{bcm4908 => bcmbca}/bcm4906-tplink-archer-c2300-v1.dts | 0
|
||||
.../arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4906.dtsi | 0
|
||||
.../broadcom/{bcm4908 => bcmbca}/bcm4908-asus-gt-ac5300.dts | 0
|
||||
.../broadcom/{bcm4908 => bcmbca}/bcm4908-netgear-raxe500.dts | 0
|
||||
.../arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4908.dtsi | 0
|
||||
9 files changed, 4 insertions(+), 6 deletions(-)
|
||||
delete mode 100644 arch/arm64/boot/dts/broadcom/bcm4908/Makefile
|
||||
rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4906-netgear-r8000p.dts (100%)
|
||||
rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4906-tplink-archer-c2300-v1.dts (100%)
|
||||
rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4906.dtsi (100%)
|
||||
rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4908-asus-gt-ac5300.dts (100%)
|
||||
rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4908-netgear-raxe500.dts (100%)
|
||||
rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4908.dtsi (100%)
|
||||
|
||||
--- a/arch/arm64/boot/dts/broadcom/Makefile
|
||||
+++ b/arch/arm64/boot/dts/broadcom/Makefile
|
||||
@@ -5,7 +5,6 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rp
|
||||
bcm2837-rpi-3-b-plus.dtb \
|
||||
bcm2837-rpi-cm3-io3.dtb
|
||||
|
||||
-subdir-y += bcm4908
|
||||
subdir-y += bcmbca
|
||||
subdir-y += northstar2
|
||||
subdir-y += stingray
|
||||
--- a/arch/arm64/boot/dts/broadcom/bcm4908/Makefile
|
||||
+++ /dev/null
|
||||
@@ -1,5 +0,0 @@
|
||||
-# SPDX-License-Identifier: GPL-2.0
|
||||
-dtb-$(CONFIG_ARCH_BCM4908) += bcm4906-netgear-r8000p.dtb
|
||||
-dtb-$(CONFIG_ARCH_BCM4908) += bcm4906-tplink-archer-c2300-v1.dtb
|
||||
-dtb-$(CONFIG_ARCH_BCM4908) += bcm4908-asus-gt-ac5300.dtb
|
||||
-dtb-$(CONFIG_ARCH_BCM4908) += bcm4908-netgear-raxe500.dtb
|
||||
--- a/arch/arm64/boot/dts/broadcom/bcmbca/Makefile
|
||||
+++ b/arch/arm64/boot/dts/broadcom/bcmbca/Makefile
|
||||
@@ -1,5 +1,9 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
dtb-$(CONFIG_ARCH_BCMBCA) += \
|
||||
+ bcm4906-netgear-r8000p.dtb \
|
||||
+ bcm4906-tplink-archer-c2300-v1.dtb \
|
||||
+ bcm4908-asus-gt-ac5300.dtb \
|
||||
+ bcm4908-netgear-raxe500.dtb \
|
||||
bcm4912-asus-gt-ax6000.dtb \
|
||||
bcm94912.dtb \
|
||||
bcm963158.dtb \
|
||||
diff --git a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-netgear-r8000p.dts b/arch/arm64/boot/dts/broadcom/bcmbca/bcm4906-netgear-r8000p.dts
|
||||
similarity index 100%
|
||||
rename from arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-netgear-r8000p.dts
|
||||
rename to arch/arm64/boot/dts/broadcom/bcmbca/bcm4906-netgear-r8000p.dts
|
||||
diff --git a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-tplink-archer-c2300-v1.dts b/arch/arm64/boot/dts/broadcom/bcmbca/bcm4906-tplink-archer-c2300-v1.dts
|
||||
similarity index 100%
|
||||
rename from arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-tplink-archer-c2300-v1.dts
|
||||
rename to arch/arm64/boot/dts/broadcom/bcmbca/bcm4906-tplink-archer-c2300-v1.dts
|
||||
diff --git a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4906.dtsi b/arch/arm64/boot/dts/broadcom/bcmbca/bcm4906.dtsi
|
||||
similarity index 100%
|
||||
rename from arch/arm64/boot/dts/broadcom/bcm4908/bcm4906.dtsi
|
||||
rename to arch/arm64/boot/dts/broadcom/bcmbca/bcm4906.dtsi
|
||||
diff --git a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts b/arch/arm64/boot/dts/broadcom/bcmbca/bcm4908-asus-gt-ac5300.dts
|
||||
similarity index 100%
|
||||
rename from arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts
|
||||
rename to arch/arm64/boot/dts/broadcom/bcmbca/bcm4908-asus-gt-ac5300.dts
|
||||
diff --git a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-netgear-raxe500.dts b/arch/arm64/boot/dts/broadcom/bcmbca/bcm4908-netgear-raxe500.dts
|
||||
similarity index 100%
|
||||
rename from arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-netgear-raxe500.dts
|
||||
rename to arch/arm64/boot/dts/broadcom/bcmbca/bcm4908-netgear-raxe500.dts
|
||||
diff --git a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi b/arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi
|
||||
similarity index 100%
|
||||
rename from arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi
|
||||
rename to arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi
|
||||
@ -0,0 +1,62 @@
|
||||
From 72e0bdb6d7edb1785d58f2e8e7c80e1d2f93a319 Mon Sep 17 00:00:00 2001
|
||||
From: William Zhang <william.zhang@broadcom.com>
|
||||
Date: Wed, 3 Aug 2022 10:54:51 -0700
|
||||
Subject: [PATCH] arm64: dts: Add BCM4908 generic board dts
|
||||
|
||||
Add generic bare bone bcm94908.dts file to support any 4908 based
|
||||
design. It supports cpu subsystem, memory and an uart console. This can
|
||||
be useful for board bring-up and cpu subsystem and memory related kernel
|
||||
test as well.
|
||||
|
||||
Signed-off-by: William Zhang <william.zhang@broadcom.com>
|
||||
Link: https://lore.kernel.org/r/20220803175455.47638-6-william.zhang@broadcom.com
|
||||
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
|
||||
---
|
||||
arch/arm64/boot/dts/broadcom/bcmbca/Makefile | 1 +
|
||||
.../boot/dts/broadcom/bcmbca/bcm94908.dts | 30 +++++++++++++++++++
|
||||
2 files changed, 31 insertions(+)
|
||||
create mode 100644 arch/arm64/boot/dts/broadcom/bcmbca/bcm94908.dts
|
||||
|
||||
--- a/arch/arm64/boot/dts/broadcom/bcmbca/Makefile
|
||||
+++ b/arch/arm64/boot/dts/broadcom/bcmbca/Makefile
|
||||
@@ -4,6 +4,7 @@ dtb-$(CONFIG_ARCH_BCMBCA) += \
|
||||
bcm4906-tplink-archer-c2300-v1.dtb \
|
||||
bcm4908-asus-gt-ac5300.dtb \
|
||||
bcm4908-netgear-raxe500.dtb \
|
||||
+ bcm94908.dtb \
|
||||
bcm4912-asus-gt-ax6000.dtb \
|
||||
bcm94912.dtb \
|
||||
bcm963158.dtb \
|
||||
--- /dev/null
|
||||
+++ b/arch/arm64/boot/dts/broadcom/bcmbca/bcm94908.dts
|
||||
@@ -0,0 +1,30 @@
|
||||
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
|
||||
+/*
|
||||
+ * Copyright 2022 Broadcom Ltd.
|
||||
+ */
|
||||
+
|
||||
+/dts-v1/;
|
||||
+
|
||||
+#include "bcm4908.dtsi"
|
||||
+
|
||||
+/ {
|
||||
+ model = "Broadcom BCM94908 Reference Board";
|
||||
+ compatible = "brcm,bcm94908", "brcm,bcm4908", "brcm,bcmbca";
|
||||
+
|
||||
+ aliases {
|
||||
+ serial0 = &uart0;
|
||||
+ };
|
||||
+
|
||||
+ chosen {
|
||||
+ stdout-path = "serial0:115200n8";
|
||||
+ };
|
||||
+
|
||||
+ memory@0 {
|
||||
+ device_type = "memory";
|
||||
+ reg = <0x0 0x0 0x0 0x08000000>;
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+&uart0 {
|
||||
+ status = "okay";
|
||||
+};
|
||||
@ -0,0 +1,31 @@
|
||||
From 68064196cffea33f090bd2e8d81cd5e20107ecf1 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
||||
Date: Thu, 3 Nov 2022 11:53:16 +0100
|
||||
Subject: [PATCH] arm64: dts: broadcom: bcmbca: bcm4908: add TWD block timer
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
BCM4908 TWD contains block with 4 timers. Add binding for it.
|
||||
|
||||
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
||||
Link: https://lore.kernel.org/r/20221103105316.21294-1-zajec5@gmail.com
|
||||
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
|
||||
---
|
||||
arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
--- a/arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi
|
||||
+++ b/arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi
|
||||
@@ -283,6 +283,11 @@
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
|
||||
+ timer@0 {
|
||||
+ compatible = "brcm,bcm63138-timer";
|
||||
+ reg = <0x0 0x28>;
|
||||
+ };
|
||||
+
|
||||
watchdog@28 {
|
||||
compatible = "brcm,bcm6345-wdt";
|
||||
reg = <0x28 0x8>;
|
||||
@ -0,0 +1,46 @@
|
||||
From 4f9fb09175e87a233787a2dee1e5dabb14deb022 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
||||
Date: Thu, 3 Nov 2022 12:00:15 +0100
|
||||
Subject: [PATCH] arm64: dts: broadcom: bcmbca: bcm6858: add TWD block
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
BCM6858 contains TWD block with timers, watchdog, and reset subblocks.
|
||||
Describe it.
|
||||
|
||||
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
||||
Link: https://lore.kernel.org/r/20221103110015.21761-1-zajec5@gmail.com
|
||||
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
|
||||
---
|
||||
.../boot/dts/broadcom/bcmbca/bcm6858.dtsi | 19 +++++++++++++++++++
|
||||
1 file changed, 19 insertions(+)
|
||||
|
||||
--- a/arch/arm64/boot/dts/broadcom/bcmbca/bcm6858.dtsi
|
||||
+++ b/arch/arm64/boot/dts/broadcom/bcmbca/bcm6858.dtsi
|
||||
@@ -109,6 +109,25 @@
|
||||
#size-cells = <1>;
|
||||
ranges = <0x0 0x0 0xff800000 0x62000>;
|
||||
|
||||
+ twd: timer-mfd@400 {
|
||||
+ compatible = "brcm,bcm4908-twd", "simple-mfd", "syscon";
|
||||
+ reg = <0x400 0x4c>;
|
||||
+ ranges = <0x0 0x400 0x4c>;
|
||||
+
|
||||
+ #address-cells = <1>;
|
||||
+ #size-cells = <1>;
|
||||
+
|
||||
+ timer@0 {
|
||||
+ compatible = "brcm,bcm63138-timer";
|
||||
+ reg = <0x0 0x28>;
|
||||
+ };
|
||||
+
|
||||
+ watchdog@28 {
|
||||
+ compatible = "brcm,bcm6345-wdt";
|
||||
+ reg = <0x28 0x8>;
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
uart0: serial@640 {
|
||||
compatible = "brcm,bcm6345-uart";
|
||||
reg = <0x640 0x18>;
|
||||
@ -1,6 +1,6 @@
|
||||
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
||||
Date: Mon, 15 Feb 2021 22:01:03 +0100
|
||||
Subject: [PATCH] arm64: dts: broadcom: bcm4908: limit amount of GPIOs
|
||||
Subject: [PATCH] arm64: dts: broadcom: bcmbca: bcm4908: limit amount of GPIOs
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
@ -10,9 +10,9 @@ Linux driver can't handle more than 64 GPIOs
|
||||
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
||||
---
|
||||
|
||||
--- a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi
|
||||
+++ b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi
|
||||
@@ -292,7 +292,7 @@
|
||||
--- a/arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi
|
||||
+++ b/arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi
|
||||
@@ -297,7 +297,7 @@
|
||||
gpio0: gpio-controller@500 {
|
||||
compatible = "brcm,bcm6345-gpio";
|
||||
reg-names = "dirout", "dat";
|
||||
Loading…
Reference in New Issue
Block a user