Skip to contentSkip to conversation

arm: bcmbca: move bcm6753 support under CONFIG_ARCH_BCMBCA

PATCH Superseded William Zhang 1 participant 4 messages Aug 18, 2022

Subsystems (7)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

William Zhang

author maintainer
#0 lore raw

cover arm: bcmbca: move bcm6753 support under CONFIG_ARCH_BCMBCA

BCM6753 is essentially same as the main chip BCM6855 with different SKU number. It is part of the Broadcom BCA (Broadband Carrier Access origin) chipset family. BCM6753 was originally added by Philippe before Broadcom started to upstream the support for BCMBCA SoCs. The ARM based broadband SoC family is now supported under the unified ARCH_BCMBCA config. This patch series migrate the BCM6753 support under the config of ARCH_BCMBCA and BCM6855.

This patch series need to apply on top of my previous patch series [1]. This concludes the addition of BCA SoC support to u-boot at least for now.

[1]: https://lists.denx.de/pipermail/u-boot/2022-August/492082.html

William Zhang (3):
arm: bcmbca: add bcm6855 SoC support under CONFIG_ARCH_BCMBCA
arm: bcmbca: remove bcm6753 support under CONFIG_ARCH_BCM6753
arm: bcmbca: make bcm6753 driver depending on CONFIG_BCM6855

 MAINTAINERS                              |   1 +
 arch/arm/Kconfig                         |   8 -
 arch/arm/dts/Makefile                    |   6 +-
 arch/arm/dts/bcm6753.dtsi                | 208 ------------------
 arch/arm/dts/bcm6855.dtsi                | 257 +++++++++++++++++++++++
 arch/arm/dts/bcm96753ref.dts             |   6 +-
 arch/arm/dts/bcm96855.dts                |  30 +++
 arch/arm/mach-bcmbca/Kconfig             |   8 +
 arch/arm/mach-bcmbca/Makefile            |   1 +
 arch/arm/mach-bcmbca/bcm6855/Kconfig     |  17 ++
 arch/arm/mach-bcmbca/bcm6855/Makefile    |   5 +
 board/broadcom/bcm96753ref/Kconfig       |  16 --
 board/broadcom/bcm96753ref/MAINTAINERS   |   6 -
 board/broadcom/bcm96753ref/Makefile      |   3 -
 board/broadcom/bcm96753ref/bcm96753ref.c |  40 ----
 board/broadcom/bcmbca/Kconfig            |   7 +
 configs/bcm96753ref_ram_defconfig        |  87 --------
 configs/bcm96855_defconfig               |  23 ++
 drivers/gpio/Kconfig                     |   2 +-
 drivers/led/Kconfig                      |   2 +-
 drivers/mtd/nand/raw/Kconfig             |   2 +-
 drivers/watchdog/Kconfig                 |   2 +-
 include/configs/bcm96855.h               |  15 ++
 include/configs/broadcom_bcm96753ref.h   |  32 ---
 24 files changed, 374 insertions(+), 410 deletions(-)
 delete mode 100644 arch/arm/dts/bcm6753.dtsi
 create mode 100644 arch/arm/dts/bcm6855.dtsi
 create mode 100644 arch/arm/dts/bcm96855.dts
 create mode 100644 arch/arm/mach-bcmbca/bcm6855/Kconfig
 create mode 100644 arch/arm/mach-bcmbca/bcm6855/Makefile
 delete mode 100644 board/broadcom/bcm96753ref/Kconfig
 delete mode 100644 board/broadcom/bcm96753ref/MAINTAINERS
 delete mode 100644 board/broadcom/bcm96753ref/Makefile
 delete mode 100644 board/broadcom/bcm96753ref/bcm96753ref.c
 delete mode 100644 configs/bcm96753ref_ram_defconfig
 create mode 100644 configs/bcm96855_defconfig
 create mode 100644 include/configs/bcm96855.h
 delete mode 100644 include/configs/broadcom_bcm96753ref.h
Signature · 1 line
2.37.1
author maintainer
#1 lore raw

