Skip to contentSkip to conversation

arm: bcmbca: move bcm6858 support under CONFIG_ARCH_BCMBCA BCM6858 is

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

Subsystems (8)
lore
Share & tools
lore

William Zhang

author maintainer
#0 lore raw

cover arm: bcmbca: move bcm6858 support under CONFIG_ARCH_BCMBCA BCM6858 is

part of the Broadcom BCA (Broadband Carrier Access origin) chipset family. BCM6858 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 BCM6858 support under the config of ARCH_BCMBCA and BCM6858.

This patch series need to apply on top of my previous patch series [1].

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

William Zhang (3):
arm: bcmbca: add bcm6858 SoC support under CONFIG_ARCH_BCMBCA
arm: bcmbca: remove bcm6858 support under CONFIG_ARCH_BCM6858
arm: bcmbca: make bcm6858 driver depending on CONFIG_BCM6858

 MAINTAINERS                                  |   1 +
 arch/arm/Kconfig                             |   7 -
 arch/arm/dts/Makefile                        |   6 +-
 arch/arm/dts/bcm6858.dtsi                    | 197 +++++++++++--------
 arch/arm/dts/bcm96858.dts                    |  30 +++
 arch/arm/dts/bcm968580xref.dts               |   4 +-
 arch/arm/mach-bcmbca/Kconfig                 |   8 +
 arch/arm/mach-bcmbca/Makefile                |   1 +
 arch/arm/mach-bcmbca/bcm6858/Kconfig         |  17 ++
 arch/arm/mach-bcmbca/bcm6858/Makefile        |   5 +
 arch/arm/mach-bcmbca/bcm6858/mmu_table.c     |  32 +++
 board/broadcom/bcm968580xref/Kconfig         |  17 --
 board/broadcom/bcm968580xref/MAINTAINERS     |   6 -
 board/broadcom/bcm968580xref/Makefile        |   3 -
 board/broadcom/bcm968580xref/bcm968580xref.c |  62 ------
 board/broadcom/bcmbca/Kconfig                |   7 +
 configs/bcm968580xref_ram_defconfig          |  64 ------
 configs/bcm96858_defconfig                   |  23 +++
 drivers/gpio/Kconfig                         |   3 +-
 drivers/led/Kconfig                          |   2 +-
 drivers/mtd/nand/raw/Kconfig                 |   2 +-
 drivers/spi/Kconfig                          |   3 +-
 drivers/watchdog/Kconfig                     |   3 +-
 include/configs/bcm96858.h                   |  15 ++
 include/configs/broadcom_bcm968580xref.h     |  32 ---
 25 files changed, 267 insertions(+), 283 deletions(-)
 create mode 100644 arch/arm/dts/bcm96858.dts
 create mode 100644 arch/arm/mach-bcmbca/bcm6858/Kconfig
 create mode 100644 arch/arm/mach-bcmbca/bcm6858/Makefile
 create mode 100644 arch/arm/mach-bcmbca/bcm6858/mmu_table.c
 delete mode 100644 board/broadcom/bcm968580xref/Kconfig
 delete mode 100644 board/broadcom/bcm968580xref/MAINTAINERS
 delete mode 100644 board/broadcom/bcm968580xref/Makefile
 delete mode 100644 board/broadcom/bcm968580xref/bcm968580xref.c
 delete mode 100644 configs/bcm968580xref_ram_defconfig
 create mode 100644 configs/bcm96858_defconfig
 create mode 100644 include/configs/bcm96858.h
 delete mode 100644 include/configs/broadcom_bcm968580xref.h
Signature · 1 line
2.37.1
author maintainer
#1 lore raw

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

BCM6858 is a Broadcom B53 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_BCM6858 chip config and CONFIG_ARCH_BCMBCA platform config.

