Skip to contentSkip to conversation

arm: bcmbca: move bcm68360 support under CONFIG_ARCH_BCMBCA

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

Subsystems (8)

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

William Zhang

author maintainer
#0 lore raw

v3 cover arm: bcmbca: move bcm68360 support under CONFIG_ARCH_BCMBCA

BCM68360 is a variant for the main PON chip BCM6856 which is part of the Broadcom BCA (Broadband Carrier Access origin) chipset family. BCM68360 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 BCM68360 support under the config of ARCH_BCMBCA and BCM6856.

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

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

Changes in v3:
- Remove bcm968360bg_ram_defconfig per discussion with Philippe as a basic config version of bcm96856_defconfig is now added.
- Update commit message

Changes in v2:
- Bring Philippe Reynes copyright tag from 68360 dts to 6856 dts

William Zhang (3):
arm: bcmbca: add bcm6856 SoC support under CONFIG_ARCH_BCMBCA
arm: bcmbca: remove bcm68360 support under CONFIG_ARCH_BCM68360
arm: bcmbca: make bcm68360 driver depending on CONFIG_BCM6856

 MAINTAINERS                              |   1 +
 arch/arm/Kconfig                         |   7 -
 arch/arm/dts/Makefile                    |   6 +-
 arch/arm/dts/bcm68360.dtsi               | 217 -------------------
 arch/arm/dts/bcm6856.dtsi                | 253 +++++++++++++++++++++++
 arch/arm/dts/bcm968360bg.dts             |   6 +-
 arch/arm/dts/bcm96856.dts                |  30 +++
 arch/arm/mach-bcmbca/Kconfig             |   8 +
 arch/arm/mach-bcmbca/Makefile            |   1 +
 arch/arm/mach-bcmbca/bcm6856/Kconfig     |  17 ++
 arch/arm/mach-bcmbca/bcm6856/Makefile    |   5 +
 arch/arm/mach-bcmbca/bcm6856/mmu_table.c |  32 +++
 board/broadcom/bcm968360bg/Kconfig       |  17 --
 board/broadcom/bcm968360bg/MAINTAINERS   |   6 -
 board/broadcom/bcm968360bg/Makefile      |   3 -
 board/broadcom/bcm968360bg/bcm968360bg.c |  62 ------
 board/broadcom/bcmbca/Kconfig            |   7 +
 configs/bcm968360bg_ram_defconfig        |  63 ------
 configs/bcm96856_defconfig               |  23 +++
 drivers/gpio/Kconfig                     |   2 +-
 drivers/led/Kconfig                      |   2 +-
 drivers/mtd/nand/raw/Kconfig             |   2 +-
 drivers/spi/Kconfig                      |   2 +-
 drivers/watchdog/Kconfig                 |   2 +-
 include/configs/bcm96856.h               |  15 ++
 include/configs/broadcom_bcm968360bg.h   |  32 ---
 26 files changed, 403 insertions(+), 418 deletions(-)
 delete mode 100644 arch/arm/dts/bcm68360.dtsi
 create mode 100644 arch/arm/dts/bcm6856.dtsi
 create mode 100644 arch/arm/dts/bcm96856.dts
 create mode 100644 arch/arm/mach-bcmbca/bcm6856/Kconfig
 create mode 100644 arch/arm/mach-bcmbca/bcm6856/Makefile
 create mode 100644 arch/arm/mach-bcmbca/bcm6856/mmu_table.c
 delete mode 100644 board/broadcom/bcm968360bg/Kconfig
 delete mode 100644 board/broadcom/bcm968360bg/MAINTAINERS
 delete mode 100644 board/broadcom/bcm968360bg/Makefile
 delete mode 100644 board/broadcom/bcm968360bg/bcm968360bg.c
 delete mode 100644 configs/bcm968360bg_ram_defconfig
 create mode 100644 configs/bcm96856_defconfig
 create mode 100644 include/configs/bcm96856.h
 delete mode 100644 include/configs/broadcom_bcm968360bg.h
