diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2024-03-11 07:45:24 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2024-03-11 07:45:24 +0100 |
| commit | f0379bd1c7da4d2d426e201d2649681801967e3b (patch) | |
| tree | 7a0c74d763c9df66ff0b394c90aa28a279012cd1 /arch/arm | |
| parent | c00304acdc64e042a1aef352afedbea192255f52 (diff) | |
| parent | 456df41549f29546546d63bdf814cf455c01b56c (diff) | |
Merge tag 'arm-soc/for-6.9/soc' of https://github.com/Broadcom/stblinux into soc/late
This pull request contains Broadcom ARM-based SoCs updates for 6.9,
please pull the following:
- Arnd removes a select CONFIG_TICK_ONESHOT done by the ARCH_BCM_MOBILE
architecture which could cause compilation failures
- Florian adds a debug UART entry for BCM74165
* tag 'arm-soc/for-6.9/soc' of https://github.com/Broadcom/stblinux:
ARM: bcm: stop selecing CONFIG_TICK_ONESHOT
ARM: brcmstb: Add debug UART entry for 74165
Link: https://lore.kernel.org/r/20240307200441.2151734-3-florian.fainelli@broadcom.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/include/debug/brcmstb.S | 8 | ||||
| -rw-r--r-- | arch/arm/mach-bcm/Kconfig | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/include/debug/brcmstb.S b/arch/arm/include/debug/brcmstb.S index f6175e6e28cd..3f7d68740ed4 100644 --- a/arch/arm/include/debug/brcmstb.S +++ b/arch/arm/include/debug/brcmstb.S @@ -27,6 +27,7 @@ #define UARTA_72165 UARTA_7278 #define UARTA_7364 REG_PHYS_ADDR(0x40b000) #define UARTA_7366 UARTA_7364 +#define UARTA_74165 UARTA_7278 #define UARTA_74371 REG_PHYS_ADDR(0x406b00) #define UARTA_7439 REG_PHYS_ADDR(0x40a900) #define UARTA_7445 REG_PHYS_ADDR(0x40ab00) @@ -88,9 +89,10 @@ ARM_BE8( rev \rv, \rv ) 30: checkuart(\rp, \rv, 0x72780000, 7278) 31: checkuart(\rp, \rv, 0x73640000, 7364) 32: checkuart(\rp, \rv, 0x73660000, 7366) -33: checkuart(\rp, \rv, 0x07437100, 74371) -34: checkuart(\rp, \rv, 0x74390000, 7439) -35: checkuart(\rp, \rv, 0x74450000, 7445) +33: checkuart(\rp, \rv, 0x07416500, 74165) +34: checkuart(\rp, \rv, 0x07437100, 74371) +35: checkuart(\rp, \rv, 0x74390000, 7439) +36: checkuart(\rp, \rv, 0x74450000, 7445) /* No valid UART found */ 90: mov \rp, #0 diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig index 8789d93a7c04..7318d8789e24 100644 --- a/arch/arm/mach-bcm/Kconfig +++ b/arch/arm/mach-bcm/Kconfig @@ -93,7 +93,6 @@ config ARCH_BCM_MOBILE select ARM_ERRATA_775420 select ARM_GIC select GPIO_BCM_KONA - select TICK_ONESHOT select HAVE_ARM_ARCH_TIMER select PINCTRL select ARCH_BCM_MOBILE_SMP if SMP |