Commit f0379bd1 authored by Arnd Bergmann's avatar Arnd Bergmann

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.comSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents c00304ac 456df415
......@@ -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
......
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment