summaryrefslogtreecommitdiff
path: root/packages/linux/linux-omap2-git/beagleboard
diff options
context:
space:
mode:
Diffstat (limited to 'packages/linux/linux-omap2-git/beagleboard')
-rw-r--r--packages/linux/linux-omap2-git/beagleboard/0001-This-patch-adds-RTC-support-to-the-omap3-based-beagl.patch43
-rw-r--r--packages/linux/linux-omap2-git/beagleboard/0001-board-omap3beagle-fix-merge-damage-in-RTC-code.patch36
-rw-r--r--packages/linux/linux-omap2-git/beagleboard/l2-cache-check.patch45
3 files changed, 36 insertions, 88 deletions
diff --git a/packages/linux/linux-omap2-git/beagleboard/0001-This-patch-adds-RTC-support-to-the-omap3-based-beagl.patch b/packages/linux/linux-omap2-git/beagleboard/0001-This-patch-adds-RTC-support-to-the-omap3-based-beagl.patch
deleted file mode 100644
index 3f861ebf9d..0000000000
--- a/packages/linux/linux-omap2-git/beagleboard/0001-This-patch-adds-RTC-support-to-the-omap3-based-beagl.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 3f8441b4e1fc297caf5cf712c1bc3f506ec28065 Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@openembedded.org>
-Date: Thu, 8 May 2008 18:30:41 +0200
-Subject: [PATCH] This patch adds RTC support to the omap3 based beagleboard
-
-Signed-off-by: Koen Kooi <koen@openembedded.org>
----
- arch/arm/mach-omap2/board-omap3beagle.c | 12 ++++++++++++
- 1 files changed, 12 insertions(+), 0 deletions(-)
-
-diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index 626f004..0c0cbfc 100644
---- a/arch/arm/mach-omap2/board-omap3beagle.c
-+++ b/arch/arm/mach-omap2/board-omap3beagle.c
-@@ -58,13 +58,25 @@ static struct omap_mmc_config omap3beagle_mmc_config __initdata = {
- },
- };
-
-+static struct platform_device omap3_beagle_twl4030rtc_device = {
-+ .name = "twl4030_rtc",
-+ .id = -1,
-+};
-+
- static struct omap_board_config_kernel omap3_beagle_config[] __initdata = {
- { OMAP_TAG_UART, &omap3_beagle_uart_config },
- { OMAP_TAG_MMC, &omap3beagle_mmc_config },
- };
-
-+static struct platform_device *omap3_beagle_devices[] __initdata = {
-+#ifdef CONFIG_RTC_DRV_TWL4030
-+ &omap3_beagle_twl4030rtc_device,
-+#endif
-+};
-+
- static void __init omap3_beagle_init(void)
- {
-+ platform_add_devices(omap3_beagle_devices, ARRAY_SIZE(omap3_beagle_devices));
- omap_board_config = omap3_beagle_config;
- omap_board_config_size = ARRAY_SIZE(omap3_beagle_config);
- omap_serial_init();
---
-1.5.4.3
-
diff --git a/packages/linux/linux-omap2-git/beagleboard/0001-board-omap3beagle-fix-merge-damage-in-RTC-code.patch b/packages/linux/linux-omap2-git/beagleboard/0001-board-omap3beagle-fix-merge-damage-in-RTC-code.patch
new file mode 100644
index 0000000000..55e9bf7b54
--- /dev/null
+++ b/packages/linux/linux-omap2-git/beagleboard/0001-board-omap3beagle-fix-merge-damage-in-RTC-code.patch
@@ -0,0 +1,36 @@
+From eddf57fb9748791e021ef550d651cc72c48add5c Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@openembedded.org>
+Date: Thu, 15 May 2008 09:32:23 +0200
+Subject: [PATCH] ARM: OMAP: board-omap3beagle: fix merge-damage in RTC code
+
+This patch fixes the merge-damage in the beagleboard RTC code
+
+Signed-off-by: Koen Kooi <koen@openembedded.org>
+---
+ arch/arm/mach-omap2/board-omap3beagle.c | 3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
+index 0c15ca0..0c0cbfc 100644
+--- a/arch/arm/mach-omap2/board-omap3beagle.c
++++ b/arch/arm/mach-omap2/board-omap3beagle.c
+@@ -76,6 +76,7 @@ static struct platform_device *omap3_beagle_devices[] __initdata = {
+
+ static void __init omap3_beagle_init(void)
+ {
++ platform_add_devices(omap3_beagle_devices, ARRAY_SIZE(omap3_beagle_devices));
+ omap_board_config = omap3_beagle_config;
+ omap_board_config_size = ARRAY_SIZE(omap3_beagle_config);
+ omap_serial_init();
+@@ -88,8 +89,6 @@ arch_initcall(omap3_beagle_i2c_init);
+
+ static void __init omap3_beagle_map_io(void)
+ {
+- platform_add_devices(omap3_beagle_devices,
+- ARRAY_SIZE(omap3_beagle_devices));
+ omap2_set_globals_343x();
+ omap2_map_common_io();
+ }
+--
+1.5.4.3
+
diff --git a/packages/linux/linux-omap2-git/beagleboard/l2-cache-check.patch b/packages/linux/linux-omap2-git/beagleboard/l2-cache-check.patch
deleted file mode 100644
index d81f03880c..0000000000
--- a/packages/linux/linux-omap2-git/beagleboard/l2-cache-check.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Content-Type: text/plain; charset=ISO-8859-1; format=flowed
-Content-Transfer-Encoding: 7bit
-
-
-Enabling L2 cache of Cortex-A8 based OMAP3 has to be done by
-bootloader. Check if this is done and warn if not.
-
-Signed-off-by: Dirk Behme <dirk.behme@gmail.com>
-
-----
-
-Changes in v2: Fix a typo.
-
-Index: linux-beagle/arch/arm/mach-omap2/id.c
-===================================================================
---- linux-beagle.orig/arch/arm/mach-omap2/id.c
-+++ linux-beagle/arch/arm/mach-omap2/id.c
-@@ -267,3 +267,26 @@ void __init omap2_check_revision(void)
-
- }
-
-+#ifdef CONFIG_ARCH_OMAP3
-+/*
-+ * OMAP3 has L2 cache which has to be enabled by bootloader.
-+ */
-+static int __init omap3_check_l2cache(void)
-+{
-+ u32 val;
-+
-+ /* Get CP15 AUX register, bit 1 enabled indicates L2 cache is on */
-+ asm volatile("mrc p15, 0, %0, c1, c0, 1":"=r" (val));
-+
-+ if ((val & 0x2) == 0) {
-+ printk(KERN_WARNING "Warning: L2 cache not enabled. Check "
-+ "your bootloader. L2 off results in performance loss\n");
-+ } else {
-+ pr_info("OMAP3 L2 cache enabled");
-+ }
-+
-+ return 0;
-+}
-+
-+arch_initcall(omap3_check_l2cache);
-+#endif /* CONFIG_ARCH_OMAP3 */
-