[Angstrom-devel] [Review] SIMpad Kernel 2.6.24 connect-plus + new rtc-sa1100 patch
Bernhard Guillon
Bernhard.Guillon at opensimpad.org
Tue Mar 25 19:09:20 CET 2008
Hello,
please backport the connect-plus and the new rtc-sa1100 patch to
angstrom-stable branch. The rtc-sa1100 patch fixes a bug (4094) which
makes some SIMpads not to boot.
best regards
Bernhard Guillon
o -----------------------------------------------------------------
Revision: ead8fe4eb9f4a05e10d6ad072d127ba6aa6820f7
Ancestor: 557257ed260a028b08cdb8f9a859b3ea652317ee
Author: woglinde2 at openembedded.org
Date: 2008-03-25T17:30:23
Branch: org.openembedded.dev
Modified files:
packages/linux/linux-2.6.24/simpad/linux-2.6.24-SIMpad-rtc-sa1100.patch
packages/linux/linux_2.6.24.bb
ChangeLog:
linux-2.6.24: new rtc-sa1100 fixes for the simpad
* new rtc-sa1100 fix
* bump pr
* fixes bug 4094
============================================================
---
packages/linux/linux-2.6.24/simpad/linux-2.6.24-SIMpad-rtc-sa1100.patch
cb7ada70375fee5379806c648aaf22a17737b16d
+++
packages/linux/linux-2.6.24/simpad/linux-2.6.24-SIMpad-rtc-sa1100.patch
a001854cf3bea54c80b2dcd094dae117725419f5
@@ -1,28 +1,68 @@
-diff -Nur linux-2.6.24.vanilla/drivers/rtc/rtc-sa1100.c
linux-2.6.24/drivers/rtc/rtc-sa1100.c
+diff -Nur linux-2.6.24.vanilla/drivers/rtc/rtc-sa1100.c
linux-2.6.24_rtc/drivers/rtc/rtc-sa1100.c
--- linux-2.6.24.vanilla/drivers/rtc/rtc-sa1100.c 2008-01-24
23:58:37.000000000 +0100
-+++ linux-2.6.24/drivers/rtc/rtc-sa1100.c 2008-03-17
20:52:41.000000000 +0100
-@@ -15,6 +15,10 @@
- * Converted to the RTC subsystem and Driver Model
- * by Richard Purdie <rpurdie at rpsys.net>
- *
-+ * 2008/03/17 mrdata:
-+ * disable IRQ RTC1Hz and RTCAlrm before request_irq
-+ * in sa1100_rtc_open()
-+ *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
-@@ -154,7 +158,12 @@
- static int sa1100_rtc_open(struct device *dev)
++++ linux-2.6.24_rtc/drivers/rtc/rtc-sa1100.c 2008-03-24
13:49:40.000000000 +0100
+@@ -79,7 +79,10 @@
+
+ rtsr = RTSR;
+ /* clear interrupt sources */
+- RTSR = 0;
++ RTSR &= ~RTSR_HZE; //RTSR = 0; is not possible and does not work
++ RTSR &= ~RTSR_HZ;
++ RTSR &= ~RTSR_ALE;
++ RTSR &= ~RTSR_AL;
+ RTSR = (RTSR_AL | RTSR_HZ) & (rtsr >> 2);
+
+ /* clear alarm interrupt if it has occurred */
+@@ -155,6 +158,20 @@
{
int ret;
--
-+
+
++ /*
++ * On some devices RTSR is set to some value but it must be
set to 0.
++ * We have to set RTSR to 0 and OIER/OSSR to default. This
should not be
++ * necessary here but it is.
++ */
+ spin_lock_irq(&sa1100_rtc_lock);
+ RTSR &= ~RTSR_HZE;
++ RTSR &= ~RTSR_HZ;
+ RTSR &= ~RTSR_ALE;
++ RTSR &= ~RTSR_AL;
++ OIER &= ~OIER_E1;
++ OSSR = OSSR_M1;
+ spin_unlock_irq(&sa1100_rtc_lock);
-+
++
ret = request_irq(IRQ_RTC1Hz, sa1100_rtc_interrupt, IRQF_DISABLED,
"rtc 1Hz", dev);
if (ret) {
+@@ -186,7 +203,10 @@
+ static void sa1100_rtc_release(struct device *dev)
+ {
+ spin_lock_irq(&sa1100_rtc_lock);
+- RTSR = 0;
++ RTSR &= ~RTSR_HZE; //RTSR = 0; is not possible and does not work
++ RTSR &= ~RTSR_HZ;
++ RTSR &= ~RTSR_ALE;
++ RTSR &= ~RTSR_AL;
+ OIER &= ~OIER_E1;
+ OSSR = OSSR_M1;
+ spin_unlock_irq(&sa1100_rtc_lock);
+@@ -339,6 +359,19 @@
+
+ platform_set_drvdata(pdev, rtc);
+
++ /*
++ * On some devices RTSR is set to some value but it must be
set to 0.
++ * We have to set RTSR to 0 and OIER/OSSR to default.
++ */
++ spin_lock_irq(&sa1100_rtc_lock);
++ RTSR &= ~RTSR_HZE;
++ RTSR &= ~RTSR_HZ;
++ RTSR &= ~RTSR_ALE;
++ RTSR &= ~RTSR_AL;
++ OIER &= ~OIER_E1;
++ OSSR = OSSR_M1;
++ spin_unlock_irq(&sa1100_rtc_lock);
++
+ return 0;
+ }
+
============================================================
--- packages/linux/linux_2.6.24.bb
3a65f5f434a205d1dd49627ecc559afbd538e97d
+++ packages/linux/linux_2.6.24.bb
4eabbe972f1ffeca4ea26e4d897079e1542a5624
@@ -12,7 +12,7 @@ DEPENDS_append_mpc8313e-rdb = " dtc-nati
DEPENDS_append_mpc8313e-rdb = " dtc-native"
-PR = "r10"
+PR = "r11"
SRC_URI =
"${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \
http://kamikaze.waninkoko.info/patches/2.6.24/kamikaze1/broken-out/squashfs-lzma-2.6.24.patch;patch=1
\
o -----------------------------------------------------------------
| Revision: ad35118024f3b76889242bd536bd859675845efd
| Ancestor: 445245459c1a9926573d468811351e3f80f5bf38
| Author: koen at openembedded.org
| Date: 2008-03-21T15:43:34
| Branch: org.openembedded.dev
|
| Added files:
| packages/linux/linux/simpad/connectplus-remove-ide-HACK.patch
| Modified files:
| packages/linux/linux_2.6.24.bb
|
| ChangeLog:
|
| linux 2.6.24: apply connectplus hack for simpad, closes #4094
|
|
| ============================================================
| --- packages/linux/linux/simpad/connectplus-remove-ide-HACK.patch
8ffef06194b29e2b22abed7edb6044a5ad4316d7
| +++ packages/linux/linux/simpad/connectplus-remove-ide-HACK.patch
8ffef06194b29e2b22abed7edb6044a5ad4316d7
| @@ -0,0 +1,12 @@
| +Index: linux-2.6.13/drivers/ide/legacy/ide-cs.c
| +===================================================================
| +--- linux-2.6.13.orig/drivers/ide/legacy/ide-cs.c 2005-09-01
22:43:46.000000000 +0100
| ++++ linux-2.6.13/drivers/ide/legacy/ide-cs.c 2005-09-01
22:45:46.000000000 +0100
| +@@ -488,7 +488,6 @@
| + PCMCIA_DEVICE_PROD_ID123("KODAK Picture Card ", "KODAK
", "V100K", 0x94a0d8f3, 0xe4fc3ea0, 0xe5e7eed4),
| + PCMCIA_DEVICE_PROD_ID1("STI Flash", 0xe4a13209),
| + PCMCIA_DEVICE_PROD_ID12("STI", "Flash 5.0", 0xbf2df18d,
0x8cb57a0e),
| +- PCMCIA_MFC_DEVICE_PROD_ID12(1, "SanDisk", "ConnectPlus",
0x7a954bd9, 0x74be00c6),
| + PCMCIA_DEVICE_NULL,
| + };
| + MODULE_DEVICE_TABLE(pcmcia, ide_ids);
| ============================================================
| --- packages/linux/linux_2.6.24.bb
0b77562c24e62555c0952e5c6a0ebce85aaa1a43
| +++ packages/linux/linux_2.6.24.bb
fb4bd660e032d23e78af98449667e6bd6fdae950
| @@ -11,7 +11,7 @@ DEPENDS_append_mpc8313e-rdb = " dtc-nati
|
| DEPENDS_append_mpc8313e-rdb = " dtc-native"
|
| -PR = "r9"
| +PR = "r10"
|
| SRC_URI =
"${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \
|
http://kamikaze.waninkoko.info/patches/2.6.24/kamikaze1/broken-out/squashfs-lzma-2.6.24.patch;patch=1
\
| @@ -34,7 +34,8 @@ SRC_URI_append_simpad = "\
|
file://linux-2.6.24-SIMpad-hostap_cs-shared-irq.patch;patch=1 \
|
file://linux-2.6.24-SIMpad-orinoco_cs-shared-irq.patch;patch=1 \
| file://linux-2.6.24-SIMpad-rtc-sa1100.patch;patch=1 \
| - file://collie-kexec.patch;patch=1 \
| + file://connectplus-remove-ide-HACK.patch;patch=1 \
| + file://collie-kexec.patch;patch=1 \
| file://export_atags-r2.patch;patch=1 \
| "
|
best regards
Bernhard Guillon
More information about the Angstrom-distro-devel
mailing list