ARM: OMAP2+: Fix am4 only build after genpd changes
Subsystems (3)
Tony Lindgren
maintainerPATCH 1/1 ARM: OMAP2+: Fix am4 only build after genpd changes
With commit df6c2ec872a6 ("ARM: OMAP2+: Drop legacy remaining legacy platform data for am4") we moved am4 to boot with simple-pm-bus using genpd and devicetree based data. But I forgot to test am4 only build that still has few references to the old platform data left, and cause undefined reference errors with omap_hwmod_set_postsetup_state and omap_hwmod_for_each. We can just drop the related calls for am4 now, and also drop the references to unused struct wkup_m3_platform_data.
---
I'm applying this into omap-for-v5.11/genpd branch to fix build for am4 config.
--- arch/arm/mach-omap2/io.c | 1 - arch/arm/mach-omap2/pdata-quirks.c | 12 ------------ 2 files changed, 13 deletions(-)
arch/arm/mach-omap2/io.c +0 -1
@@ -588,7 +588,6 @@ void __init am43xx_init_early(void)omap2_prcm_base_init ();am43xx_powerdomains_init ();am43xx_clockdomains_init (); -omap_hwmod_init_postsetup ();omap_l2_cache_init (); omap_clk_soc_init = am43xx_dt_clk_init;omap_secure_init ();
arch/arm/mach-omap2/pdata-quirks.c +0 -12
@@ -274,14 +274,6 @@ static void __init omap3_pandora_legacy_init(void) }#endif /* CONFIG_ARCH_OMAP3 */ -#if defined(CONFIG_SOC_AM43XX ) -static struct wkup_m3_platform_data wkup_m3_data = { - .reset_name ="wkup_m3" , - .assert_reset = omap_device_assert_hardreset, - .deassert_reset = omap_device_deassert_hardreset, -}; -#endif -#ifdef CONFIG_SOC_OMAP5 static void __init omap5_uevm_legacy_init (void ) {
@@ -507,10 +499,6 @@ static struct of_dev_auxdata omap_auxdata_lookup[] = { OF_DEV_AUXDATA("ti,omap3-mcbsp", 0x49024000, "49024000.mcbsp", &mcbsp_pdata),#endif #endif -#ifdef CONFIG_SOC_AM43XX - OF_DEV_AUXDATA("ti,am4372-wkup-m3", 0x44d00000, "44d00000.wkup_m3", - &wkup_m3_data), -#endif #if defined(CONFIG_ARCH_OMAP4 ) || defined(CONFIG_SOC_OMAP5 )OF_DEV_AUXDATA ("ti,omap4-smartreflex-iva" ,0x4a0db000 , "4a0db000.smartreflex", &omap_sr_pdata[OMAP_SR_IVA]),
Signature · 1 line
2.29.2
Quoted 8 lines · Tony Lindgren
With commit
df6c2ec872a6("ARM: OMAP2+: Drop legacy remaining legacy platform data for am4") we moved am4 to boot with simple-pm-bus using genpd and devicetree based data. But I forgot to test am4 only build that still has few references to the old platform data left, and cause undefined reference errors withomap_hwmod_set_postsetup_stateandomap_hwmod_for_each. We can just drop the related calls for am4 now, and also drop the references to unused structwkup_m3_platform_data.
Quoted 6 lines
Reported-by Nishanth Menon <[email protected]>Signed-off-by Tony Lindgren <[email protected]>---
I'm applying this into omap-for-v5.11/genpd branch to fix build for am4 config.
Thanks Tony.
Tested against next-20201127 with .config
https://pastebin.ubuntu.com/p/qYwWH9FhW6/
[...]
Signature · 3 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D