Signature · 1 line
2.37.1
author maintainer
#1 lore raw

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

BCM6856 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_BCM6856 chip config and CONFIG_ARCH_BCMBCA platform config.

This initial support includes a bare-bone implementation and dts with CPU subsystem, memory and Broadcom 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.

---

(no changes since v1)

 MAINTAINERS                              |   1 +
 arch/arm/dts/Makefile                    |   2 +
 arch/arm/dts/bcm6856.dtsi                | 103 +++++++++++++++++++++++
 arch/arm/dts/bcm96856.dts                |  30 +++++++
 arch/arm/mach-bcmbca/Kconfig             |   8 ++
 arch/arm/mach-bcmbca/Makefile            |   1 +
 arch/arm/mach-bcmbca/bcm6856/Kconfig     |  17 ++++
 arch/arm/mach-bcmbca/bcm6856/Makefile    |   5 ++
 arch/arm/mach-bcmbca/bcm6856/mmu_table.c |  32 +++++++
 board/broadcom/bcmbca/Kconfig            |   7 ++
 configs/bcm96856_defconfig               |  23 +++++
 include/configs/bcm96856.h               |  11 +++
 12 files changed, 240 insertions(+)
 create mode 100644 arch/arm/dts/bcm6856.dtsi
 create mode 100644 arch/arm/dts/bcm96856.dts
 create mode 100644 arch/arm/mach-bcmbca/bcm6856/Kconfig
 create mode 100644 arch/arm/mach-bcmbca/bcm6856/Makefile
 create mode 100644 arch/arm/mach-bcmbca/bcm6856/mmu_table.c
 create mode 100644 configs/bcm96856_defconfig
 create mode 100644 include/configs/bcm96856.h
MAINTAINERS +1 -0
index d0a5b2352cc8..1f50dad583ce 100644
@@ -230,6 +230,7 @@ N:	bcm[9]?63178
 N:	bcm[9]?6756
 N:	bcm[9]?6813
 N:	bcm[9]?6846
+N:	bcm[9]?6856
 N:	bcm[9]?6878
 
 ARM BROADCOM BCMSTB
arch/arm/dts/Makefile +2 -0
index c55bc3569662..a32bdf8c9f17 100644
@@ -1182,6 +1182,8 @@ dtb-$(CONFIG_BCM6813) += \
 	bcm96813.dtb
 dtb-$(CONFIG_BCM6846) += \
 	bcm96846.dtb
+dtb-$(CONFIG_BCM6856) += \
+	bcm96856.dtb
 dtb-$(CONFIG_BCM6878) += \
 	bcm96878.dtb
 
arch/arm/dts/bcm6856.dtsi new file +103 -0

103 lines not on this page · raw message