This initial support includes a bare-bone implementation and the original dts is updated with the one from linux next git repository.

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/bcm6858.dtsi                | 197 ++++++++++++++---------
 arch/arm/dts/bcm96858.dts                |  30 ++++
 arch/arm/mach-bcmbca/Kconfig             |   8 +
 arch/arm/mach-bcmbca/Makefile            |   1 +
 arch/arm/mach-bcmbca/bcm6858/Kconfig     |  17 ++
 arch/arm/mach-bcmbca/bcm6858/Makefile    |   5 +
 arch/arm/mach-bcmbca/bcm6858/mmu_table.c |  32 ++++
 board/broadcom/bcmbca/Kconfig            |   7 +
 configs/bcm96858_defconfig               |  23 +++
 include/configs/bcm96858.h               |  11 ++
 12 files changed, 255 insertions(+), 79 deletions(-)
 create mode 100644 arch/arm/dts/bcm96858.dts
 create mode 100644 arch/arm/mach-bcmbca/bcm6858/Kconfig
 create mode 100644 arch/arm/mach-bcmbca/bcm6858/Makefile
 create mode 100644 arch/arm/mach-bcmbca/bcm6858/mmu_table.c
 create mode 100644 configs/bcm96858_defconfig
 create mode 100644 include/configs/bcm96858.h
MAINTAINERS +1 -0
index 1f50dad583ce..819fa5b87824 100644
@@ -231,6 +231,7 @@ N:	bcm[9]?6756
 N:	bcm[9]?6813
 N:	bcm[9]?6846
 N:	bcm[9]?6856
+N:	bcm[9]?6858
 N:	bcm[9]?6878
 
 ARM BROADCOM BCMSTB
arch/arm/dts/Makefile +2 -0
index a0ea9fa6029d..ee3475b97a40 100644
@@ -1182,6 +1182,8 @@ dtb-$(CONFIG_BCM6846) += \
 dtb-$(CONFIG_BCM6856) += \
 	bcm96856.dtb \
 	bcm968360bg.dtb
+dtb-$(CONFIG_BCM6858) += \
+	bcm96858.dtb
 dtb-$(CONFIG_BCM6878) += \
 	bcm96878.dtb
 
arch/arm/dts/bcm6858.dtsi +118 -79

345 lines not on this page · raw message

arch/arm/dts/bcm96858.dts new file +30 -0
new file mode 100644
index 000000000000..0cbf582f5d54
@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright 2022 Broadcom Ltd.
+ */
+
+/dts-v1/;
+
+#include "bcm6858.dtsi"
+
+/ {
+	model = "Broadcom BCM96858 Reference Board";
+	compatible = "brcm,bcm96858", "brcm,bcm6858", "brcm,bcmbca";
+
+	aliases {
+		serial0 = &uart0;
+	};
+
+	chosen {
+		stdout-path = "serial0:115200n8";
+	};
+
+	memory@0 {
+		device_type = "memory";
+		reg = <0x0 0x0 0x0 0x08000000>;
+	};
+};
+
+&uart0 {
+	status = "okay";
+};
arch/arm/mach-bcmbca/Kconfig +8 -0
index 5dd566a98d32..9a144776ad09 100644
@@ -90,6 +90,13 @@ config BCM6856
 	select DM_SERIAL
 	select BCM6345_SERIAL
 
+config BCM6858
+	bool "Support for Broadcom 6858 Family"
+	select ARM64
+	select SYS_ARCH_TIMER
+	select DM_SERIAL
+	select BCM6345_SERIAL
+
 config BCM6878
 	bool "Support for Broadcom 6878 Family"
 	select SYS_ARCH_TIMER
@@ -109,6 +116,7 @@ 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/bcm6856/Kconfig"
+source "arch/arm/mach-bcmbca/bcm6858/Kconfig"
 source "arch/arm/mach-bcmbca/bcm6878/Kconfig"
 
 endif
arch/arm/mach-bcmbca/Makefile +1 -0
index 20f827512005..c06809417499 100644
@@ -15,4 +15,5 @@ obj-$(CONFIG_BCM6756) += bcm6756/
 obj-$(CONFIG_BCM6813) += bcm6813/
 obj-$(CONFIG_BCM6846) += bcm6846/
 obj-$(CONFIG_BCM6856) += bcm6856/
+obj-$(CONFIG_BCM6858) += bcm6858/
 obj-$(CONFIG_BCM6878) += bcm6878/