PATCH 1/3 arm: bcmbca: add bcm6855 SoC support under CONFIG_ARCH_BCMBCA

BCM6855 is a Broadcom ARM A7 based PON Gateway SoC. It is part of the BCA (Broadband Carrier Access origin) chipset family. Like other broadband SoC, this patch adds it under CONFIG_BCM6855 chip config and CONFIG_ARCH_BCMBCA platform config.

This initial support includes a bare-bone implementation and dts with CPU subsystem, memory and ARM PL101 uart. This SoC is supported in the linux-next git repository so the dts and dtsi files are copied from linux.

The u-boot image can be loaded from flash or network to the entry point address in the memory and boot from there to the console.

---

 MAINTAINERS                           |   1 +
 arch/arm/dts/Makefile                 |   2 +
 arch/arm/dts/bcm6855.dtsi             | 120 ++++++++++++++++++++++++++
 arch/arm/dts/bcm96855.dts             |  30 +++++++
 arch/arm/mach-bcmbca/Kconfig          |   8 ++
 arch/arm/mach-bcmbca/Makefile         |   1 +
 arch/arm/mach-bcmbca/bcm6855/Kconfig  |  17 ++++
 arch/arm/mach-bcmbca/bcm6855/Makefile |   5 ++
 board/broadcom/bcmbca/Kconfig         |   7 ++
 configs/bcm96855_defconfig            |  23 +++++
 include/configs/bcm96855.h            |  11 +++
 11 files changed, 225 insertions(+)
 create mode 100644 arch/arm/dts/bcm6855.dtsi
 create mode 100644 arch/arm/dts/bcm96855.dts
 create mode 100644 arch/arm/mach-bcmbca/bcm6855/Kconfig
 create mode 100644 arch/arm/mach-bcmbca/bcm6855/Makefile
 create mode 100644 configs/bcm96855_defconfig
 create mode 100644 include/configs/bcm96855.h
MAINTAINERS +1 -0
index 819fa5b87824..371e84de1bc1 100644
@@ -230,6 +230,7 @@ N:	bcm[9]?63178
 N:	bcm[9]?6756
 N:	bcm[9]?6813
 N:	bcm[9]?6846
+N:	bcm[9]?6855
 N:	bcm[9]?6856
 N:	bcm[9]?6858
 N:	bcm[9]?6878
arch/arm/dts/Makefile +2 -0
index 07e6130042f5..5fd38cc63b63 100644
@@ -1176,6 +1176,8 @@ dtb-$(CONFIG_BCM6813) += \
 	bcm96813.dtb
 dtb-$(CONFIG_BCM6846) += \
 	bcm96846.dtb
+dtb-$(CONFIG_BCM6855) += \
+	bcm96855.dtb
 dtb-$(CONFIG_BCM6856) += \
 	bcm96856.dtb \
 	bcm968360bg.dtb
arch/arm/dts/bcm6855.dtsi new file +120 -0

120 lines not on this page · raw message

arch/arm/dts/bcm96855.dts new file +30 -0
new file mode 100644
index 000000000000..e4e740c73e97
@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright 2022 Broadcom Ltd.
+ */
+
+/dts-v1/;
+
+#include "bcm6855.dtsi"
+
+/ {
+	model = "Broadcom BCM96855 Reference Board";
+	compatible = "brcm,bcm96855", "brcm,bcm6855", "brcm,bcmbca";
+
+	aliases {
+		serial0 = &uart0;
+	};
+
+	chosen {
+		stdout-path = "serial0:115200n8";
+	};
+
+	memory@0 {
+		device_type = "memory";
+		reg = <0x0 0x08000000>;
+	};
+};
+
+&uart0 {
+	status = "okay";
+};
arch/arm/mach-bcmbca/Kconfig +8 -0
index 9a144776ad09..1d9ab952ebc8 100644
@@ -83,6 +83,13 @@ config BCM6846
 	select DM_SERIAL
 	select BCM6345_SERIAL
 
+config BCM6855
+	bool "Support for Broadcom 6855 Family"
+	select SYS_ARCH_TIMER
+	select CPU_V7A
+	select DM_SERIAL
+	select PL01X_SERIAL
+
 config BCM6856
 	bool "Support for Broadcom 6856 Family"
 	select ARM64
@@ -115,6 +122,7 @@ source "arch/arm/mach-bcmbca/bcm63178/Kconfig"
 source "arch/arm/mach-bcmbca/bcm6756/Kconfig"
 source "arch/arm/mach-bcmbca/bcm6813/Kconfig"
 source "arch/arm/mach-bcmbca/bcm6846/Kconfig"
+source "arch/arm/mach-bcmbca/bcm6855/Kconfig"
 source "arch/arm/mach-bcmbca/bcm6856/Kconfig"
 source "arch/arm/mach-bcmbca/bcm6858/Kconfig"
 source "arch/arm/mach-bcmbca/bcm6878/Kconfig"
arch/arm/mach-bcmbca/Makefile +1 -0
index c06809417499..7de9450e1924 100644
@@ -14,6 +14,7 @@ obj-$(CONFIG_BCM63178) += bcm63178/
 obj-$(CONFIG_BCM6756) += bcm6756/
 obj-$(CONFIG_BCM6813) += bcm6813/
 obj-$(CONFIG_BCM6846) += bcm6846/
+obj-$(CONFIG_BCM6855) += bcm6855/
 obj-$(CONFIG_BCM6856) += bcm6856/
 obj-$(CONFIG_BCM6858) += bcm6858/
 obj-$(CONFIG_BCM6878) += bcm6878/
arch/arm/mach-bcmbca/bcm6855/Kconfig new file +17 -0
new file mode 100644
index 000000000000..78087c7dd59d
@@ -0,0 +1,17 @@
+# SPDX-License-Identifier: GPL-2.0+
+#
+# (C) Copyright 2022 Broadcom Ltd
+#
+
+if BCM6855
+
+config TARGET_BCM96855
+	bool "Broadcom 6855 Reference Board"
+	depends on ARCH_BCMBCA
+
+config SYS_SOC
+	default "bcm6855"
+
+source "board/broadcom/bcmbca/Kconfig"
+
+endif
arch/arm/mach-bcmbca/bcm6855/Makefile new file +5 -0
new file mode 100644
index 000000000000..beb979af7520
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0+
+#
+# (C) Copyright 2022 Broadcom Ltd
+#
+obj- += dummy.o
board/broadcom/bcmbca/Kconfig +7 -0
index 7da9e954d4b2..5903a6a786fb 100644
@@ -86,6 +86,13 @@ config SYS_CONFIG_NAME
 
 endif
 
+if TARGET_BCM96855
+
+config SYS_CONFIG_NAME
+	default "bcm96855"
+
+endif
+
 if TARGET_BCM96856
 
 config SYS_CONFIG_NAME
configs/bcm96855_defconfig new file +23 -0
new file mode 100644
index 000000000000..223c0a139b70
@@ -0,0 +1,23 @@
+CONFIG_ARM=y
+CONFIG_COUNTER_FREQUENCY=50000000
+CONFIG_ARCH_BCMBCA=y
+CONFIG_SYS_TEXT_BASE=0x01000000
+CONFIG_SYS_MALLOC_LEN=0x2000000
+CONFIG_SYS_MALLOC_F_LEN=0x8000
+CONFIG_BCM6855=y
+CONFIG_TARGET_BCM96855=y
+CONFIG_NR_DRAM_BANKS=1
+CONFIG_DEFAULT_DEVICE_TREE="bcm96855"
+CONFIG_IDENT_STRING=" Broadcom BCM6855"
+CONFIG_SYS_LOAD_ADDR=0x01000000
+CONFIG_ENV_VARS_UBOOT_CONFIG=y
+CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
+CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x2000000
+CONFIG_OF_STDOUT_VIA_ALIAS=y
+CONFIG_DISPLAY_BOARDINFO_LATE=y
+CONFIG_HUSH_PARSER=y
+CONFIG_SYS_MAXARGS=64
+CONFIG_SYS_BOOTM_LEN=0x4000000
+CONFIG_CMD_CACHE=y
+CONFIG_OF_EMBED=y
+CONFIG_CLK=y
include/configs/bcm96855.h new file +11 -0
new file mode 100644
index 000000000000..6e420f2c66fb
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * (C) Copyright 2022 Broadcom Ltd.
+ */
+
+#ifndef __BCM96855_H
+#define __BCM96855_H
+
+#define CONFIG_SYS_SDRAM_BASE		0x00000000
+
+#endif
Signature · 1 line
2.37.1
author maintainer
#2 lore raw

PATCH 2/3 arm: bcmbca: remove bcm6753 support under CONFIG_ARCH_BCM6753

In reply to William Zhang

BCM6753 is essentially same as the main chip BCM6855 but with different SKU number. Now that BCM6855 is supported under CONFIG_ARCH_BCMBCA and CONFIG_BCM6855, remove the original ARCH_BCM6753 support and migrate its configuration and dts settings. This includes:
- Remove the bcm96753ref board folder. It is replaced by the generic bcmbca board folder.
- Merge the 6753.dtsi setting to the new 6855.dtsi file. Update 96753ref board dts with the new compatible string.
- Delete broadcom_bcm96763ref.h and merge its setting to the new bcm96855.h file.
- Delete bcm96753ref_ram_defconfig and use a basic config version of bcm96855_defconfig

---

 arch/arm/Kconfig                         |   8 -
 arch/arm/dts/Makefile                    |   6 +-
 arch/arm/dts/bcm6753.dtsi                | 208 -----------------------
 arch/arm/dts/bcm6855.dtsi                | 137 +++++++++++++++
 arch/arm/dts/bcm96753ref.dts             |   6 +-
 board/broadcom/bcm96753ref/Kconfig       |  16 --
 board/broadcom/bcm96753ref/MAINTAINERS   |   6 -
 board/broadcom/bcm96753ref/Makefile      |   3 -
 board/broadcom/bcm96753ref/bcm96753ref.c |  40 -----
 configs/bcm96753ref_ram_defconfig        |  87 ----------
 include/configs/bcm96855.h               |   4 +
 include/configs/broadcom_bcm96753ref.h   |  32 ----
 12 files changed, 146 insertions(+), 407 deletions(-)
 delete mode 100644 arch/arm/dts/bcm6753.dtsi
 delete mode 100644 board/broadcom/bcm96753ref/Kconfig
 delete mode 100644 board/broadcom/bcm96753ref/MAINTAINERS
 delete mode 100644 board/broadcom/bcm96753ref/Makefile
 delete mode 100644 board/broadcom/bcm96753ref/bcm96753ref.c
 delete mode 100644 configs/bcm96753ref_ram_defconfig
 delete mode 100644 include/configs/broadcom_bcm96753ref.h
arch/arm/Kconfig +0 -8
index 063616ff8d0b..c1f195e9d106 100644
@@ -665,13 +665,6 @@ config ARCH_BCM283X
 	imply CMD_DM
 	imply FAT_WRITE
 
-config ARCH_BCM6753
-	bool "Broadcom BCM6753 family"
-	select CPU_V7A
-	select DM
-	select OF_CONTROL
-	imply CMD_DM
-
 config ARCH_BCMSTB
 	bool "Broadcom BCM7XXX family"
 	select CPU_V7A
@@ -2267,7 +2260,6 @@ source "board/Marvell/octeontx2/Kconfig"
 source "board/armltd/vexpress/Kconfig"
 source "board/armltd/vexpress64/Kconfig"
 source "board/cortina/presidio-asic/Kconfig"
-source "board/broadcom/bcm96753ref/Kconfig"
 source "board/broadcom/bcmns3/Kconfig"
 source "board/cavium/thunderx/Kconfig"
 source "board/eets/pdu001/Kconfig"
