diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2022-05-05 22:06:30 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2022-05-05 22:06:31 +0300 |
| commit | caf10a34aa72b10d93640afc03ba48e17320704e (patch) | |
| tree | 13d9e0cb4af911699479187ea0ec77490e001923 /arch/arm/mm/cache-b15-rac.c | |
| parent | 89c839720c9ba7cb021e704d062480c45913de26 (diff) | |
| parent | b32c613b3fda3e1c26119609f1ad6b19178f82f5 (diff) | |
| download | linux-caf10a34aa72b10d93640afc03ba48e17320704e.tar.xz | |
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>
Diffstat (limited to 'arch/arm/mm/cache-b15-rac.c')
| -rw-r--r-- | arch/arm/mm/cache-b15-rac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/cache-b15-rac.c b/arch/arm/mm/cache-b15-rac.c index bdc07030997b..9c1172f26885 100644 --- a/arch/arm/mm/cache-b15-rac.c +++ b/arch/arm/mm/cache-b15-rac.c @@ -74,7 +74,7 @@ static inline void __b15_rac_flush(void) __raw_writel(FLUSH_RAC, b15_rac_base + rac_flush_offset); do { /* This dmb() is required to force the Bus Interface Unit - * to clean oustanding writes, and forces an idle cycle + * to clean outstanding writes, and forces an idle cycle * to be inserted. */ dmb(); |