Skip to contentSkip to conversation

soc/tegra: pmc: fix #ifdef block in header

PATCH Applied Arnd Bergmann 2 participants 3 messages Jun 18 – Jun 22 Tegra architecture support

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 soc/tegra: pmc: fix #ifdef block in header

From: Arnd Bergmann <[email protected]>

When build testing on ARM without the PMC driver, the other drivers fail to link:

ld.lld: error: undefined symbol: tegra_pmc_core_domain_state_synced

Quoted 4 lines
Quoted 4 lines
Quoted 4 lines

referenced by regulators-tegra30.c
drivers/soc/tegra/regulators-tegra30.o:(tegra30_regulator_balance_voltage) in archive vmlinux.a
referenced by regulators-tegra20.c
drivers/soc/tegra/regulators-tegra20.o:(tegra20_core_rtc_update) in archive vmlinux.a

Adapt the checks in the header to cover both cases on other architectures and without PMC.

Fixes 8318af5dd29c ("soc/tegra: pmc: Move legacy code behind CONFIG_ARM guard")
---
 include/soc/tegra/pmc.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
include/soc/tegra/pmc.h +4 -1
index 4bcbf19d75ac..53f6d02889db 100644
@@ -210,7 +210,6 @@ tegra_pmc_io_pad_power_disable(struct tegra_pmc *pmc, enum tegra_io_pad id)
 bool tegra_pmc_cpu_is_powered(unsigned int cpuid);
 int tegra_pmc_cpu_power_on(unsigned int cpuid);
 int tegra_pmc_cpu_remove_clamping(unsigned int cpuid);
-bool tegra_pmc_core_domain_state_synced(void);
 
 #if defined(CONFIG_SOC_TEGRA_PMC) && defined(CONFIG_PM_SLEEP)
 enum tegra_suspend_mode tegra_pmc_get_suspend_mode(void);
@@ -230,6 +229,10 @@ static inline void tegra_pmc_enter_suspend_mode(enum tegra_suspend_mode mode)
 {
 }
 #endif
+#endif
+
+#if defined(CONFIG_ARM) && defined(CONFIG_SOC_TEGRA_PMC)
+bool tegra_pmc_core_domain_state_synced(void);
 #else
 /* needed for COMPILE_TEST */
 static inline bool tegra_pmc_core_domain_state_synced(void)
Signature · 1 line
2.39.5
maintainer
#1 lore raw
Quoted 11 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

When build testing on ARM without the PMC driver, the other drivers fail to link:

ld.lld: error: undefined symbol: tegra_pmc_core_domain_state_synced

Quoted 4 lines
Quoted 4 lines
Quoted 4 lines

referenced by regulators-tegra30.c
drivers/soc/tegra/regulators-tegra30.o:(tegra30_regulator_balance_voltage) in archive vmlinux.a
referenced by regulators-tegra20.c
drivers/soc/tegra/regulators-tegra20.o:(tegra20_core_rtc_update) in archive vmlinux.a

Quoted 8 lines

Adapt the checks in the header to cover both cases on other architectures and without PMC.

Fixes 8318af5dd29c ("soc/tegra: pmc: Move legacy code behind CONFIG_ARM guard")
---
 include/soc/tegra/pmc.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Heh... guess that was just one combination too much for me. Thanks for catching this.

Thierry

maintainer Applied
#2 lore raw
In reply to Arnd Bergmann

From: Thierry Reding <[email protected]>

Quoted 10 lines · Arnd Bergmann

When build testing on ARM without the PMC driver, the other drivers fail to link:

ld.lld: error: undefined symbol: tegra_pmc_core_domain_state_synced

Quoted 4 lines
Quoted 4 lines
Quoted 4 lines

referenced by regulators-tegra30.c
drivers/soc/tegra/regulators-tegra30.o:(tegra30_regulator_balance_voltage) in archive vmlinux.a
referenced by regulators-tegra20.c
drivers/soc/tegra/regulators-tegra20.o:(tegra20_core_rtc_update) in archive vmlinux.a

[...]

Applied, thanks!

[1/1] soc/tegra: pmc: fix #ifdef block in header

      commit: 813e034925814858cc52e7de321ec4848314e15d

Best regards,

Signature · 1 line
Thierry Reding <[email protected]>