github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-25 07:33:19 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

This pull request contains Broadcom ARM-based SoCs updates for 6.9,

Browse Source 
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
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEm+Rq3+YGJdiR9yuFh9CWnEQHBwQFAmXoxmQACgkQh9CWnEQH
 BwT1qQ//XxTGbR/6ifMFWEJ160uoZpIreLOZp2+9oTsyIIxoRIP/6Iiu03pgM1DX
 uyQJBdXbjmfDxlaVnEjZzMHqaDhRC5TxScwuD4C3ZBLfxMSF4Wm4tVxrOaH/xhQI
 IQUYj1UvJZByl84deE96EilckPS08KVEp8/FGTJszsmS2xYBUdTBrSkbapMX0k5j
 MtfZANukmcXo8mZMijTzB6suYWdDgkw8Zy33wXI+XotU85aVZ8oHD0Akg2USuGyK
 L+Mk1ctk2WJ63GEI+Cc0gFg0MpXaWSl03ItBQz73Kn/eaIYnOdF+vXOmLHVTzqWj
 LakMCiv/CIrBjL2S8vZsRMYdLXm9H0k9CR9hHj/EOu3vDDS549wMcm6aBY/yBkha
 goeNWcirC7uo143uBF2m2VF8Ux7ODgkxQgX8Svdr8aOCzHPVLtcOWmwcV2eYA5c7
 dllG8vrdFxvUPuONWmqAc6fm6XioFe6R1PQWQsxIFWOPfM2ziwkiI8vRwxxnmI9I
 5BfQRUqJH90iu2Q1Y5rnWns6o3Ta8t0wAFryHXhY0aJ58AzK/PIyZ2DHLYXyC4RW
 LRaYIdgbArpIu5goVdSOGvcRzm7Zj3OoBkIg+JU1b0ASdI0jn2fidYzlpHUApFUj
 uOonhBJNNAzRw/rtyQptWvMNCOCYBbWptp2jslXbu28LS38PoDI=
 =vdjO
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmXuqIQACgkQYKtH/8kJ
 UicNMhAApdclMUX6sS9t8NNjqlCOHtPL/OOXy2m2QHCcRYn/yQJVUpsZro92PVa4
 lrnrX11iltCoXSfIladK75WzOp7bwC03en9qUYJn+/lN21d1ArsvO5yZXnPJTMJ6
 GOM4Pf9A60hylzqVOk5y6sh8dyk7y57ppy4kdMYG66rt35yRRSYL5upvB/rbZO1r
 qRUhEIQfTqyzPjX18LHsUrl/RSxi8iIieqLfmY/ARVEmeuNDK2zNZfrJmiGCpOD8
 XbxAXXNhI6tIju8Yuq2/ajuTeTUrLnqWPbxhMxBLk5k0SyFhc48qauQH6w8OiuH8
 zDex1Z6hiUuGcUAWHjAaaQSxiSFPhibu47wwd22KBBQ2cDuJ1fsvwGtsnIMyI24R
 WJ+GgLioeK1bDg2IlopacNhTgWqZizZYWETzMX9xvYCCBi9qPqvOSfSNYzy+ufyg
 t4UjjB5FOaJSYYwUKqC1+kc7QVbUSGw/yv4jUJT2bS38uoJYheLDt2ZpOBHELR1Y
 aQt/64zo3gCQfJXpf0Ka37yMGbA0uHEjraMDLUdwutBQszKaVrYga3/l0022SGBT
 JDnmP+G8h3X3uAczVW3l8KQd5K6c3UwBkF4K2uUV3aTEz0WrusfLr3vi2KrVvfzp
 bkX49nDdkvCT4Cix4fHen7qZnNsZc5x+v/T1vFefhoX2ApoBCuc=
 =hlul
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Arnd Bergmann 2024-03-11 07:45:24 +01:00
commit f0379bd1c7
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/include/debug/brcmstb.S
View File

@ -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

1
arch/arm/mach-bcm/Kconfig
View File

@ -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