86 lines
4.6 KiB
Diff
86 lines
4.6 KiB
Diff
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
|