arch/arm/dts/bcm96856.dts new file +30 -0
new file mode 100644
index 000000000000..032aeb75c983
@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright 2022 Broadcom Ltd.
+ */
+
+/dts-v1/;
+
+#include "bcm6856.dtsi"
+
+/ {
+	model = "Broadcom BCM96856 Reference Board";
+	compatible = "brcm,bcm96856", "brcm,bcm6856", "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 d78618820b58..5dd566a98d32 100644
@@ -83,6 +83,13 @@ config BCM6846
 	select DM_SERIAL
 	select BCM6345_SERIAL
 
+config BCM6856
+	bool "Support for Broadcom 6856 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
@@ -101,6 +108,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/bcm6856/Kconfig"
 source "arch/arm/mach-bcmbca/bcm6878/Kconfig"
 
 endif
arch/arm/mach-bcmbca/Makefile +1 -0
index e5df60e7648b..20f827512005 100644
@@ -14,4 +14,5 @@ obj-$(CONFIG_BCM63178) += bcm63178/
 obj-$(CONFIG_BCM6756) += bcm6756/
 obj-$(CONFIG_BCM6813) += bcm6813/
 obj-$(CONFIG_BCM6846) += bcm6846/
+obj-$(CONFIG_BCM6856) += bcm6856/
 obj-$(CONFIG_BCM6878) += bcm6878/
arch/arm/mach-bcmbca/bcm6856/Kconfig new file +17 -0
new file mode 100644
index 000000000000..6ac75cb84095
@@ -0,0 +1,17 @@
+# SPDX-License-Identifier: GPL-2.0+
+#
+# (C) Copyright 2022 Broadcom Ltd
+#
+
+if BCM6856
+
+config TARGET_BCM96856
+	bool "Broadcom 6856 Reference Board"
+	depends on ARCH_BCMBCA
+
+config SYS_SOC
+	default "bcm6856"
+
+source "board/broadcom/bcmbca/Kconfig"
+
+endif
arch/arm/mach-bcmbca/bcm6856/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/bcm6856/mmu_table.c new file +32 -0
new file mode 100644
index 000000000000..8e53b4929eb8
@@ -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 bcm96856_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 = bcm96856_mem_map;
board/broadcom/bcmbca/Kconfig +7 -0
index 13815fd7975f..efe504919a0f 100644
@@ -86,6 +86,13 @@ config SYS_CONFIG_NAME
 
 endif
 
+if TARGET_BCM96856
+
+config SYS_CONFIG_NAME
+	default "bcm96856"
+
+endif
+
 if TARGET_BCM96878
 
 config SYS_CONFIG_NAME
configs/bcm96856_defconfig new file +23 -0
new file mode 100644
index 000000000000..7e1c09769f70
@@ -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_BCM6856=y
+CONFIG_TARGET_BCM96856=y
+CONFIG_NR_DRAM_BANKS=2
+CONFIG_DEFAULT_DEVICE_TREE="bcm96856"
+CONFIG_IDENT_STRING=" Broadcom BCM6856"
+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/bcm96856.h new file +11 -0
new file mode 100644
index 000000000000..a7ae71eeaafe
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * (C) Copyright 2022 Broadcom Ltd.
+ */
+
+#ifndef __BCM96856_H
+#define __BCM96856_H
+
+#define CONFIG_SYS_SDRAM_BASE		0x00000000
+
+#endif
Signature · 1 line
2.37.1
author maintainer
#2 lore raw

PATCH v3 2/3 arm: bcmbca: remove bcm68360 support under CONFIG_ARCH_BCM68360

In reply to William Zhang

BCM68360 is a variant within the BCM6856 chip family. Now that BCM6856 is supported under CONFIG_ARCH_BCMBCA and CONFIG_BCM6856, remove the original ARCH_BCM68360 support and migrate its configuration and dts settings. This includes:
- Remove the bcm968360bg board folder. It is replaced by the generic bcmbca board folder.
- Merge the 68360.dtsi setting to the new 6856.dtsi file. Update board dts with the new compatible string.
- Merge broadcom_bcm968360bg.h setting to the new bcm96856.h file.
- Remove bcm968360bg_ram_defconfig as a basic config version of bcm96856_defconfig is now added.

---

Changes in v3:
- Remove bcm968360bg_ram_defconfig per discussion with Philippe as a basic config version of bcm96856_defconfig is now added.
- Update commit message

Changes in v2:
- Bring Philippe Reynes copyright tag from 68360 dts to 6856 dts

 arch/arm/Kconfig                         |   7 -
 arch/arm/dts/Makefile                    |   6 +-
 arch/arm/dts/bcm68360.dtsi               | 217 -----------------------
 arch/arm/dts/bcm6856.dtsi                | 150 ++++++++++++++++
 arch/arm/dts/bcm968360bg.dts             |   6 +-
 board/broadcom/bcm968360bg/Kconfig       |  17 --
 board/broadcom/bcm968360bg/MAINTAINERS   |   6 -
 board/broadcom/bcm968360bg/Makefile      |   3 -
 board/broadcom/bcm968360bg/bcm968360bg.c |  62 -------
 configs/bcm968360bg_ram_defconfig        |  63 -------
 include/configs/bcm96856.h               |   4 +
 include/configs/broadcom_bcm968360bg.h   |  32 ----
 12 files changed, 159 insertions(+), 414 deletions(-)
 delete mode 100644 arch/arm/dts/bcm68360.dtsi
 delete mode 100644 board/broadcom/bcm968360bg/Kconfig
 delete mode 100644 board/broadcom/bcm968360bg/MAINTAINERS
 delete mode 100644 board/broadcom/bcm968360bg/Makefile
 delete mode 100644 board/broadcom/bcm968360bg/bcm968360bg.c
 delete mode 100644 configs/bcm968360bg_ram_defconfig
 delete mode 100644 include/configs/broadcom_bcm968360bg.h
arch/arm/Kconfig +0 -7
index da4defa08466..3f124ab0ce85 100644
@@ -672,12 +672,6 @@ config ARCH_BCM6753
 	select OF_CONTROL
 	imply CMD_DM
 
-config ARCH_BCM68360
-	bool "Broadcom BCM68360 family"
-	select DM
-	select OF_CONTROL
-	imply CMD_DM
-
 config ARCH_BCM6858
 	bool "Broadcom BCM6858 family"
 	select DM
@@ -2280,7 +2274,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/bcm968360bg/Kconfig"
 source "board/broadcom/bcm968580xref/Kconfig"
 source "board/broadcom/bcmns3/Kconfig"
 source "board/cavium/thunderx/Kconfig"
arch/arm/dts/Makefile +2 -4
index a32bdf8c9f17..a0ea9fa6029d 100644
@@ -1147,9 +1147,6 @@ dtb-$(CONFIG_ARCH_BCM283X) += \
 	bcm2837-rpi-cm3-io3.dtb \
 	bcm2711-rpi-4-b.dtb
 
-dtb-$(CONFIG_ARCH_BCM68360) += \
-	bcm968360bg.dtb
-
 dtb-$(CONFIG_ARCH_BCM6753) += \
 	bcm96753ref.dtb
 
@@ -1183,7 +1180,8 @@ dtb-$(CONFIG_BCM6813) += \
 dtb-$(CONFIG_BCM6846) += \
 	bcm96846.dtb
 dtb-$(CONFIG_BCM6856) += \
-	bcm96856.dtb
+	bcm96856.dtb \
+	bcm968360bg.dtb
 dtb-$(CONFIG_BCM6878) += \
 	bcm96878.dtb
 
arch/arm/dts/bcm68360.dtsi deleted +0 -217

217 lines not on this page · raw message

arch/arm/dts/bcm6856.dtsi +150 -0

177 lines not on this page · raw message

arch/arm/dts/bcm968360bg.dts +3 -3
index c060294cc925..6f1090aa8eee 100644
@@ -5,11 +5,11 @@
 
 /dts-v1/;
 
-#include "bcm68360.dtsi"
+#include "bcm6856.dtsi"
 
 / {
-	model = "Broadcom bcm68360bg";
-	compatible = "broadcom,bcm68360bg", "brcm,bcm68360";
+	model = "Broadcom BCM968360BG Reference Board";
+	compatible = "brcm,bcm968360bg", "brcm,bcm6856", "brcm,bcmbca";
 
 	aliases {
 		serial0 = &uart0;
board/broadcom/bcm968360bg/Kconfig deleted +0 -17
deleted file mode 100644
index dd372f126aef..000000000000
@@ -1,17 +0,0 @@
-if ARCH_BCM68360
-
-config SYS_VENDOR
-	default "broadcom"
-
-config SYS_BOARD
-	default "bcm968360bg"
-
-config SYS_CONFIG_NAME
-	default "broadcom_bcm968360bg"
-
-endif
-
-config TARGET_BCM968360BG
-	bool "Support Broadcom bcm968360bg"
-	depends on ARCH_BCM68360
-	select ARM64
board/broadcom/bcm968360bg/MAINTAINERS deleted +0 -6
deleted file mode 100644
index cfcbbc51f8e6..000000000000
@@ -1,6 +0,0 @@
-BCM968360BG BOARD
-M:	Philippe Reynes <[email protected]>
-S:	Maintained
-F:	board/broadcom/bcm968360bg
-F:	include/configs/broadcom_bcm968360bg.h
-F:	configs/bcm968360bg_ram_defconfig
board/broadcom/bcm968360bg/Makefile deleted +0 -3
deleted file mode 100644
index d099c1cf3569..000000000000
@@ -1,3 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-
-obj-y	+= bcm968360bg.o
board/broadcom/bcm968360bg/bcm968360bg.c deleted +0 -62

62 lines not on this page · raw message

configs/bcm968360bg_ram_defconfig deleted +0 -63

63 lines not on this page · raw message

include/configs/bcm96856.h +4 -0
index a7ae71eeaafe..3050cf337229 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_bcm968360bg.h deleted +0 -32
deleted file mode 100644
index 8a8023571236..000000000000
@@ -1,32 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (C) 2020 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 */
-
-/*
- * 968360bg
- */
Signature · 1 line
2.37.1
author maintainer
#3 lore raw

PATCH v3 3/3 arm: bcmbca: make bcm68360 driver depending on CONFIG_BCM6856

In reply to William Zhang

As CONFIG_ARCH_BCM68360 is replaced with CONFIG_BCM6856, update the driver Kconfig to use the new config symbol

---

(no changes since v1)

 drivers/gpio/Kconfig         | 2 +-
 drivers/led/Kconfig          | 2 +-
 drivers/mtd/nand/raw/Kconfig | 2 +-
 drivers/spi/Kconfig          | 2 +-
 drivers/watchdog/Kconfig     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
drivers/gpio/Kconfig +1 -1
index 83f4f5089992..9e00b48234ab 100644
@@ -110,7 +110,7 @@ config BCM2835_GPIO
 
 config BCM6345_GPIO
 	bool "BCM6345 GPIO driver"
-	depends on DM_GPIO && (ARCH_BMIPS || ARCH_BCM68360 || \
+	depends on DM_GPIO && (ARCH_BMIPS || BCM6856 || \
 			       ARCH_BCM6858 || BCM63158 || \
 			       ARCH_BCM6753)
 	help
drivers/led/Kconfig +1 -1
index d777414dda8d..bd8f23fd9631 100644
@@ -37,7 +37,7 @@ config LED_BCM6753
 
 config LED_BCM6858
 	bool "LED Support for BCM6858"
-	depends on LED && (ARCH_BCM68360 || ARCH_BCM6858 || BCM63158)
+	depends on LED && (BCM6856 || ARCH_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 24c27b6ecf7f..5d006ca1ea07 100644
@@ -103,7 +103,7 @@ config NAND_BRCMNAND_6753
 
 config NAND_BRCMNAND_68360
        bool "Support Broadcom NAND controller on bcm68360"
-       depends on NAND_BRCMNAND && ARCH_BCM68360
+       depends on NAND_BRCMNAND && BCM6856
        help
          Enable support for broadcom nand driver on bcm68360.
 
drivers/spi/Kconfig +1 -1
index 0a666eee80e7..978e5c86a420 100644
@@ -91,7 +91,7 @@ config ATMEL_SPI
 
 config BCM63XX_HSSPI
 	bool "BCM63XX HSSPI driver"
-	depends on (ARCH_BMIPS || ARCH_BCM68360 || \
+	depends on (ARCH_BMIPS || BCM6856 || \
 		    ARCH_BCM6858 || BCM63158)
 	help
 	  Enable the BCM6328 HSSPI driver. This driver can be used to
drivers/watchdog/Kconfig +1 -1
index ff4d1ee530d2..6d559515b78b 100644
@@ -128,7 +128,7 @@ config WDT_AT91
 
 config WDT_BCM6345
 	bool "BCM6345 watchdog timer support"
-	depends on WDT && (ARCH_BMIPS || ARCH_BCM68360 || \
+	depends on WDT && (ARCH_BMIPS || BCM6856 || \
 			   ARCH_BCM6858 || BCM63158 || \
 			   ARCH_BCM6753)
 	help
Signature · 1 line
2.37.1