arch/arm/mach-bcmbca/bcm6858/Kconfig new file +17 -0
new file mode 100644
index 000000000000..a6504bae1f18
@@ -0,0 +1,17 @@
+# SPDX-License-Identifier: GPL-2.0+
+#
+# (C) Copyright 2022 Broadcom Ltd
+#
+
+if BCM6858
+
+config TARGET_BCM96858
+	bool "Broadcom 6858 Reference Board"
+	depends on ARCH_BCMBCA
+
+config SYS_SOC
+	default "bcm6858"
+
+source "board/broadcom/bcmbca/Kconfig"
+
+endif
arch/arm/mach-bcmbca/bcm6858/Makefile new file +5 -0
new file mode 100644
index 000000000000..62624977034b
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0+
+#
+# (C) Copyright 2022 Broadcom Ltd
+#
+obj-y += mmu_table.o
arch/arm/mach-bcmbca/bcm6858/mmu_table.c new file +32 -0
new file mode 100644
index 000000000000..898291075f5e
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ *  Copyright 2022 Broadcom Ltd.
+ */
+#include <common.h>
+#include <asm/armv8/mmu.h>
+#include <linux/sizes.h>
+
+static struct mm_region bcm96858_mem_map[] = {
+		{
+				.virt = 0x00000000UL,
+				.phys = 0x00000000UL,
+				.size = 1UL * SZ_1G,
+				.attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
+						PTE_BLOCK_INNER_SHARE
+		},
+		{
+				/* SoC peripheral */
+				.virt = 0xff800000UL,
+				.phys = 0xff800000UL,
+				.size = 0x100000,
+				.attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
+						PTE_BLOCK_NON_SHARE |
+						PTE_BLOCK_PXN | PTE_BLOCK_UXN
+		},
+		{
+				/* List terminator */
+				0,
+		}
+};
+
+struct mm_region *mem_map = bcm96858_mem_map;
board/broadcom/bcmbca/Kconfig +7 -0
index efe504919a0f..7da9e954d4b2 100644
@@ -93,6 +93,13 @@ config SYS_CONFIG_NAME
 
 endif
 
+if TARGET_BCM96858
+
+config SYS_CONFIG_NAME
+	default "bcm96858"
+
+endif
+
 if TARGET_BCM96878
 
 config SYS_CONFIG_NAME
configs/bcm96858_defconfig new file +23 -0
new file mode 100644
index 000000000000..5f7be1107e8a
@@ -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_BCM6858=y
+CONFIG_TARGET_BCM96858=y
+CONFIG_NR_DRAM_BANKS=2
+CONFIG_DEFAULT_DEVICE_TREE="bcm96858"
+CONFIG_IDENT_STRING=" Broadcom BCM6858"
+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/bcm96858.h new file +11 -0
new file mode 100644
index 000000000000..4e584b41fb37
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * (C) Copyright 2022 Broadcom Ltd.
+ */
+
+#ifndef __BCM96858_H
+#define __BCM96858_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 bcm6858 support under CONFIG_ARCH_BCM6858

In reply to William Zhang

Now that BCM6858 is supported under CONFIG_ARCH_BCMBCA and CONFIG_BCM6858, remove the original ARCH_BCM6858 support and migrate its configuration and dts settings. This includes:
- Remove the bcm968580xref board folder. It is replaced by the generic bcmbca board folder.
- Update bcm968580xref board dts with the new compatible string.
- Delete broadcom_bcm968580xref.h and merge its setting to the new bcm96858.h file.
- Remove bcm968580xref_ram_defconfig as a basic config version of bcm96858_defconfig is now added.

---

 arch/arm/Kconfig                             |  7 ---
 arch/arm/dts/Makefile                        |  6 +-
 arch/arm/dts/bcm968580xref.dts               |  4 +-
 board/broadcom/bcm968580xref/Kconfig         | 17 ------
 board/broadcom/bcm968580xref/MAINTAINERS     |  6 --
 board/broadcom/bcm968580xref/Makefile        |  3 -
 board/broadcom/bcm968580xref/bcm968580xref.c | 62 -------------------
 configs/bcm968580xref_ram_defconfig          | 64 --------------------
 include/configs/bcm96858.h                   |  4 ++
 include/configs/broadcom_bcm968580xref.h     | 32 ----------
 10 files changed, 8 insertions(+), 197 deletions(-)
 delete mode 100644 board/broadcom/bcm968580xref/Kconfig
 delete mode 100644 board/broadcom/bcm968580xref/MAINTAINERS
 delete mode 100644 board/broadcom/bcm968580xref/Makefile
 delete mode 100644 board/broadcom/bcm968580xref/bcm968580xref.c
 delete mode 100644 configs/bcm968580xref_ram_defconfig
 delete mode 100644 include/configs/broadcom_bcm968580xref.h
