Skip to content

Commit f0379bd

Browse files
committed
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/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents c00304a + 456df41 commit f0379bd

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

arch/arm/include/debug/brcmstb.S

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#define UARTA_72165 UARTA_7278
2828
#define UARTA_7364 REG_PHYS_ADDR(0x40b000)
2929
#define UARTA_7366 UARTA_7364
30+
#define UARTA_74165 UARTA_7278
3031
#define UARTA_74371 REG_PHYS_ADDR(0x406b00)
3132
#define UARTA_7439 REG_PHYS_ADDR(0x40a900)
3233
#define UARTA_7445 REG_PHYS_ADDR(0x40ab00)
@@ -88,9 +89,10 @@ ARM_BE8( rev \rv, \rv )
8889
30: checkuart(\rp, \rv, 0x72780000, 7278)
8990
31: checkuart(\rp, \rv, 0x73640000, 7364)
9091
32: checkuart(\rp, \rv, 0x73660000, 7366)
91-
33: checkuart(\rp, \rv, 0x07437100, 74371)
92-
34: checkuart(\rp, \rv, 0x74390000, 7439)
93-
35: checkuart(\rp, \rv, 0x74450000, 7445)
92+
33: checkuart(\rp, \rv, 0x07416500, 74165)
93+
34: checkuart(\rp, \rv, 0x07437100, 74371)
94+
35: checkuart(\rp, \rv, 0x74390000, 7439)
95+
36: checkuart(\rp, \rv, 0x74450000, 7445)
9496

9597
/* No valid UART found */
9698
90: mov \rp, #0

arch/arm/mach-bcm/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ config ARCH_BCM_MOBILE
9393
select ARM_ERRATA_775420
9494
select ARM_GIC
9595
select GPIO_BCM_KONA
96-
select TICK_ONESHOT
9796
select HAVE_ARM_ARCH_TIMER
9897
select PINCTRL
9998
select ARCH_BCM_MOBILE_SMP if SMP

0 commit comments

Comments
 (0)