038-v6.1-0005-arm64-dts-Move-BCM4908-dts-to-bcmbca-folder.patch 4.6 KB

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