arch/arm/Kconfig +0 -7
index 3f124ab0ce85..063616ff8d0b 100644
@@ -672,12 +672,6 @@ config ARCH_BCM6753
 	select OF_CONTROL
 	imply CMD_DM
 
-config ARCH_BCM6858
-	bool "Broadcom BCM6858 family"
-	select DM
-	select OF_CONTROL
-	imply CMD_DM
-
 config ARCH_BCMSTB
 	bool "Broadcom BCM7XXX family"
 	select CPU_V7A
@@ -2274,7 +2268,6 @@ source "board/armltd/vexpress/Kconfig"
 source "board/armltd/vexpress64/Kconfig"
 source "board/cortina/presidio-asic/Kconfig"
 source "board/broadcom/bcm96753ref/Kconfig"
-source "board/broadcom/bcm968580xref/Kconfig"
 source "board/broadcom/bcmns3/Kconfig"
 source "board/cavium/thunderx/Kconfig"
 source "board/eets/pdu001/Kconfig"
arch/arm/dts/Makefile +2 -4
index ee3475b97a40..07e6130042f5 100644
@@ -1150,9 +1150,6 @@ dtb-$(CONFIG_ARCH_BCM283X) += \
 dtb-$(CONFIG_ARCH_BCM6753) += \
 	bcm96753ref.dtb
 
-dtb-$(CONFIG_ARCH_BCM6858) += \
-	bcm968580xref.dtb
-
 dtb-$(CONFIG_TARGET_BCMNS3) += ns3-board.dtb
 
 dtb-$(CONFIG_ARCH_BCMSTB) += bcm7xxx.dtb
@@ -1183,7 +1180,8 @@ dtb-$(CONFIG_BCM6856) += \
 	bcm96856.dtb \
 	bcm968360bg.dtb
 dtb-$(CONFIG_BCM6858) += \
-	bcm96858.dtb
+	bcm96858.dtb \
+	bcm968580xref.dtb
 dtb-$(CONFIG_BCM6878) += \
 	bcm96878.dtb
 
