github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-24 06:24:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ARM: Core Tegra changes for v7.3-rc1

Browse Source 
We haven't had one of these in a long time, but a __ASSEMBLY__ cleanup
 patch and a OF reference leak fix came in that make changes to the core
 Tegra code.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiOrDCAFJzPfAjcif3SOs138+s6EFAmpvcMYACgkQ3SOs138+
 s6FTEw//bhqJ10GFP5k9p2oGzlmvavxlmKiOEYmPy/WYO5R8D8X/5Wqia40ZbpTd
 oQNo7dfYApvDTRDwHihl4irJ0WeS224FHgvbURExg4k9m41SuSD2j0agMtKGJC7r
 6C58m2F1bpSXEFYN+k8jkezi0k2JSqPprHLpPGJkt/15xuVxDUUVH8vKtIs0AT8c
 L9pSyHYLmkTCt2kQfg6Yc14JfDR7Lss0qUH+33Wum/FPmKga9OWtqmw7s/ILsfOt
 sfxilpupk28+Rq7f+ZaGDMHV6Ern6zBPiqSQsqdnH6vYI0Kg3kqLf+zfhdjoPSaf
 BL4tQM4NQ65MgjkdaT1iRIlrdNDZcw7ToA+Nli+MSEddfwAGUdEeCMqSDtV7ox5b
 iDycG/PwEwtVMX1wMd8I1d3UjiDntKqvfhOUru76m+Yt8mFGdf/eZhRGTrw3IS0n
 jQcNexrSAyuNku3qbsPBooUJSOglBY6S+QOghXJ6m4jeqOCkqA5kESHLWtoxdmXT
 NPXWzrya0MIPKOxV3i1Jsqb84aKi/Haq4HeaaqxBiYXv+XlH0xAnLFZBdSHIaL8P
 oYSXBNej1gt5EJeD82GVZGKZbVgyGH10tjYB8/FLMkOAaQ3LzVU/ze+ZLtYQ4GML
 xfrjOFXZVQsrSQSRYQzeBMvjuAr1r/ZjL0mD6V2l0jjTO5O6Ve8=
 =SQ4n
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmpyQQIACgkQmmx57+YA
 GNkIKg/+MV9prMCWSQV4z9jIe1NhmKajbqROYQsNowijBoS8z5fakO7DujZYrFOY
 WF+vgxfGl+tnaFvz+fZg6rW5snxtnzLtNU9KszQCzQy1je6LUY+sGKrKhdzWZjoM
 DWK492jUwf6/nIUlFWxihZZ7IiILDoUHfeeB8nFYO5Iu+WZx3juSwuqStI/feKKM
 bX9/bkj2dwczAeHcAQv8uL3UfhOr53ANf7p53jg6sWKt0FDSWeLLSbmTJae9sVLj
 Verx38c1SJqtGO2RvTA/AMhdrZUyy99ZoV4rHcXMHMfISQpaxKcLfWJHlyAXDHdt
 sr7YdAPpRf7rA98xvCN53/9FQVru+UcSWsBIwL0531xkWdFX66Ps4qz1KrPYR4lI
 6WSSFjsiCGtk1aB/Hh4pDKLNK/7hk9osvgE39bEeiKi0rMtKQ1ihcTShx/ur0wND
 cqghv/bVlbCWg688vMq398z3LzHsWe40x3pWRx/5vbzvLZdNbFlNnqXBzR+fmz9j
 t4hLh2UI7/Y6DlK91FP8ndLv1bBNndX9AfRbTXfb0sd5KcY7qZkyH/D/hOF8eTiK
 NZ0q9eHHjrGK+3/LCVg3uM0a971Ody9n8D3fopZIxqeJcxZVqSNNVkt36Qt60/tr
 0+1q6puIXWj642PaMA+iXHetJa0KN4P/7vSIWkDpE6eL7jQLHoU=
 =72S6
 -----END PGP SIGNATURE-----

