Skip to content

Commit caf10a3

Browse files
committed
Merge tag 'arm-soc/for-5.19/soc' of https://github.com/Broadcom/stblinux into arm/soc
This pull request contains Broadcom ARM-based SoC changes for 5.19, please pull the following: - Julia fixes a couple of typographic errors in the Brahma-B15 read ahead cache driver and in the ARCH_BRCMSTB bare metal SMP bring-up code - William adds a Kconfig entry for ARCH_BCMBCA which will be used to upstream support for Broadcom's broadband SoCs * tag 'arm-soc/for-5.19/soc' of https://github.com/Broadcom/stblinux: arm: bcmbca: add arch bcmbca machine entry ARM: brcmstb: fix typos in comments ARM: mm: fix typos in comments Link: https://lore.kernel.org/r/20220504210942.1838248-6-f.fainelli@gmail.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 89c8397 + b32c613 commit caf10a3

3 files changed

Lines changed: 14 additions & 2 deletions

File tree

arch/arm/mach-bcm/Kconfig

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,4 +218,16 @@ config ARCH_BRCMSTB
218218
This enables support for Broadcom ARM-based set-top box chipsets,
219219
including the 7445 family of chips.
220220

221+
config ARCH_BCMBCA
222+
bool "Broadcom Broadband SoC"
223+
depends on ARCH_MULTI_V7
224+
select ARM_AMBA
225+
select ARM_GIC
226+
select HAVE_ARM_ARCH_TIMER
227+
help
228+
Say Y if you intend to run the kernel on a Broadcom Broadband ARM-based
229+
BCA chipset.
230+
231+
This enables support for Broadcom BCA ARM-based broadband chipsets,
232+
including the DSL, PON and Wireless family of chips.
221233
endif

arch/arm/mach-bcm/platsmp-brcmstb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ static u32 hif_cont_reg;
5959
/*
6060
* We must quiesce a dying CPU before it can be killed by the boot CPU. Because
6161
* one or more cache may be disabled, we must flush to ensure coherency. We
62-
* cannot use traditionl completion structures or spinlocks as they rely on
62+
* cannot use traditional completion structures or spinlocks as they rely on
6363
* coherency.
6464
*/
6565
static DEFINE_PER_CPU_ALIGNED(int, per_cpu_sw_state);

arch/arm/mm/cache-b15-rac.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ static inline void __b15_rac_flush(void)
7474
__raw_writel(FLUSH_RAC, b15_rac_base + rac_flush_offset);
7575
do {
7676
/* This dmb() is required to force the Bus Interface Unit
77-
* to clean oustanding writes, and forces an idle cycle
77+
* to clean outstanding writes, and forces an idle cycle
7878
* to be inserted.
7979
*/
8080
dmb();

0 commit comments

Comments
 (0)