diff options
author | Sanjeev Premi <premi@ti.com> | 2011-10-13 12:14:10 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-11-04 20:41:06 -0400 |
commit | c4e2d2457afd6da3ddee18c2a1befca287e029c7 (patch) | |
tree | a685e429199537d7cee493529ea496b21343945c /arch | |
parent | 7fd92b56e5508fc3453ac9a65e11561178e86330 (diff) |
ARM: OMAP: Fix errors and warnings when building for one board
When customizing omap2plus_defconfig to build for only
one board (omap3evm), I came across these warnings and
errors (filenames truncated):
arch/arm/mach-omap2/board-generic.c:76:20: warning: 'omap4_init' defined but not used
arch/arm/mach-omap2/built-in.o: In function `omap2420_init_early':
arch/arm/mach-omap2/io.c:364: undefined reference to `omap2_set_globals_242x'
arch/arm/mach-omap2/io.c:366: undefined reference to `omap2xxx_voltagedomains_init'
arch/arm/mach-omap2/io.c:367: undefined reference to `omap242x_powerdomains_init'
arch/arm/mach-omap2/io.c:368: undefined reference to `omap242x_clockdomains_init'
arch/arm/mach-omap2/io.c:369: undefined reference to `omap2420_hwmod_init'
arch/arm/mach-omap2/built-in.o: In function `omap2430_init_early':
arch/arm/mach-omap2/io.c:376: undefined reference to `omap2_set_globals_243x'
arch/arm/mach-omap2/io.c:378: undefined reference to `omap2xxx_voltagedomains_init'
arch/arm/mach-omap2/io.c:379: undefined reference to `omap243x_powerdomains_init'
arch/arm/mach-omap2/io.c:380: undefined reference to `omap243x_clockdomains_init'
arch/arm/mach-omap2/io.c:381: undefined reference to `omap2430_hwmod_init'
arch/arm/mach-omap2/built-in.o: In function `omap4430_init_early':
arch/arm/mach-omap2/io.c:436: undefined reference to `omap2_set_globals_443x'
arch/arm/mach-omap2/io.c:438: undefined reference to `omap44xx_voltagedomains_init'
arch/arm/mach-omap2/io.c:439: undefined reference to `omap44xx_powerdomains_init'
arch/arm/mach-omap2/io.c:440: undefined reference to `omap44xx_clockdomains_init'
arch/arm/mach-omap2/io.c:441: undefined reference to `omap44xx_hwmod_init'
This patch fixes them.
Signed-off-by: Sanjeev Premi <premi@ti.com>
Acked-by: Thomas Weber <weber@corscience.de>
[tony@atomide.com: updated to fix warnings for board-generic.c]
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-omap2/board-generic.c | 8 | ||||
-rw-r--r-- | arch/arm/mach-omap2/io.c | 6 |
2 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c index 0cc9094e5ee0..fb55fa3dad5a 100644 --- a/arch/arm/mach-omap2/board-generic.c +++ b/arch/arm/mach-omap2/board-generic.c | |||
@@ -28,6 +28,7 @@ | |||
28 | * XXX: Still needed to boot until the i2c & twl driver is adapted to | 28 | * XXX: Still needed to boot until the i2c & twl driver is adapted to |
29 | * device-tree | 29 | * device-tree |
30 | */ | 30 | */ |
31 | #ifdef CONFIG_ARCH_OMAP4 | ||
31 | static struct twl4030_platform_data sdp4430_twldata = { | 32 | static struct twl4030_platform_data sdp4430_twldata = { |
32 | .irq_base = TWL6030_IRQ_BASE, | 33 | .irq_base = TWL6030_IRQ_BASE, |
33 | .irq_end = TWL6030_IRQ_END, | 34 | .irq_end = TWL6030_IRQ_END, |
@@ -37,7 +38,9 @@ static void __init omap4_i2c_init(void) | |||
37 | { | 38 | { |
38 | omap4_pmic_init("twl6030", &sdp4430_twldata); | 39 | omap4_pmic_init("twl6030", &sdp4430_twldata); |
39 | } | 40 | } |
41 | #endif | ||
40 | 42 | ||
43 | #ifdef CONFIG_ARCH_OMAP3 | ||
41 | static struct twl4030_platform_data beagle_twldata = { | 44 | static struct twl4030_platform_data beagle_twldata = { |
42 | .irq_base = TWL4030_IRQ_BASE, | 45 | .irq_base = TWL4030_IRQ_BASE, |
43 | .irq_end = TWL4030_IRQ_END, | 46 | .irq_end = TWL4030_IRQ_END, |
@@ -47,6 +50,7 @@ static void __init omap3_i2c_init(void) | |||
47 | { | 50 | { |
48 | omap3_pmic_init("twl4030", &beagle_twldata); | 51 | omap3_pmic_init("twl4030", &beagle_twldata); |
49 | } | 52 | } |
53 | #endif | ||
50 | 54 | ||
51 | static struct of_device_id omap_dt_match_table[] __initdata = { | 55 | static struct of_device_id omap_dt_match_table[] __initdata = { |
52 | { .compatible = "simple-bus", }, | 56 | { .compatible = "simple-bus", }, |
@@ -72,17 +76,21 @@ static void __init omap_generic_init(void) | |||
72 | of_platform_populate(NULL, omap_dt_match_table, NULL, NULL); | 76 | of_platform_populate(NULL, omap_dt_match_table, NULL, NULL); |
73 | } | 77 | } |
74 | 78 | ||
79 | #ifdef CONFIG_ARCH_OMAP4 | ||
75 | static void __init omap4_init(void) | 80 | static void __init omap4_init(void) |
76 | { | 81 | { |
77 | omap4_i2c_init(); | 82 | omap4_i2c_init(); |
78 | omap_generic_init(); | 83 | omap_generic_init(); |
79 | } | 84 | } |
85 | #endif | ||
80 | 86 | ||
87 | #ifdef CONFIG_ARCH_OMAP3 | ||
81 | static void __init omap3_init(void) | 88 | static void __init omap3_init(void) |
82 | { | 89 | { |
83 | omap3_i2c_init(); | 90 | omap3_i2c_init(); |
84 | omap_generic_init(); | 91 | omap_generic_init(); |
85 | } | 92 | } |
93 | #endif | ||
86 | 94 | ||
87 | #if defined(CONFIG_SOC_OMAP2420) | 95 | #if defined(CONFIG_SOC_OMAP2420) |
88 | static const char *omap242x_boards_compat[] __initdata = { | 96 | static const char *omap242x_boards_compat[] __initdata = { |
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index a5d8dce2a70b..25d20ced03e1 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c | |||
@@ -359,6 +359,7 @@ static void __init omap_hwmod_init_postsetup(void) | |||
359 | omap_pm_if_early_init(); | 359 | omap_pm_if_early_init(); |
360 | } | 360 | } |
361 | 361 | ||
362 | #ifdef CONFIG_ARCH_OMAP2 | ||
362 | void __init omap2420_init_early(void) | 363 | void __init omap2420_init_early(void) |
363 | { | 364 | { |
364 | omap2_set_globals_242x(); | 365 | omap2_set_globals_242x(); |
@@ -382,11 +383,13 @@ void __init omap2430_init_early(void) | |||
382 | omap_hwmod_init_postsetup(); | 383 | omap_hwmod_init_postsetup(); |
383 | omap2430_clk_init(); | 384 | omap2430_clk_init(); |
384 | } | 385 | } |
386 | #endif | ||
385 | 387 | ||
386 | /* | 388 | /* |
387 | * Currently only board-omap3beagle.c should call this because of the | 389 | * Currently only board-omap3beagle.c should call this because of the |
388 | * same machine_id for 34xx and 36xx beagle.. Will get fixed with DT. | 390 | * same machine_id for 34xx and 36xx beagle.. Will get fixed with DT. |
389 | */ | 391 | */ |
392 | #ifdef CONFIG_ARCH_OMAP3 | ||
390 | void __init omap3_init_early(void) | 393 | void __init omap3_init_early(void) |
391 | { | 394 | { |
392 | omap2_set_globals_3xxx(); | 395 | omap2_set_globals_3xxx(); |
@@ -430,7 +433,9 @@ void __init ti816x_init_early(void) | |||
430 | omap_hwmod_init_postsetup(); | 433 | omap_hwmod_init_postsetup(); |
431 | omap3xxx_clk_init(); | 434 | omap3xxx_clk_init(); |
432 | } | 435 | } |
436 | #endif | ||
433 | 437 | ||
438 | #ifdef CONFIG_ARCH_OMAP4 | ||
434 | void __init omap4430_init_early(void) | 439 | void __init omap4430_init_early(void) |
435 | { | 440 | { |
436 | omap2_set_globals_443x(); | 441 | omap2_set_globals_443x(); |
@@ -442,6 +447,7 @@ void __init omap4430_init_early(void) | |||
442 | omap_hwmod_init_postsetup(); | 447 | omap_hwmod_init_postsetup(); |
443 | omap4xxx_clk_init(); | 448 | omap4xxx_clk_init(); |
444 | } | 449 | } |
450 | #endif | ||
445 | 451 | ||
446 | void __init omap_sdrc_init(struct omap_sdrc_params *sdrc_cs0, | 452 | void __init omap_sdrc_init(struct omap_sdrc_params *sdrc_cs0, |
447 | struct omap_sdrc_params *sdrc_cs1) | 453 | struct omap_sdrc_params *sdrc_cs1) |