Skip to contentSkip to conversation

OMAP: RM-680: fix omap2_init_common_hw compile break

PATCH New Omar Ramirez Luna 3 participants 3 messages Dec 16, 2010

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 OMAP: RM-680: fix omap2_init_common_hw compile break

This solves the following:

arch/arm/mach-omap2/board-rm680.c: In function 'rm680_init_irq':
arch/arm/mach-omap2/board-rm680.c:149: error: implicit
declaration of function 'omap2_init_common_hw'

And another occurence of the same functions in am3517crane board file.

---
 arch/arm/mach-omap2/board-am3517crane.c |    3 ++-
 arch/arm/mach-omap2/board-rm680.c       |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
arch/arm/mach-omap2/board-am3517crane.c +2 -1
index 8ba4047..781ed25 100644
@@ -47,7 +47,8 @@ static void __init am3517_crane_init_irq(void)
 	omap_board_config = am3517_crane_config;
 	omap_board_config_size = ARRAY_SIZE(am3517_crane_config);
 
-	omap2_init_common_hw(NULL, NULL);
+	omap2_init_common_infrastructure();
+	omap2_init_common_devices(NULL, NULL);
 	omap_init_irq();
 }
 
arch/arm/mach-omap2/board-rm680.c +2 -1
index 8da65bd..e51e737 100644
@@ -146,7 +146,8 @@ static void __init rm680_init_irq(void)
 	struct omap_sdrc_params *sdrc_params;
 
 	sdrc_params = nokia_get_sdram_timings();
-	omap2_init_common_hw(sdrc_params, sdrc_params);
+	omap2_init_common_infrastructure();
+	omap2_init_common_devices(sdrc_params, sdrc_params);
 	omap_init_irq();
 }
 
Signature · 1 line
1.7.1
#1 lore raw

PATCH 1/1 OMAP: RM-680: fix omap2_init_common_hw compile break

arch/arm/mach-omap2/board-am3517crane.c static void __init am3517_crane_init_irq(void) · line 52

Quoted 12 lines · Omar Ramirez Luna
arch/arm/mach-omap2/board-am3517crane.c +2 -1
index 8ba4047..781ed25 100644
@@ -47,7 +47,8 @@ static void __init am3517_crane_init_irq(void)
 	omap_board_config = am3517_crane_config;
 	omap_board_config_size = ARRAY_SIZE(am3517_crane_config);
 
-	omap2_init_common_hw(NULL, NULL);
+	omap2_init_common_infrastructure();
+	omap2_init_common_devices(NULL, NULL);
 	omap_init_irq();

Once I have the init_early() sorted, hopefully most of the abuse in these callbacks can be moved into the init_early() callback.

maintainer
#2 lore raw

PATCH 1/1 OMAP: RM-680: fix omap2_init_common_hw compile break

Quoted 9 lines · Russell King - ARM Linux
Quoted 8 lines · Omar Ramirez Luna
arch/arm/mach-omap2/board-am3517crane.c +0 -0
index 8ba4047..781ed25 100644
@@ -47,7 +47,8 @@ static void __init am3517_crane_init_irq(void)
 	omap_board_config = am3517_crane_config;
 	omap_board_config_size = ARRAY_SIZE(am3517_crane_config);
 
Quoted 7 lines

arch/arm/mach-omap2/board-am3517crane.c static void __init am3517_crane_init_irq(void) · line 52

Quoted 4 lines
arch/arm/mach-omap2/board-am3517crane.c +2 -1
-	omap2_init_common_hw(NULL, NULL);
+	omap2_init_common_infrastructure();
+	omap2_init_common_devices(NULL, NULL);
 	omap_init_irq();

Once I have the init_early() sorted, hopefully most of the abuse in these callbacks can be moved into the init_early() callback.

Sounds good to me.

Thanks,

Tony