arch/arm/dts/bcm968580xref.dts +2 -2
index a034e38318bd..6d787bd011b8 100644
@@ -8,8 +8,8 @@
 #include "bcm6858.dtsi"
 
 / {
-	model = "Broadcom bcm68580xref";
-	compatible = "broadcom,bcm68580xref", "brcm,bcm6858";
+	model = "Broadcom BCM968580xref Reference Board";
+	compatible = "brcm,bcm968580xref", "brcm,bcm6858", "brcm,bcmbca";
 
 	aliases {
 		serial0 = &uart0;
board/broadcom/bcm968580xref/Kconfig deleted +0 -17
deleted file mode 100644
index b5730367a2d2..000000000000
@@ -1,17 +0,0 @@
-if ARCH_BCM6858
-
-config SYS_VENDOR
-	default "broadcom"
-
-config SYS_BOARD
-	default "bcm968580xref"
-
-config SYS_CONFIG_NAME
-	default "broadcom_bcm968580xref"
-
-endif
-
-config TARGET_BCM968580XREF
-	bool "Support Broadcom bcm968580xref"
-	depends on ARCH_BCM6858
-	select ARM64
board/broadcom/bcm968580xref/MAINTAINERS deleted +0 -6
deleted file mode 100644
index 5ee0c4dd4e42..000000000000
@@ -1,6 +0,0 @@
-BCM968580XREF BOARD
-M:	Philippe Reynes <[email protected]>
-S:	Maintained
-F:	board/broadcom/bcm968580xref/
-F:	include/configs/broadcom_bcm968580xref.h
-F:	configs/bcm968580xref_ram_defconfig
board/broadcom/bcm968580xref/Makefile deleted +0 -3
deleted file mode 100644
index 5cd393b19629..000000000000
@@ -1,3 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-
-obj-y	+= bcm968580xref.o
board/broadcom/bcm968580xref/bcm968580xref.c deleted +0 -62

62 lines not on this page · raw message

configs/bcm968580xref_ram_defconfig deleted +0 -64

64 lines not on this page · raw message

include/configs/bcm96858.h +4 -0
index 4e584b41fb37..8bd1169207f0 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_bcm968580xref.h deleted +0 -32
deleted file mode 100644
index abc2da3d1fe3..000000000000
@@ -1,32 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (C) 2018 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 */
-
-/*
- * 6858
- */
-
-/* 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 */
-
-/*
- * 968580xref
- */
Signature · 1 line
2.37.1
author maintainer
#3 lore raw

PATCH 3/3 arm: bcmbca: make bcm6858 driver depending on CONFIG_BCM6858

In reply to William Zhang

As CONFIG_ARCH_BCM6858 is replaced with CONFIG_BCM6858, update the driver Kconfig to use the new config symbol.

---

 drivers/gpio/Kconfig         | 3 +--
 drivers/led/Kconfig          | 2 +-
 drivers/mtd/nand/raw/Kconfig | 2 +-
 drivers/spi/Kconfig          | 3 +--
 drivers/watchdog/Kconfig     | 3 +--
 5 files changed, 5 insertions(+), 8 deletions(-)
drivers/gpio/Kconfig +1 -2
index 9e00b48234ab..929f3fb9eacb 100644
@@ -111,8 +111,7 @@ config BCM2835_GPIO
 config BCM6345_GPIO
 	bool "BCM6345 GPIO driver"
 	depends on DM_GPIO && (ARCH_BMIPS || BCM6856 || \
-			       ARCH_BCM6858 || BCM63158 || \
-			       ARCH_BCM6753)
+			       BCM6858 || BCM63158 || ARCH_BCM6753)
 	help
 	  This driver supports the GPIO banks on BCM6345 SoCs.
 
drivers/led/Kconfig +1 -1
index bd8f23fd9631..98f015a07f97 100644
@@ -37,7 +37,7 @@ config LED_BCM6753
 
 config LED_BCM6858
 	bool "LED Support for BCM6858"
-	depends on LED && (BCM6856 || ARCH_BCM6858 || BCM63158)
+	depends on LED && (BCM6856 || BCM6858 || BCM63158)
 	help
 	  This option enables support for LEDs connected to the BCM6858
 	  HW has blinking capabilities and up to 32 LEDs can be controlled.
drivers/mtd/nand/raw/Kconfig +1 -1
index 5d006ca1ea07..f8445e09633c 100644
@@ -115,7 +115,7 @@ config NAND_BRCMNAND_6838
 
 config NAND_BRCMNAND_6858
        bool "Support Broadcom NAND controller on bcm6858"
-       depends on NAND_BRCMNAND && ARCH_BCM6858
+       depends on NAND_BRCMNAND && BCM6858
        help
          Enable support for broadcom nand driver on bcm6858.
 
drivers/spi/Kconfig +1 -2
index 978e5c86a420..e815a715f9b2 100644
@@ -91,8 +91,7 @@ config ATMEL_SPI
 
 config BCM63XX_HSSPI
 	bool "BCM63XX HSSPI driver"
-	depends on (ARCH_BMIPS || BCM6856 || \
-		    ARCH_BCM6858 || BCM63158)
+	depends on (ARCH_BMIPS || BCM6856 || BCM6858 || BCM63158)
 	help
 	  Enable the BCM6328 HSSPI driver. This driver can be used to
 	  access the SPI NOR flash on platforms embedding this Broadcom
drivers/watchdog/Kconfig +1 -2
index 6d559515b78b..84a4034fe87c 100644
@@ -129,8 +129,7 @@ config WDT_AT91
 config WDT_BCM6345
 	bool "BCM6345 watchdog timer support"
 	depends on WDT && (ARCH_BMIPS || BCM6856 || \
-			   ARCH_BCM6858 || BCM63158 || \
-			   ARCH_BCM6753)
+			   BCM6858 || BCM63158 || ARCH_BCM6753)
 	help
 	  Select this to enable watchdog timer for BCM6345 SoCs.
 	  The watchdog timer is stopped when initialized.
Signature · 1 line
2.37.1