Send commitlog mailing list submissions to
commitlog@lists.openmoko.org
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:
1. r4826 - developers/werner/bin ([EMAIL PROTECTED])
2. r4827 - developers/werner/wlan-spi/patches-tracking
([EMAIL PROTECTED])
3. r4828 - developers/werner/wlan-spi/patches-tracking
([EMAIL PROTECTED])
4. Openmoko's OpenEmbedded repository. This is used to build the
Openmoko distribution: Changes to 'org.openmoko.dev'
([EMAIL PROTECTED])
--- Begin Message ---
Author: werner
Date: 2008-11-26 23:09:55 +0100 (Wed, 26 Nov 2008)
New Revision: 4826
Modified:
developers/werner/bin/lab4
Log:
Rearranging my desktop ... put console window on top. ttyACMx is on its
way out anyway.
Modified: developers/werner/bin/lab4
===================================================================
--- developers/werner/bin/lab4 2008-11-26 10:01:31 UTC (rev 4825)
+++ developers/werner/bin/lab4 2008-11-26 22:09:55 UTC (rev 4826)
@@ -19,10 +19,10 @@
'telnet localhost 4444' &
xterm -fn $FONT -geometry 80x48+551+3 -e bash-init \
"ssh $HOST" \
- 'neocon -t 30 /dev/ttyACM{0,1,2}' &
+ 'neocon /dev/ttyUSB{0,1,2}' &
xterm -fn $FONT -geometry 80x50+552-4 -e bash-init \
"ssh $HOST" \
- 'neocon /dev/ttyUSB{0,1,2}' &
+ 'neocon -t 30 /dev/ttyACM{0,1,2}' &
xterm -fn $FONT -geometry 80x40-93+114 -e bash-init \
'vi -R /home/moko/gta02/ENV' &
xterm -fn $FONT -geometry 80x40-86-38 -e bash-init \
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2008-11-27 00:36:24 +0100 (Thu, 27 Nov 2008)
New Revision: 4827
Modified:
developers/werner/wlan-spi/patches-tracking/experiment-s3cmci-suspend-softly.patch
Log:
Surprise, readl is not good at setting registers.
Also disable interrupts during surgery.
Modified:
developers/werner/wlan-spi/patches-tracking/experiment-s3cmci-suspend-softly.patch
===================================================================
---
developers/werner/wlan-spi/patches-tracking/experiment-s3cmci-suspend-softly.patch
2008-11-26 22:09:55 UTC (rev 4826)
+++
developers/werner/wlan-spi/patches-tracking/experiment-s3cmci-suspend-softly.patch
2008-11-26 23:36:24 UTC (rev 4827)
@@ -1,7 +1,7 @@
Index: ktrack/drivers/mmc/core/core.c
===================================================================
---- ktrack.orig/drivers/mmc/core/core.c 2008-11-24 22:52:14.000000000
-0200
-+++ ktrack/drivers/mmc/core/core.c 2008-11-24 22:53:53.000000000 -0200
+--- ktrack.orig/drivers/mmc/core/core.c 2008-11-25 12:02:47.000000000
-0200
++++ ktrack/drivers/mmc/core/core.c 2008-11-26 21:07:15.000000000 -0200
@@ -57,11 +57,13 @@
/*
* Internal function. Flush all scheduled work from the MMC work queue.
@@ -19,9 +19,9 @@
* @host: MMC host which completed request
Index: ktrack/drivers/mmc/host/s3cmci.c
===================================================================
---- ktrack.orig/drivers/mmc/host/s3cmci.c 2008-11-24 22:26:54.000000000
-0200
-+++ ktrack/drivers/mmc/host/s3cmci.c 2008-11-24 23:40:18.000000000 -0200
-@@ -1518,18 +1518,61 @@
+--- ktrack.orig/drivers/mmc/host/s3cmci.c 2008-11-26 20:04:23.000000000
-0200
++++ ktrack/drivers/mmc/host/s3cmci.c 2008-11-26 21:27:15.000000000 -0200
+@@ -1518,18 +1518,71 @@
#ifdef CONFIG_PM
@@ -32,31 +32,41 @@
+static int save_regs(struct mmc_host *mmc)
+{
+ struct s3cmci_host *host = mmc_priv(mmc);
++ unsigned long flags;
+ unsigned from;
+ u32 *to = host->saved;
+
+ mmc_flush_scheduled_work();
++
++ local_irq_save(flags);
+ for (from = S3C2410_SDICON; from != S3C2410_SDIIMSK+4; from += 4)
+ if (from != host->sdidata)
+ *to++ = readl(host->base + from);
+ BUG_ON(to-host->saved != ARRAY_SIZE(host->saved));
++ local_irq_restore(flags);
++
+ return 0;
+}
+
+/*
+ * @@@ This is what s3c24xx_hcd.c does, but I don't trust it one bit ...
++ * - clearn SDICMDCON
+ */
+
+static int restore_regs(struct mmc_host *mmc)
+{
+ struct s3cmci_host *host = mmc_priv(mmc);
++ unsigned long flags;
+ unsigned to;
+ u32 *from = host->saved;
+
++ local_irq_save(flags);
+ for (to = S3C2410_SDICON; to != S3C2410_SDIIMSK+4; to += 4)
+ if (to != host->sdidata)
-+ *from++ = readl(host->base + to);
++ writel(*from++, host->base + to);
+ BUG_ON(from-host->saved != ARRAY_SIZE(host->saved));
++ local_irq_restore(flags);
++
+ return 0;
+}
+
@@ -85,8 +95,8 @@
#else /* CONFIG_PM */
Index: ktrack/drivers/mmc/host/s3cmci.h
===================================================================
---- ktrack.orig/drivers/mmc/host/s3cmci.h 2008-11-24 22:41:54.000000000
-0200
-+++ ktrack/drivers/mmc/host/s3cmci.h 2008-11-24 23:37:06.000000000 -0200
+--- ktrack.orig/drivers/mmc/host/s3cmci.h 2008-11-25 12:02:47.000000000
-0200
++++ ktrack/drivers/mmc/host/s3cmci.h 2008-11-26 20:06:06.000000000 -0200
@@ -8,6 +8,9 @@
* published by the Free Software Foundation.
*/
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2008-11-27 01:04:06 +0100 (Thu, 27 Nov 2008)
New Revision: 4828
Modified:
developers/werner/wlan-spi/patches-tracking/experiment-s3cmci-suspend-softly.patch
Log:
Final backup before splitting it.
Modified:
developers/werner/wlan-spi/patches-tracking/experiment-s3cmci-suspend-softly.patch
===================================================================
---
developers/werner/wlan-spi/patches-tracking/experiment-s3cmci-suspend-softly.patch
2008-11-26 23:36:24 UTC (rev 4827)
+++
developers/werner/wlan-spi/patches-tracking/experiment-s3cmci-suspend-softly.patch
2008-11-27 00:04:06 UTC (rev 4828)
@@ -20,9 +20,17 @@
Index: ktrack/drivers/mmc/host/s3cmci.c
===================================================================
--- ktrack.orig/drivers/mmc/host/s3cmci.c 2008-11-26 20:04:23.000000000
-0200
-+++ ktrack/drivers/mmc/host/s3cmci.c 2008-11-26 21:27:15.000000000 -0200
-@@ -1518,18 +1518,71 @@
++++ ktrack/drivers/mmc/host/s3cmci.c 2008-11-26 22:03:17.000000000 -0200
+@@ -57,6 +57,7 @@
+ static const int dbgmap_debug = dbg_err | dbg_debug;
+ static int f_max = -1; /* override maximum frequency limit */
++static int persist = 0; /* keep interface active across suspend/resume */
+
+ #define dbg(host, channels, args...) \
+ do { \
+@@ -1518,18 +1519,65 @@
+
#ifdef CONFIG_PM
+
@@ -48,10 +56,6 @@
+ return 0;
+}
+
-+/*
-+ * @@@ This is what s3c24xx_hcd.c does, but I don't trust it one bit ...
-+ * - clearn SDICMDCON
-+ */
+
+static int restore_regs(struct mmc_host *mmc)
+{
@@ -60,6 +64,12 @@
+ unsigned to;
+ u32 *from = host->saved;
+
++ /*
++ * Before we begin with the necromancy, make sure we don't
++ * inadvertently start something we'll regret microseconds later.
++ */
++ from[S3C2410_SDICMDCON - S3C2410_SDICON] = 0;
++
+ local_irq_save(flags);
+ for (to = S3C2410_SDICON; to != S3C2410_SDIIMSK+4; to += 4)
+ if (to != host->sdidata)
@@ -74,29 +84,31 @@
{
struct mmc_host *mmc = platform_get_drvdata(dev);
-+#if 1
-+ return save_regs(mmc);
-+#else
- return mmc_suspend_host(mmc, state);
-+#endif
+- return mmc_suspend_host(mmc, state);
++ return persist ? save_regs(mmc) : mmc_suspend_host(mmc, state);
}
static int s3cmci_resume(struct platform_device *dev)
{
struct mmc_host *mmc = platform_get_drvdata(dev);
-+#if 1
-+ return restore_regs(mmc);
-+#else
- return mmc_resume_host(mmc);
-+#endif
+- return mmc_resume_host(mmc);
++ return persist ? restore_regs(mmc) : mmc_resume_host(mmc);
}
#else /* CONFIG_PM */
+@@ -1588,6 +1636,7 @@
+ module_exit(s3cmci_exit);
+
+ module_param(f_max, int, 0644);
++module_param(persist, int, 0644);
+
+ MODULE_DESCRIPTION("Samsung S3C MMC/SD Card Interface driver");
+ MODULE_LICENSE("GPL v2");
Index: ktrack/drivers/mmc/host/s3cmci.h
===================================================================
--- ktrack.orig/drivers/mmc/host/s3cmci.h 2008-11-25 12:02:47.000000000
-0200
-+++ ktrack/drivers/mmc/host/s3cmci.h 2008-11-26 20:06:06.000000000 -0200
++++ ktrack/drivers/mmc/host/s3cmci.h 2008-11-26 21:59:18.000000000 -0200
@@ -8,6 +8,9 @@
* published by the Free Software Foundation.
*/
@@ -114,7 +126,7 @@
+ /*
+ * Here's where we save the registers during suspend. Note that we skip
+ * SDIDATA, which is at different positions on 2410 and 2440, so
-+ *there's no "+1" in the array size.
++ * there's no "+1" in the array size.
+ */
+ u32 saved[(S3C2410_SDIIMSK-S3C2410_SDICON)/4];
+
--- End Message ---
--- Begin Message ---
conf/distro/include/sane-srcrevs.inc | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 6c07171823f36c3fbb15cc8acf081f9b5a2171b3
Author: John Lee <[EMAIL PROTECTED]>
Date: Thu Nov 27 14:22:22 2008 +0800
sane-srcrevs.inc: update to latest qtopia for #1610
commit 725254e8870250786634a94fd6cd29261d941707
Author: John Lee <[EMAIL PROTECTED]>
Date: Thu Nov 27 14:21:54 2008 +0800
sane-srcrevs.inc: update to the latest stable kernel
--- End Message ---
_______________________________________________
commitlog mailing list
commitlog@lists.openmoko.org
http://lists.openmoko.org/mailman/listinfo/commitlog
