1 From ded8f22945899f4e87dd6d952bbc4abce6e64b7e Mon Sep 17 00:00:00 2001
2 From: William Zhang <william.zhang@broadcom.com>
3 Date: Wed, 3 Aug 2022 10:54:50 -0700
4 Subject: [PATCH] arm64: dts: Move BCM4908 dts to bcmbca folder
6 As part of ARCH_BCM4908 to ARCH_BCMBCA migration, move the BCM4908 dts
7 files to bcmbca folder and use CONFIG_ARCH_BCMBCA to build all the
8 BCM4908 board dts. Delete bcm4908 folder and its makefile as well.
10 Signed-off-by: William Zhang <william.zhang@broadcom.com>
11 Link: https://lore.kernel.org/r/20220803175455.47638-5-william.zhang@broadcom.com
12 Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
14 arch/arm64/boot/dts/broadcom/Makefile | 1 -
15 arch/arm64/boot/dts/broadcom/bcm4908/Makefile | 5 -----
16 arch/arm64/boot/dts/broadcom/bcmbca/Makefile | 4 ++++
17 .../broadcom/{bcm4908 => bcmbca}/bcm4906-netgear-r8000p.dts | 0
18 .../{bcm4908 => bcmbca}/bcm4906-tplink-archer-c2300-v1.dts | 0
19 .../arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4906.dtsi | 0
20 .../broadcom/{bcm4908 => bcmbca}/bcm4908-asus-gt-ac5300.dts | 0
21 .../broadcom/{bcm4908 => bcmbca}/bcm4908-netgear-raxe500.dts | 0
22 .../arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4908.dtsi | 0
23 9 files changed, 4 insertions(+), 6 deletions(-)
24 delete mode 100644 arch/arm64/boot/dts/broadcom/bcm4908/Makefile
25 rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4906-netgear-r8000p.dts (100%)
26 rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4906-tplink-archer-c2300-v1.dts (100%)
27 rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4906.dtsi (100%)
28 rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4908-asus-gt-ac5300.dts (100%)
29 rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4908-netgear-raxe500.dts (100%)
30 rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4908.dtsi (100%)
32 --- a/arch/arm64/boot/dts/broadcom/Makefile
33 +++ b/arch/arm64/boot/dts/broadcom/Makefile
34 @@ -5,7 +5,6 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rp
35 bcm2837-rpi-3-b-plus.dtb \
36 bcm2837-rpi-cm3-io3.dtb
40 subdir-y += northstar2
42 --- a/arch/arm64/boot/dts/broadcom/bcm4908/Makefile
45 -# SPDX-License-Identifier: GPL-2.0
46 -dtb-$(CONFIG_ARCH_BCM4908) += bcm4906-netgear-r8000p.dtb
47 -dtb-$(CONFIG_ARCH_BCM4908) += bcm4906-tplink-archer-c2300-v1.dtb
48 -dtb-$(CONFIG_ARCH_BCM4908) += bcm4908-asus-gt-ac5300.dtb
49 -dtb-$(CONFIG_ARCH_BCM4908) += bcm4908-netgear-raxe500.dtb
50 --- a/arch/arm64/boot/dts/broadcom/bcmbca/Makefile
51 +++ b/arch/arm64/boot/dts/broadcom/bcmbca/Makefile
53 # SPDX-License-Identifier: GPL-2.0
54 dtb-$(CONFIG_ARCH_BCMBCA) += \
55 + bcm4906-netgear-r8000p.dtb \
56 + bcm4906-tplink-archer-c2300-v1.dtb \
57 + bcm4908-asus-gt-ac5300.dtb \
58 + bcm4908-netgear-raxe500.dtb \
59 bcm4912-asus-gt-ax6000.dtb \
62 diff --git a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-netgear-r8000p.dts b/arch/arm64/boot/dts/broadcom/bcmbca/bcm4906-netgear-r8000p.dts
64 rename from arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-netgear-r8000p.dts
65 rename to arch/arm64/boot/dts/broadcom/bcmbca/bcm4906-netgear-r8000p.dts
66 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
68 rename from arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-tplink-archer-c2300-v1.dts
69 rename to arch/arm64/boot/dts/broadcom/bcmbca/bcm4906-tplink-archer-c2300-v1.dts
70 diff --git a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4906.dtsi b/arch/arm64/boot/dts/broadcom/bcmbca/bcm4906.dtsi
72 rename from arch/arm64/boot/dts/broadcom/bcm4908/bcm4906.dtsi
73 rename to arch/arm64/boot/dts/broadcom/bcmbca/bcm4906.dtsi
74 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
76 rename from arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts
77 rename to arch/arm64/boot/dts/broadcom/bcmbca/bcm4908-asus-gt-ac5300.dts
78 diff --git a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-netgear-raxe500.dts b/arch/arm64/boot/dts/broadcom/bcmbca/bcm4908-netgear-raxe500.dts
80 rename from arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-netgear-raxe500.dts
81 rename to arch/arm64/boot/dts/broadcom/bcmbca/bcm4908-netgear-raxe500.dts
82 diff --git a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi b/arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi
84 rename from arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi
85 rename to arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi