diff options
Diffstat (limited to 'extras/recipes-kernel/linux/linux-omap-psp-2.6.32/0001-Revert-omap3-beagle-Fix-compile-time-errors.patch')
-rw-r--r-- | extras/recipes-kernel/linux/linux-omap-psp-2.6.32/0001-Revert-omap3-beagle-Fix-compile-time-errors.patch | 67 |
1 files changed, 67 insertions, 0 deletions
diff --git a/extras/recipes-kernel/linux/linux-omap-psp-2.6.32/0001-Revert-omap3-beagle-Fix-compile-time-errors.patch b/extras/recipes-kernel/linux/linux-omap-psp-2.6.32/0001-Revert-omap3-beagle-Fix-compile-time-errors.patch new file mode 100644 index 00000000..abcf45b6 --- /dev/null +++ b/extras/recipes-kernel/linux/linux-omap-psp-2.6.32/0001-Revert-omap3-beagle-Fix-compile-time-errors.patch | |||
@@ -0,0 +1,67 @@ | |||
1 | From 09b6266a567b22e07200973312ffb8f43e7f7d43 Mon Sep 17 00:00:00 2001 | ||
2 | From: Koen Kooi <koen@dominion.thruhere.net> | ||
3 | Date: Fri, 30 Apr 2010 11:12:24 +0200 | ||
4 | Subject: [PATCH 01/45] Revert "omap3: beagle: Fix compile-time errors" | ||
5 | |||
6 | This commit clashes with the other beagle patches we apply on top | ||
7 | |||
8 | This reverts commit da5b291cba631d303cb137fa6a620c494d828197. | ||
9 | --- | ||
10 | arch/arm/mach-omap2/board-omap3beagle.c | 34 ++---------------------------- | ||
11 | 1 files changed, 3 insertions(+), 31 deletions(-) | ||
12 | |||
13 | diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c | ||
14 | index c5da58e..330fb25 100644 | ||
15 | --- a/arch/arm/mach-omap2/board-omap3beagle.c | ||
16 | +++ b/arch/arm/mach-omap2/board-omap3beagle.c | ||
17 | @@ -56,22 +56,6 @@ | ||
18 | |||
19 | #define NAND_BLOCK_SIZE SZ_128K | ||
20 | |||
21 | -#ifdef CONFIG_PM | ||
22 | -static struct omap_opp * _omap35x_mpu_rate_table = omap35x_mpu_rate_table; | ||
23 | -static struct omap_opp * _omap37x_mpu_rate_table = omap37x_mpu_rate_table; | ||
24 | -static struct omap_opp * _omap35x_dsp_rate_table = omap35x_dsp_rate_table; | ||
25 | -static struct omap_opp * _omap37x_dsp_rate_table = omap37x_dsp_rate_table; | ||
26 | -static struct omap_opp * _omap35x_l3_rate_table = omap35x_l3_rate_table; | ||
27 | -static struct omap_opp * _omap37x_l3_rate_table = omap37x_l3_rate_table; | ||
28 | -#else /* CONFIG_PM */ | ||
29 | -static struct omap_opp * _omap35x_mpu_rate_table = NULL; | ||
30 | -static struct omap_opp * _omap37x_mpu_rate_table = NULL; | ||
31 | -static struct omap_opp * _omap35x_dsp_rate_table = NULL; | ||
32 | -static struct omap_opp * _omap37x_dsp_rate_table = NULL; | ||
33 | -static struct omap_opp * _omap35x_l3_rate_table = NULL; | ||
34 | -static struct omap_opp * _omap37x_l3_rate_table = NULL; | ||
35 | -#endif /* CONFIG_PM */ | ||
36 | - | ||
37 | static struct mtd_partition omap3beagle_nand_partitions[] = { | ||
38 | /* All the partition sizes are listed in terms of NAND block size */ | ||
39 | { | ||
40 | @@ -377,21 +361,9 @@ static void __init omap3_beagle_init_irq(void) | ||
41 | { | ||
42 | omap_board_config = omap3_beagle_config; | ||
43 | omap_board_config_size = ARRAY_SIZE(omap3_beagle_config); | ||
44 | - | ||
45 | - if (cpu_is_omap3630()) { | ||
46 | - omap2_init_common_hw(mt46h32m32lf6_sdrc_params, | ||
47 | - mt46h32m32lf6_sdrc_params, | ||
48 | - _omap37x_mpu_rate_table, | ||
49 | - _omap37x_dsp_rate_table, | ||
50 | - _omap37x_l3_rate_table); | ||
51 | - } else { | ||
52 | - omap2_init_common_hw(mt46h32m32lf6_sdrc_params, | ||
53 | - mt46h32m32lf6_sdrc_params, | ||
54 | - _omap35x_mpu_rate_table, | ||
55 | - _omap35x_dsp_rate_table, | ||
56 | - _omap35x_l3_rate_table); | ||
57 | - } | ||
58 | - | ||
59 | + omap2_init_common_hw(mt46h32m32lf6_sdrc_params, | ||
60 | + mt46h32m32lf6_sdrc_params, omap3_mpu_rate_table, | ||
61 | + omap3_dsp_rate_table, omap3_l3_rate_table); | ||
62 | omap_init_irq(); | ||
63 | #ifdef CONFIG_OMAP_32K_TIMER | ||
64 | omap2_gp_clockevent_set_gptimer(12); | ||
65 | -- | ||
66 | 1.6.6.1 | ||
67 | |||