Commit f0379bd
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/20240307200441.2151734-3-florian.fainelli@broadcom.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>2 files changed
Lines changed: 5 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
| 30 | + | |
30 | 31 | | |
31 | 32 | | |
32 | 33 | | |
| |||
88 | 89 | | |
89 | 90 | | |
90 | 91 | | |
91 | | - | |
92 | | - | |
93 | | - | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
94 | 96 | | |
95 | 97 | | |
96 | 98 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
93 | 93 | | |
94 | 94 | | |
95 | 95 | | |
96 | | - | |
97 | 96 | | |
98 | 97 | | |
99 | 98 | | |
| |||
0 commit comments