arch/arm/dts/Makefile +2 -4
index 5fd38cc63b63..8fba735cc8ab 100644
@@ -1147,9 +1147,6 @@ dtb-$(CONFIG_ARCH_BCM283X) += \
 	bcm2837-rpi-cm3-io3.dtb \
 	bcm2711-rpi-4-b.dtb
 
-dtb-$(CONFIG_ARCH_BCM6753) += \
-	bcm96753ref.dtb
-
 dtb-$(CONFIG_TARGET_BCMNS3) += ns3-board.dtb
 
 dtb-$(CONFIG_ARCH_BCMSTB) += bcm7xxx.dtb
@@ -1177,7 +1174,8 @@ dtb-$(CONFIG_BCM6813) += \
 dtb-$(CONFIG_BCM6846) += \
 	bcm96846.dtb
 dtb-$(CONFIG_BCM6855) += \
-	bcm96855.dtb
+	bcm96855.dtb \
+	bcm96753ref.dtb
 dtb-$(CONFIG_BCM6856) += \
 	bcm96856.dtb \
 	bcm968360bg.dtb
arch/arm/dts/bcm6753.dtsi deleted +0 -208

208 lines not on this page · raw message

arch/arm/dts/bcm6855.dtsi +137 -0

165 lines not on this page · raw message

arch/arm/dts/bcm96753ref.dts +3 -3
index ca15ca5f108d..f74137f18f46 100644
@@ -5,13 +5,13 @@
 
 /dts-v1/;
 
-#include "bcm6753.dtsi"
+#include "bcm6855.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 
 / {
-	model = "Broadcom bcm6753ref";
-	compatible = "broadcom,bcm6753ref", "brcm,bcm6753";
+	model = "Broadcom BCM96753REF Reference Board";
+	compatible = "brcm,bcm96753ref", "brcm,bcm6855", "brcm,bcmbca";
 
 	aliases {
 		serial0 = &uart0;
board/broadcom/bcm96753ref/Kconfig deleted +0 -16
deleted file mode 100644
index 479e7905787b..000000000000
@@ -1,16 +0,0 @@
-if TARGET_BCM96753REF
-
-config SYS_VENDOR
-	default "broadcom"
-
-config SYS_BOARD
-	default "bcm96753ref"
-
-config SYS_CONFIG_NAME
-	default "broadcom_bcm96753ref"
-
-endif
-
-config TARGET_BCM96753REF
-	bool "Support Broadcom bcm96753ref"
-	depends on ARCH_BCM6753
board/broadcom/bcm96753ref/MAINTAINERS deleted +0 -6
deleted file mode 100644
index be060f5a709c..000000000000
@@ -1,6 +0,0 @@
-BROADCOM BCM96753REF
-M:	Philippe Reynes <[email protected]>
-S:	Maintained
-F:	board/broadcom/bcm96753ref
-F:	include/configs/broadcom_bcm96753ref.h
-F:	configs/bcm96753ref_ram_defconfig
board/broadcom/bcm96753ref/Makefile deleted +0 -3
deleted file mode 100644
index a1fa2bff8670..000000000000
@@ -1,3 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-
-obj-y	+= bcm96753ref.o
board/broadcom/bcm96753ref/bcm96753ref.c deleted +0 -40
deleted file mode 100644
index bf78d843aa57..000000000000
@@ -1,40 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2022 Philippe Reynes <[email protected]>
- */
-
-#include <common.h>
-#include <fdtdec.h>
-#include <linux/io.h>
-#include <cpu_func.h>
-
-int board_init(void)
-{
-	return 0;
-}
-
-int dram_init(void)
-{
-	if (fdtdec_setup_mem_size_base() != 0)
-		printf("fdtdec_setup_mem_size_base() has failed\n");
-
-	return 0;
-}
-
-int dram_init_banksize(void)
-{
-	fdtdec_setup_memory_banksize();
-
-	return 0;
-}
-
-int print_cpuinfo(void)
-{
-	return 0;
-}
-
-void enable_caches(void)
-{
-	icache_enable();
-	dcache_enable();
-}
configs/bcm96753ref_ram_defconfig deleted +0 -87

87 lines not on this page · raw message

include/configs/bcm96855.h +4 -0
index 6e420f2c66fb..ba2d8a317d25 100644
@@ -8,4 +8,8 @@
 
 #define CONFIG_SYS_SDRAM_BASE		0x00000000
 
+#ifdef CONFIG_MTD_RAW_NAND
+#define CONFIG_SYS_MAX_NAND_DEVICE	1
+#endif /* CONFIG_MTD_RAW_NAND */
+
 #endif
include/configs/broadcom_bcm96753ref.h deleted +0 -32
deleted file mode 100644
index 33c70c73c1fc..000000000000
@@ -1,32 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (C) 2022 Philippe Reynes <[email protected]>
- */
-
-#include <linux/sizes.h>
-
-/*
- * common
- */
-
-/* UART */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, \
-					  230400, 500000, 1500000 }
-/* Memory usage */
-
-/*
- * 6853
- */
-
-/* RAM */
-#define CONFIG_SYS_SDRAM_BASE		0x00000000
-
-/* U-Boot */
-
-#ifdef CONFIG_MTD_RAW_NAND
-#define CONFIG_SYS_MAX_NAND_DEVICE	1
-#endif /* CONFIG_MTD_RAW_NAND */
-
-/*
- * 96753ref
- */
Signature · 1 line
2.37.1
author maintainer
#3 lore raw

PATCH 3/3 arm: bcmbca: make bcm6753 driver depending on CONFIG_BCM6855

In reply to William Zhang

As CONFIG_ARCH_BCM6753 is replaced with CONFIG_BCM6855, update the driver Kconfig to use the new config symbol.

---

 drivers/gpio/Kconfig         | 2 +-
 drivers/led/Kconfig          | 2 +-
 drivers/mtd/nand/raw/Kconfig | 2 +-
 drivers/watchdog/Kconfig     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
drivers/gpio/Kconfig +1 -1
index 929f3fb9eacb..d8020de969ef 100644
@@ -111,7 +111,7 @@ config BCM2835_GPIO
 config BCM6345_GPIO
 	bool "BCM6345 GPIO driver"
 	depends on DM_GPIO && (ARCH_BMIPS || BCM6856 || \
-			       BCM6858 || BCM63158 || ARCH_BCM6753)
+			       BCM6858 || BCM63158 || BCM6855)
 	help
 	  This driver supports the GPIO banks on BCM6345 SoCs.
 