Merge tag 'tegra-for-7.3-arm-core' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into soc/arm

ARM: Core Tegra changes for v7.3-rc1

We haven't had one of these in a long time, but a __ASSEMBLY__ cleanup
patch and a OF reference leak fix came in that make changes to the core
Tegra code.

* tag 'tegra-for-7.3-arm-core' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra: Replace __ASSEMBLY__ with __ASSEMBLER__
  ARM: tegra: Fix OF node reference leaks in IRQ init

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2026-08-04 21:43:58 +02:00
commit 1ec9093bc9
5 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/arm/mach-tegra/irq.c
View File

@ -66,9 +66,9 @@ static const struct of_device_id tegra114_dt_gic_match[] __initconst = {
static void __init tegra114_gic_cpu_pm_registration(void)
{
struct device_node *dn;
struct device_node *dn __free(device_node) =
of_find_matching_node(NULL, tegra114_dt_gic_match);
dn = of_find_matching_node(NULL, tegra114_dt_gic_match);
if (!dn)
return;
@ -88,7 +88,10 @@ static const struct of_device_id tegra_ictlr_match[] __initconst = {
void __init tegra_init_irq(void)
{
if (WARN_ON(!of_find_matching_node(NULL, tegra_ictlr_match)))
struct device_node *dn __free(device_node) =
of_find_matching_node(NULL, tegra_ictlr_match);
if (WARN_ON(!dn))
pr_warn("Outdated DT detected, suspend/resume will NOT work\n");
tegra114_gic_cpu_pm_registration();

2
arch/arm/mach-tegra/reset.h
View File

@ -21,7 +21,7 @@
#define RESET_DATA(x) ((TEGRA_RESET_##x)*4)
#ifndef __ASSEMBLY__
#ifndef __ASSEMBLER__
#include "irammap.h"

2
arch/arm/mach-tegra/sleep.h
View File

@ -38,7 +38,7 @@
#define TEGRA_FLUSH_CACHE_LOUIS 0
#define TEGRA_FLUSH_CACHE_ALL 1
#ifdef __ASSEMBLY__
#ifdef __ASSEMBLER__
/* waits until the microsecond counter (base) is > rn */
.macro wait_until, rn, base, tmp
add \rn, \rn, #1

4
include/soc/tegra/flowctrl.h
View File

@ -39,7 +39,7 @@
#define TEGRA30_FLOW_CTRL_CSR_WFE_BITMAP (0xF << 4)
#define TEGRA30_FLOW_CTRL_CSR_WFI_BITMAP (0xF << 8)
#ifndef __ASSEMBLY__
#ifndef __ASSEMBLER__
#ifdef CONFIG_SOC_TEGRA_FLOWCTRL
u32 flowctrl_read_cpu_csr(unsigned int cpuid);
void flowctrl_write_cpu_csr(unsigned int cpuid, u32 value);
@ -67,5 +67,5 @@ static inline void flowctrl_cpu_suspend_exit(unsigned int cpuid)
{
}
#endif /* CONFIG_SOC_TEGRA_FLOWCTRL */
#endif /* __ASSEMBLY */
#endif /* __ASSEMBLER__ */
#endif /* __SOC_TEGRA_FLOWCTRL_H__ */

4
include/soc/tegra/fuse.h
View File

@ -24,7 +24,7 @@
#define TEGRA30_FUSE_SATA_CALIB 0x124
#define TEGRA_FUSE_USB_CALIB_EXT_0 0x250
#ifndef __ASSEMBLY__
#ifndef __ASSEMBLER__
enum tegra_revision {
TEGRA_REVISION_UNKNOWN = 0,
@ -122,6 +122,6 @@ static inline int tegra194_miscreg_mask_serror(void)
struct device *tegra_soc_device_register(void);
#endif /* __ASSEMBLY__ */
#endif /* __ASSEMBLER__ */
#endif /* __SOC_TEGRA_FUSE_H__ */