summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-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/convert-rwsem-to-rwclock.patch220
-rw-r--r--packages/linux/linux-omap2-git/beagleboard/l2-cache-check.patch45
-rw-r--r--packages/linux/linux-omap2_git.bb5
5 files changed, 39 insertions, 310 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/convert-rwsem-to-rwclock.patch b/packages/linux/linux-omap2-git/beagleboard/convert-rwsem-to-rwclock.patch
deleted file mode 100644
index 311260d790..0000000000
--- a/packages/linux/linux-omap2-git/beagleboard/convert-rwsem-to-rwclock.patch
+++ /dev/null
@@ -1,220 +0,0 @@
-The generic rwsem implementation of down_read() and down_write() does not
-save and restore interrupt state. This causes powerdomain code to
-inadvertently enable interrupts early in the boot process, causing
-init/main.c to complain. This patch converts powerdomain locking to
-r-w spinlocks instead.
-
-I'm also curious to know if this fixes the BeagleBoard boot problem.
-
-Signed-off-by: Paul Walmsley <paul@pwsan.com>
----
-
- arch/arm/mach-omap2/powerdomain.c | 46 ++++++++++++++++++++++---------------
- 1 files changed, 27 insertions(+), 19 deletions(-)
-
-
-diff --git a/arch/arm/mach-omap2/powerdomain.c b/arch/arm/mach-omap2/powerdomain.c
-index 939efe4..0a6caaf 100644
---- a/arch/arm/mach-omap2/powerdomain.c
-+++ b/arch/arm/mach-omap2/powerdomain.c
-@@ -18,7 +18,7 @@
- #include <linux/module.h>
- #include <linux/types.h>
- #include <linux/delay.h>
--#include <linux/rwsem.h>
-+#include <linux/spinlock.h>
- #include <linux/list.h>
- #include <linux/errno.h>
- #include <linux/err.h>
-@@ -38,10 +38,10 @@
- static LIST_HEAD(pwrdm_list);
-
- /*
-- * pwrdm_rwsem protects pwrdm_list add and del ops - also reused to
-+ * pwrdm_rwlock protects pwrdm_list add and del ops - also reused to
- * protect pwrdm_clkdms[] during clkdm add/del ops
- */
--static DECLARE_RWSEM(pwrdm_rwsem);
-+static DEFINE_RWLOCK(pwrdm_rwlock);
-
-
- /* Private functions */
-@@ -131,6 +131,7 @@ void pwrdm_init(struct powerdomain **pwrdm_list)
- */
- int pwrdm_register(struct powerdomain *pwrdm)
- {
-+ unsigned long flags;
- int ret = -EINVAL;
-
- if (!pwrdm)
-@@ -139,7 +140,7 @@ int pwrdm_register(struct powerdomain *pwrdm)
- if (!omap_chip_is(pwrdm->omap_chip))
- return -EINVAL;
-
-- down_write(&pwrdm_rwsem);
-+ write_lock_irqsave(&pwrdm_rwlock, flags);
- if (_pwrdm_lookup(pwrdm->name)) {
- ret = -EEXIST;
- goto pr_unlock;
-@@ -151,7 +152,7 @@ int pwrdm_register(struct powerdomain *pwrdm)
- ret = 0;
-
- pr_unlock:
-- up_write(&pwrdm_rwsem);
-+ write_unlock_irqrestore(&pwrdm_rwlock, flags);
-
- return ret;
- }
-@@ -165,12 +166,14 @@ pr_unlock:
- */
- int pwrdm_unregister(struct powerdomain *pwrdm)
- {
-+ unsigned long flags;
-+
- if (!pwrdm)
- return -EINVAL;
-
-- down_write(&pwrdm_rwsem);
-+ write_lock_irqsave(&pwrdm_rwlock, flags);
- list_del(&pwrdm->node);
-- up_write(&pwrdm_rwsem);
-+ write_unlock_irqrestore(&pwrdm_rwlock, flags);
-
- pr_debug("powerdomain: unregistered %s\n", pwrdm->name);
-
-@@ -187,13 +190,14 @@ int pwrdm_unregister(struct powerdomain *pwrdm)
- struct powerdomain *pwrdm_lookup(const char *name)
- {
- struct powerdomain *pwrdm;
-+ unsigned long flags;
-
- if (!name)
- return NULL;
-
-- down_read(&pwrdm_rwsem);
-+ read_lock_irqsave(&pwrdm_rwlock, flags);
- pwrdm = _pwrdm_lookup(name);
-- up_read(&pwrdm_rwsem);
-+ read_unlock_irqrestore(&pwrdm_rwlock, flags);
-
- return pwrdm;
- }
-@@ -204,7 +208,7 @@ struct powerdomain *pwrdm_lookup(const char *name)
- *
- * Call the supplied function for each registered powerdomain. The
- * callback function can return anything but 0 to bail out early from
-- * the iterator. The callback function is called with the pwrdm_rwsem
-+ * the iterator. The callback function is called with the pwrdm_rwlock
- * held for reading, so no powerdomain structure manipulation
- * functions should be called from the callback, although hardware
- * powerdomain control functions are fine. Returns the last return
-@@ -215,18 +219,19 @@ struct powerdomain *pwrdm_lookup(const char *name)
- int pwrdm_for_each(int (*fn)(struct powerdomain *pwrdm))
- {
- struct powerdomain *temp_pwrdm;
-+ unsigned long flags;
- int ret = 0;
-
- if (!fn)
- return -EINVAL;
-
-- down_read(&pwrdm_rwsem);
-+ read_lock_irqsave(&pwrdm_rwlock, flags);
- list_for_each_entry(temp_pwrdm, &pwrdm_list, node) {
- ret = (*fn)(temp_pwrdm);
- if (ret)
- break;
- }
-- up_read(&pwrdm_rwsem);
-+ read_unlock_irqrestore(&pwrdm_rwlock, flags);
-
- return ret;
- }
-@@ -243,6 +248,7 @@ int pwrdm_for_each(int (*fn)(struct powerdomain *pwrdm))
- */
- int pwrdm_add_clkdm(struct powerdomain *pwrdm, struct clockdomain *clkdm)
- {
-+ unsigned long flags;
- int i;
- int ret = -EINVAL;
-
-@@ -252,7 +258,7 @@ int pwrdm_add_clkdm(struct powerdomain *pwrdm, struct clockdomain *clkdm)
- pr_debug("powerdomain: associating clockdomain %s with powerdomain "
- "%s\n", clkdm->name, pwrdm->name);
-
-- down_write(&pwrdm_rwsem);
-+ write_lock_irqsave(&pwrdm_rwlock, flags);
-
- for (i = 0; i < PWRDM_MAX_CLKDMS; i++) {
- if (!pwrdm->pwrdm_clkdms[i])
-@@ -278,7 +284,7 @@ int pwrdm_add_clkdm(struct powerdomain *pwrdm, struct clockdomain *clkdm)
- ret = 0;
-
- pac_exit:
-- up_write(&pwrdm_rwsem);
-+ write_unlock_irqrestore(&pwrdm_rwlock, flags);
-
- return ret;
- }
-@@ -295,6 +301,7 @@ pac_exit:
- */
- int pwrdm_del_clkdm(struct powerdomain *pwrdm, struct clockdomain *clkdm)
- {
-+ unsigned long flags;
- int ret = -EINVAL;
- int i;
-
-@@ -304,7 +311,7 @@ int pwrdm_del_clkdm(struct powerdomain *pwrdm, struct clockdomain *clkdm)
- pr_debug("powerdomain: dissociating clockdomain %s from powerdomain "
- "%s\n", clkdm->name, pwrdm->name);
-
-- down_write(&pwrdm_rwsem);
-+ write_lock_irqsave(&pwrdm_rwlock, flags);
-
- for (i = 0; i < PWRDM_MAX_CLKDMS; i++)
- if (pwrdm->pwrdm_clkdms[i] == clkdm)
-@@ -322,7 +329,7 @@ int pwrdm_del_clkdm(struct powerdomain *pwrdm, struct clockdomain *clkdm)
- ret = 0;
-
- pdc_exit:
-- up_write(&pwrdm_rwsem);
-+ write_unlock_irqrestore(&pwrdm_rwlock, flags);
-
- return ret;
- }
-@@ -335,7 +342,7 @@ pdc_exit:
- * Call the supplied function for each clockdomain in the powerdomain
- * 'pwrdm'. The callback function can return anything but 0 to bail
- * out early from the iterator. The callback function is called with
-- * the pwrdm_rwsem held for reading, so no powerdomain structure
-+ * the pwrdm_rwlock held for reading, so no powerdomain structure
- * manipulation functions should be called from the callback, although
- * hardware powerdomain control functions are fine. Returns -EINVAL
- * if presented with invalid pointers; or passes along the last return
-@@ -346,18 +353,19 @@ int pwrdm_for_each_clkdm(struct powerdomain *pwrdm,
- int (*fn)(struct powerdomain *pwrdm,
- struct clockdomain *clkdm))
- {
-+ unsigned long flags;
- int ret = 0;
- int i;
-
- if (!fn)
- return -EINVAL;
-
-- down_read(&pwrdm_rwsem);
-+ read_lock_irqsave(&pwrdm_rwlock, flags);
-
- for (i = 0; i < PWRDM_MAX_CLKDMS && !ret; i++)
- ret = (*fn)(pwrdm, pwrdm->pwrdm_clkdms[i]);
-
-- up_read(&pwrdm_rwsem);
-+ read_unlock_irqrestore(&pwrdm_rwlock, flags);
-
- return ret;
- }
---
-To unsubscribe from this list: send the line "unsubscribe linux-omap" in
-the body of a message to majordomo@vger.kernel.org
-More majordomo info at http://vger.kernel.org/majordomo-info.html
-
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 */
-
diff --git a/packages/linux/linux-omap2_git.bb b/packages/linux/linux-omap2_git.bb
index aaa3c4a6f5..356d26664a 100644
--- a/packages/linux/linux-omap2_git.bb
+++ b/packages/linux/linux-omap2_git.bb
@@ -5,7 +5,7 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-omap2-git/${MA
SRCREV = "74c89552b4a5f9b5b066f74fa265248f9b5d3f1d"
PV = "2.6.25+2.6.26-rc2+git${SRCREV}"
-PR = "r12"
+PR = "r13"
SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \
@@ -13,7 +13,8 @@ SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \
SRC_URI_append_beagleboard = " file://no-harry-potter.diff;patch=1 \
file://usb-timout.patch;patch=1 \
- file://l2-cache.patch;patch=1 \
+ file://l2-cache.patch;patch=1 \
+ file://0001-board-omap3beagle-fix-merge-damage-in-RTC-code.patch;patch=1 \
file://0001-omap3beagle-add-driver-to-turn-on-the-TFP410-framer.patch;patch=1 \
"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-20 18:10:44 +0000