Bläddra i källkod

ARM: OMAP2+: Register SoC device attributes from machine .init()

SoC device attributes are registered with a call to
soc_device_register() from the machine .init_late() operation, which is
called from the late initcall, after all drivers built-in drivers have
been probed. This results in the impossibility for drivers to use SoC
device matching in their probe function.

The omap_soc_device_init() function is safe to call from the machine
.init() operation, as all data it depends on is initialized from the
.init_early() operation. Move SoC device attribute registration to
machine .init() like on all other ARM platforms.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Laurent Pinchart 8 år sedan
förälder
incheckning
07e72f9a3f
2 ändrade filer med 1 tillägg och 1 borttagningar
  1. 1 0
      arch/arm/mach-omap2/board-generic.c
  2. 0 1
      arch/arm/mach-omap2/io.c

+ 1 - 0
arch/arm/mach-omap2/board-generic.c

@@ -33,6 +33,7 @@ static void __init __maybe_unused omap_generic_init(void)
 	pdata_quirks_init(omap_dt_match_table);
 	pdata_quirks_init(omap_dt_match_table);
 
 
 	omapdss_init_of();
 	omapdss_init_of();
+	omap_soc_device_init();
 }
 }
 
 
 #ifdef CONFIG_SOC_OMAP2420
 #ifdef CONFIG_SOC_OMAP2420

+ 0 - 1
arch/arm/mach-omap2/io.c

@@ -428,7 +428,6 @@ static void __init __maybe_unused omap_hwmod_init_postsetup(void)
 static void __init __maybe_unused omap_common_late_init(void)
 static void __init __maybe_unused omap_common_late_init(void)
 {
 {
 	omap2_common_pm_late_init();
 	omap2_common_pm_late_init();
-	omap_soc_device_init();
 }
 }
 
 
 #ifdef CONFIG_SOC_OMAP2420
 #ifdef CONFIG_SOC_OMAP2420