drivers/led/Kconfig +1 -1
index 98f015a07f97..996b757e6d00 100644
@@ -30,7 +30,7 @@ config LED_BCM6358
 
 config LED_BCM6753
 	bool "LED Support for BCM6753"
-	depends on LED && ARCH_BCM6753
+	depends on LED && BCM6855
 	help
 	  This option enables support for LEDs connected to the BCM6753
 	  HW has blinking and fading capabilities and up to 32 LEDs can be controlled.
drivers/mtd/nand/raw/Kconfig +1 -1
index f8445e09633c..d6e3eeb3c093 100644
@@ -97,7 +97,7 @@ config NAND_BRCMNAND_6368
 
 config NAND_BRCMNAND_6753
 	bool "Support Broadcom NAND controller on bcm6753"
-	depends on NAND_BRCMNAND && ARCH_BCM6753
+	depends on NAND_BRCMNAND && BCM6855
 	help
 	  Enable support for broadcom nand driver on bcm6753.
 
drivers/watchdog/Kconfig +1 -1
index 84a4034fe87c..65f2d0821c60 100644
@@ -129,7 +129,7 @@ config WDT_AT91
 config WDT_BCM6345
 	bool "BCM6345 watchdog timer support"
 	depends on WDT && (ARCH_BMIPS || BCM6856 || \
-			   BCM6858 || BCM63158 || ARCH_BCM6753)
+			   BCM6858 || BCM63158 || BCM6855)
 	help
 	  Select this to enable watchdog timer for BCM6345 SoCs.
 	  The watchdog timer is stopped when initialized.
Signature · 1 line
2.37.1