summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-09-20 13:04:28 +0000
committerRichard Purdie <richard@openedhand.com>2006-09-20 13:04:28 +0000
commitcdb95170a553b5c367ccb26fb0f4a632ecfc0dcd (patch)
tree29daa1fb06d90352599dcf35ca5e5e79b57c0a6f
parent4fa2d11bb1fdb58ff426114169583672fc3d65b8 (diff)
downloadpoky-cdb95170a553b5c367ccb26fb0f4a632ecfc0dcd.tar.gz
linux-openzaurus-2.6.17: Sync with OE. Also add rootdelay=1 to kernel commandline for spitz
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@729 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat
-rw-r--r--meta/packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r2.patch42
-rw-r--r--meta/packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r3.patch31
-rw-r--r--meta/packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r4.patch48
-rw-r--r--meta/packages/linux/linux-openzaurus-2.6.17/orinoco-remove-all-which-are-in-hostap-HACK.patch88
-rw-r--r--meta/packages/linux/linux-openzaurus-2.6.17/wm97xx-lcdnoise-r0.patch208
-rw-r--r--meta/packages/linux/linux-openzaurus.inc7
-rw-r--r--meta/packages/linux/linux-openzaurus_2.6.17.bb21
7 files changed, 363 insertions, 82 deletions
diff --git a/meta/packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r2.patch b/meta/packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r2.patch
deleted file mode 100644
index 6f77d51dee..0000000000
--- a/meta/packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r2.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1
2The ident for Seagate 8GB microdrive is
3"SEAGATE", "ST1"
4hash 0x76dc4190, 0xcfba9599
5manfid 0x0111, 0x0000
6
7CF card:
8 product info: "SAMSUNG", "04/05/06", "", ""
9 manfid : 0x0000, 0x0000
10 function 4 (fixed disk)
11
12
13Signed-off-by: Marcin Juszkiewicz <openembedded@hrw.one.pl>
14
15 drivers/ide/legacy/ide-cs.c | 1 +
16 1 file changed, 1 insertion(+)
17
18Index: linux-2.6.16/drivers/ide/legacy/ide-cs.c
19===================================================================
20--- linux-2.6.16.orig/drivers/ide/legacy/ide-cs.c 2006-04-20 12:41:41.000000000 +0200
21+++ linux-2.6.16/drivers/ide/legacy/ide-cs.c 2006-04-20 12:45:19.640621552 +0200
22@@ -444,6 +444,8 @@
23 PCMCIA_DEVICE_PROD_ID12("PCMCIA", "CD-ROM", 0x281f1c5d, 0x66536591),
24 PCMCIA_DEVICE_PROD_ID12("PCMCIA", "PnPIDE", 0x281f1c5d, 0x0c694728),
25 PCMCIA_DEVICE_PROD_ID12("SHUTTLE TECHNOLOGY LTD.", "PCCARD-IDE/ATAPI Adapter", 0x4a3f0ba0, 0x322560e1),
26+ PCMCIA_DEVICE_PROD_ID12("SEAGATE", "ST1", 0x87c1b330, 0xe1f30883), /* Seagate 8GB microdrive */
27+ PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "04/05/06", 0x43d74cb4, 0x6a22777d),
28 PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003),
29 PCMCIA_DEVICE_PROD_ID1("TRANSCEND 512M ", 0xd0909443),
30 PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852),
31
32
33-------------------------------------------------------------------------
34With pcmcia-cs -> pcmciautils change some cards which was working with
35hostap driver now are bound into orinoco driver.
36
37This patch made them bound into hostap like it was before.
38
39Signed-off-by: Marcin Juszkiewicz <openembedded@hrw.one.pl>
40
41// will add some here
42
diff --git a/meta/packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r3.patch b/meta/packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r3.patch
deleted file mode 100644
index b27fd09068..0000000000
--- a/meta/packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r3.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1
2The ident for Seagate 8GB microdrive is
3"SEAGATE", "ST1"
4hash 0x76dc4190, 0xcfba9599
5manfid 0x0111, 0x0000
6
7CF card:
8 product info: "SAMSUNG", "04/05/06", "", ""
9 manfid : 0x0000, 0x0000
10 function 4 (fixed disk)
11
12
13Signed-off-by: Marcin Juszkiewicz <openembedded@hrw.one.pl>
14
15 drivers/ide/legacy/ide-cs.c | 1 +
16 1 file changed, 1 insertion(+)
17
18Index: linux-2.6.17/drivers/ide/legacy/ide-cs.c
19===================================================================
20--- linux-2.6.17.orig/drivers/ide/legacy/ide-cs.c 2006-06-18 03:49:35.000000000 +0200
21+++ linux-2.6.17/drivers/ide/legacy/ide-cs.c 2006-07-10 23:29:28.696446000 +0200
22@@ -402,6 +402,9 @@
23 PCMCIA_DEVICE_PROD_ID12("PCMCIA", "CD-ROM", 0x281f1c5d, 0x66536591),
24 PCMCIA_DEVICE_PROD_ID12("PCMCIA", "PnPIDE", 0x281f1c5d, 0x0c694728),
25 PCMCIA_DEVICE_PROD_ID12("SHUTTLE TECHNOLOGY LTD.", "PCCARD-IDE/ATAPI Adapter", 0x4a3f0ba0, 0x322560e1),
26+ PCMCIA_DEVICE_PROD_ID12("SEAGATE", "ST1", 0x87c1b330, 0xe1f30883), /* Seagate 8GB microdrive */
27+ PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "04/05/06", 0x43d74cb4, 0x6a22777d),
28+ PCMCIA_DEVICE_PROD_ID12("SMI VENDOR", "SMI PRODUCT", 0x30896c92, 0x703cc5f6),
29 PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003),
30 PCMCIA_DEVICE_PROD_ID1("TRANSCEND 512M ", 0xd0909443),
31 PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852),
diff --git a/meta/packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r4.patch b/meta/packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r4.patch
new file mode 100644
index 0000000000..5e3a5eaa20
--- /dev/null
+++ b/meta/packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r4.patch
@@ -0,0 +1,48 @@
1From: Marcin Juszkiewicz <openembedded@hrw.one.pl>
2
3Few cards informations submitted by OpenZaurus users.
4
5Seagate 8GB microdrive:
6 product info: "SEAGATE", "ST1"
7 manfid 0x0111, 0x0000
8
9One CF card:
10 product info: "SAMSUNG", "04/05/06", "", ""
11 manfid : 0x0000, 0x0000
12
13Ridata 8GB Pro 150X Compact Flash Card:
14 product info: "SMI VENDOR", "SMI PRODUCT", ""
15 manfid: 0x000a, 0x0000
16
17 product info: "M-Systems", "CF500", ""
18 manfid: 0x000a, 0x0000
19
20Signed-off-by: Marcin Juszkiewicz <openembedded@hrw.one.pl>
21
22---
23Patch follow kernel version 2.6.17
24
25Please Cc: me - I'm not subscribed to linux-pcmcia or linux-kernel
26
27 ide-cs.c | 4 ++++
28 1 file changed, 4 insertions(+)
29
30Index: linux/drivers/ide/legacy/ide-cs.c
31===================================================================
32--- linux.orig/drivers/ide/legacy/ide-cs.c 2006-07-10 23:25:59.479162976 +0200
33+++ linux/drivers/ide/legacy/ide-cs.c 2006-08-02 23:02:22.997684384 +0200
34@@ -398,10 +398,14 @@
35 PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDE", 0x547e66dc, 0x5c5ab149),
36 PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDEII", 0x547e66dc, 0xb3662674),
37 PCMCIA_DEVICE_PROD_ID12("LOOKMEET", "CBIDE2 ", 0xe37be2b5, 0x8671043b),
38+ PCMCIA_DEVICE_PROD_ID12("M-Systems", "CF500", 0x7ed2ad87, 0x7a13045c),
39 PCMCIA_DEVICE_PROD_ID2("NinjaATA-", 0xebe0bd79),
40 PCMCIA_DEVICE_PROD_ID12("PCMCIA", "CD-ROM", 0x281f1c5d, 0x66536591),
41 PCMCIA_DEVICE_PROD_ID12("PCMCIA", "PnPIDE", 0x281f1c5d, 0x0c694728),
42 PCMCIA_DEVICE_PROD_ID12("SHUTTLE TECHNOLOGY LTD.", "PCCARD-IDE/ATAPI Adapter", 0x4a3f0ba0, 0x322560e1),
43+ PCMCIA_DEVICE_PROD_ID12("SEAGATE", "ST1", 0x87c1b330, 0xe1f30883),
44+ PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "04/05/06", 0x43d74cb4, 0x6a22777d),
45+ PCMCIA_DEVICE_PROD_ID12("SMI VENDOR", "SMI PRODUCT", 0x30896c92, 0x703cc5f6),
46 PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003),
47 PCMCIA_DEVICE_PROD_ID1("TRANSCEND 512M ", 0xd0909443),
48 PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852),
diff --git a/meta/packages/linux/linux-openzaurus-2.6.17/orinoco-remove-all-which-are-in-hostap-HACK.patch b/meta/packages/linux/linux-openzaurus-2.6.17/orinoco-remove-all-which-are-in-hostap-HACK.patch
new file mode 100644
index 0000000000..380349f809
--- /dev/null
+++ b/meta/packages/linux/linux-openzaurus-2.6.17/orinoco-remove-all-which-are-in-hostap-HACK.patch
@@ -0,0 +1,88 @@
1This patch should resolve problem when people get eth0 (orinoco_cs) instead of wlan0 (hostap_cs)
2with their WiFi cards.
3
4Patch will NEVER been accepted upstream.
5
6Signed-off-by: Marcin Juszkiewicz <openembedded@hrw.one.pl>
7
8Index: linux/drivers/net/wireless/orinoco_cs.c
9===================================================================
10--- linux.orig/drivers/net/wireless/orinoco_cs.c 2006-08-23 16:04:10.000000000 +0200
11+++ linux/drivers/net/wireless/orinoco_cs.c 2006-08-23 16:17:43.000000000 +0200
12@@ -453,33 +453,21 @@
13 "Pavel Roskin <proski@gnu.org>, et al)";
14
15 static struct pcmcia_device_id orinoco_cs_ids[] = {
16- PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7100), /* SonicWALL Long Range Wireless Card */
17- PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7300), /* Sohoware NCP110, Philips 802.11b */
18 PCMCIA_DEVICE_MANF_CARD(0x0089, 0x0002), /* AnyPoint(TM) Wireless II PC Card */
19- PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0777), /* 3Com AirConnect PCI 777A */
20- PCMCIA_DEVICE_MANF_CARD(0x0126, 0x8000), /* PROXIM RangeLAN-DS/LAN PC CARD */
21 PCMCIA_DEVICE_MANF_CARD(0x0138, 0x0002), /* Compaq WL100 11 Mbps Wireless Adapter */
22 PCMCIA_DEVICE_MANF_CARD(0x0156, 0x0002), /* Lucent Orinoco and old Intersil */
23 PCMCIA_DEVICE_MANF_CARD(0x016b, 0x0001), /* Ericsson WLAN Card C11 */
24 PCMCIA_DEVICE_MANF_CARD(0x01eb, 0x080a), /* Nortel Networks eMobility 802.11 Wireless Adapter */
25 PCMCIA_DEVICE_MANF_CARD(0x01ff, 0x0008), /* Intermec MobileLAN 11Mbps 802.11b WLAN Card */
26- PCMCIA_DEVICE_MANF_CARD(0x0250, 0x0002), /* Samsung SWL2000-N 11Mb/s WLAN Card */
27 PCMCIA_DEVICE_MANF_CARD(0x0261, 0x0002), /* AirWay 802.11 Adapter (PCMCIA) */
28 PCMCIA_DEVICE_MANF_CARD(0x0268, 0x0001), /* ARtem Onair */
29 PCMCIA_DEVICE_MANF_CARD(0x026f, 0x0305), /* Buffalo WLI-PCM-S11 */
30- PCMCIA_DEVICE_MANF_CARD(0x0274, 0x1612), /* Linksys WPC11 Version 2.5 */
31- PCMCIA_DEVICE_MANF_CARD(0x0274, 0x1613), /* Linksys WPC11 Version 3 */
32- PCMCIA_DEVICE_MANF_CARD(0x028a, 0x0002), /* Compaq HNW-100 11 Mbps Wireless Adapter */
33 PCMCIA_DEVICE_MANF_CARD(0x028a, 0x0673), /* Linksys WCF12 Wireless CompactFlash Card */
34- PCMCIA_DEVICE_MANF_CARD(0x02aa, 0x0002), /* ASUS SpaceLink WL-100 */
35 PCMCIA_DEVICE_MANF_CARD(0x02ac, 0x0002), /* SpeedStream SS1021 Wireless Adapter */
36 PCMCIA_DEVICE_MANF_CARD(0x14ea, 0xb001), /* PLANEX RoadLannerWave GW-NS11H */
37- PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x7300), /* Airvast WN-100 */
38 PCMCIA_DEVICE_MANF_CARD(0x9005, 0x0021), /* Adaptec Ultra Wireless ANW-8030 */
39 PCMCIA_DEVICE_MANF_CARD(0xc001, 0x0008), /* CONTEC FLEXSCAN/FX-DDS110-PCC */
40 PCMCIA_DEVICE_MANF_CARD(0xc250, 0x0002), /* Conceptronic CON11Cpro, EMTAC A2424i */
41- PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0002), /* Safeway 802.11b, ZCOMAX AirRunner/XI-300 */
42- PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0005), /* D-Link DCF660, Sandisk Connect SDWCFB-000 */
43 PCMCIA_DEVICE_PROD_ID12(" ", "IEEE 802.11 Wireless LAN/PC Card", 0x3b6e20c8, 0xefccafe9),
44 PCMCIA_DEVICE_PROD_ID12("3Com", "3CRWE737A AirConnect Wireless LAN PC Card", 0x41240e5b, 0x56010af3),
45 PCMCIA_DEVICE_PROD_ID12("ACTIONTEC", "PRISM Wireless LAN PC Card", 0x393089da, 0xa71e69d5),
46@@ -487,31 +475,25 @@
47 PCMCIA_DEVICE_PROD_ID123("AIRVAST", "IEEE 802.11b Wireless PCMCIA Card", "HFA3863", 0xea569531, 0x4bcb9645, 0x355cb092),
48 PCMCIA_DEVICE_PROD_ID12("Allied Telesyn", "AT-WCL452 Wireless PCMCIA Radio", 0x5cd01705, 0x4271660f),
49 PCMCIA_DEVICE_PROD_ID12("ASUS", "802_11b_PC_CARD_25", 0x78fc06ee, 0xdb9aa842),
50- PCMCIA_DEVICE_PROD_ID12("ASUS", "802_11B_CF_CARD_25", 0x78fc06ee, 0x45a50c1e),
51 PCMCIA_DEVICE_PROD_ID12("Avaya Communication", "Avaya Wireless PC Card", 0xd8a43b78, 0x0d341169),
52 PCMCIA_DEVICE_PROD_ID12("BENQ", "AWL100 PCMCIA ADAPTER", 0x35dadc74, 0x01f7fedb),
53 PCMCIA_DEVICE_PROD_ID12("BUFFALO", "WLI-PCM-L11G", 0x2decece3, 0xf57ca4b3),
54- PCMCIA_DEVICE_PROD_ID12("BUFFALO", "WLI-CF-S11G", 0x2decece3, 0x82067c18),
55 PCMCIA_DEVICE_PROD_ID12("Cabletron", "RoamAbout 802.11 DS", 0x32d445f5, 0xedeffd90),
56- PCMCIA_DEVICE_PROD_ID12("Compaq", "WL200_11Mbps_Wireless_PCI_Card", 0x54f7c49c, 0x15a75e5b),
57 PCMCIA_DEVICE_PROD_ID123("corega", "WL PCCL-11", "ISL37300P", 0x0a21501a, 0x59868926, 0xc9049a39),
58 PCMCIA_DEVICE_PROD_ID12("corega K.K.", "Wireless LAN PCC-11", 0x5261440f, 0xa6405584),
59 PCMCIA_DEVICE_PROD_ID12("corega K.K.", "Wireless LAN PCCA-11", 0x5261440f, 0xdf6115f9),
60 PCMCIA_DEVICE_PROD_ID12("corega_K.K.", "Wireless_LAN_PCCB-11", 0x29e33311, 0xee7a27ae),
61 PCMCIA_DEVICE_PROD_ID12("D", "Link DRC-650 11Mbps WLAN Card", 0x71b18589, 0xf144e3ac),
62- PCMCIA_DEVICE_PROD_ID12("D", "Link DWL-650 11Mbps WLAN Card", 0x71b18589, 0xb6f1b0ab),
63 PCMCIA_DEVICE_PROD_ID12("D-Link Corporation", "D-Link DWL-650H 11Mbps WLAN Adapter", 0xef544d24, 0xcd8ea916),
64 PCMCIA_DEVICE_PROD_ID12("Digital Data Communications", "WPC-0100", 0xfdd73470, 0xe0b6f146),
65 PCMCIA_DEVICE_PROD_ID12("ELSA", "AirLancer MC-11", 0x4507a33a, 0xef54f0e3),
66 PCMCIA_DEVICE_PROD_ID12("HyperLink", "Wireless PC Card 11Mbps", 0x56cc3f1a, 0x0bcf220c),
67 PCMCIA_DEVICE_PROD_ID123("Instant Wireless ", " Network PC CARD", "Version 01.02", 0x11d901af, 0x6e9bd926, 0x4b74baa0),
68 PCMCIA_DEVICE_PROD_ID12("Intel", "PRO/Wireless 2011 LAN PC Card", 0x816cc815, 0x07f58077),
69- PCMCIA_DEVICE_PROD_ID12("INTERSIL", "HFA384x/IEEE", 0x74c5e40d, 0xdb472a18),
70 PCMCIA_DEVICE_PROD_ID12("INTERSIL", "I-GATE 11M PC Card / PC Card plus", 0x74c5e40d, 0x8304ff77),
71 PCMCIA_DEVICE_PROD_ID12("Intersil", "PRISM 2_5 PCMCIA ADAPTER", 0x4b801a17, 0x6345a0bf),
72 PCMCIA_DEVICE_PROD_ID123("Intersil", "PRISM Freedom PCMCIA Adapter", "ISL37100P", 0x4b801a17, 0xf222ec2d, 0x630d52b2),
73 PCMCIA_DEVICE_PROD_ID12("LeArtery", "SYNCBYAIR 11Mbps Wireless LAN PC Card", 0x7e3b326a, 0x49893e92),
74- PCMCIA_DEVICE_PROD_ID12("Linksys", "Wireless CompactFlash Card", 0x0733cc81, 0x0c52f395),
75 PCMCIA_DEVICE_PROD_ID12("Lucent Technologies", "WaveLAN/IEEE", 0x23eb9949, 0xc562e72a),
76 PCMCIA_DEVICE_PROD_ID12("MELCO", "WLI-PCM-L11", 0x481e0094, 0x7360e410),
77 PCMCIA_DEVICE_PROD_ID12("MELCO", "WLI-PCM-L11G", 0x481e0094, 0xf57ca4b3),
78@@ -529,10 +511,8 @@
79 PCMCIA_DEVICE_PROD_ID12("PROXIM", "LAN PCI CARD HARMONY 80211B", 0xc6536a5e, 0x9f494e26),
80 PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "11Mbps WLAN Card", 0x43d74cb4, 0x579bd91b),
81 PCMCIA_DEVICE_PROD_ID12("SMC", "SMC2532W-B EliteConnect Wireless Adapter", 0xc4f8b18b, 0x196bd757),
82- PCMCIA_DEVICE_PROD_ID12("SMC", "SMC2632W", 0xc4f8b18b, 0x474a1f2a),
83 PCMCIA_DEVICE_PROD_ID12("Symbol Technologies", "LA4111 Spectrum24 Wireless LAN PC Card", 0x3f02b4d6, 0x3663cb0e),
84 PCMCIA_DEVICE_PROD_ID123("The Linksys Group, Inc.", "Instant Wireless Network PC Card", "ISL37300P", 0xa5f472c2, 0x590eb502, 0xc9049a39),
85- PCMCIA_DEVICE_PROD_ID12("ZoomAir 11Mbps High", "Rate wireless Networking", 0x273fe3db, 0x32a1eaee),
86 PCMCIA_DEVICE_NULL,
87 };
88 MODULE_DEVICE_TABLE(pcmcia, orinoco_cs_ids);
diff --git a/meta/packages/linux/linux-openzaurus-2.6.17/wm97xx-lcdnoise-r0.patch b/meta/packages/linux/linux-openzaurus-2.6.17/wm97xx-lcdnoise-r0.patch
new file mode 100644
index 0000000000..191de3af22
--- /dev/null
+++ b/meta/packages/linux/linux-openzaurus-2.6.17/wm97xx-lcdnoise-r0.patch
@@ -0,0 +1,208 @@
1Index: linux-tosa/drivers/input/touchscreen/wm9712.c
2===================================================================
3--- linux-tosa.orig/drivers/input/touchscreen/wm9712.c 2006-08-29 16:52:36.008543280 +0100
4+++ linux-tosa/drivers/input/touchscreen/wm9712.c 2006-08-29 16:52:50.923275896 +0100
5@@ -1,7 +1,7 @@
6 /*
7 * wm9712.c -- Codec driver for Wolfson WM9712 AC97 Codecs.
8 *
9- * Copyright 2003, 2004, 2005 Wolfson Microelectronics PLC.
10+ * Copyright 2003, 2004, 2005, 2006 Wolfson Microelectronics PLC.
11 * Author: Liam Girdwood
12 * liam.girdwood@wolfsonmicro.com or linux@wolfsonmicro.com
13 * Parts Copyright : Ian Molton <spyro@f2s.com>
14@@ -13,6 +13,12 @@
15 * Free Software Foundation; either version 2 of the License, or (at your
16 * option) any later version.
17 *
18+ * Revision history
19+ * 4th Jul 2005 Initial version.
20+ * 29th Aug 2006 Mike Arthur <mike@mikearthur.co.uk>
21+ * Added fixes for Sharp SL-6000 (Tosa) LCD noise causing
22+ * touchscreen interference.
23+ *
24 */
25
26 #include <linux/module.h>
27@@ -28,6 +34,10 @@
28 #define WM9705_VERSION "0.60"
29 #define DEFAULT_PRESSURE 0xb0c0
30
31+#define CCNT(a) asm volatile ("mrc p14, 0, %0, C1, C1, 0" : "=r"(a))
32+#define CCNT_ON() asm("mcr p14, 0, %0, C0, C0, 0" : : "r"(1))
33+#define CCNT_OFF() asm("mcr p14, 0, %0, C0, C0, 0" : : "r"(1))
34+
35 /*
36 * Debug
37 */
38@@ -243,6 +253,36 @@
39 return wm->dig[2] & WM9712_PDEN;
40 }
41
42+
43+#ifdef CONFIG_MACH_TOSA
44+/* On the Sharp SL-6000 (Tosa), due to a noisy LCD, we need to perform a wait
45+ * before sampling the Y axis of the touchscreen */
46+static inline void wm9712_lcd_sync_on(struct wm97xx* wm, int adcsel) {
47+ unsigned long timer1 = 0, timer2 = 0, wait_time = 0;
48+ if (adcsel == WM97XX_ADCSEL_Y) {
49+ wait_time = wm97xx_calc_lcd_waittime(wm);
50+
51+ CCNT_ON();
52+
53+ if (wait_time) {
54+ /* wait for LCD rising edge */
55+ wm_machinfo->wait_hsync();
56+ /* get clock */
57+ CCNT(timer1);
58+ CCNT(timer2);
59+
60+ while ((timer2 - timer1) < wait_time) {
61+ CCNT(timer2);
62+ }
63+ }
64+ }
65+}
66+
67+static inline void wm9712_lcd_sync_off(void) {
68+ CCNT_OFF();
69+}
70+#endif
71+
72 /*
73 * Read a sample from the WM9712 adc in polling mode.
74 */
75@@ -260,6 +300,9 @@
76 /* set up digitiser */
77 if (adcsel & 0x8000)
78 adcsel = ((adcsel & 0x7fff) + 3) << 12;
79+ #ifdef CONFIG_MACH_TOSA
80+ wm9712_lcd_sync_on(wm, adcsel);
81+ #endif
82 wm97xx_reg_write(wm, AC97_WM97XX_DIGITISER1, adcsel | WM97XX_POLL | WM97XX_DELAY(delay));
83
84 /* wait 3 AC97 time slots + delay for conversion */
85@@ -282,6 +325,10 @@
86
87 *sample = wm97xx_reg_read(wm, AC97_WM97XX_DIGITISER_RD);
88
89+ #ifdef CONFIG_MACH_TOSA
90+ wm9712_lcd_sync_off();
91+ #endif
92+
93 /* check we have correct sample */
94 if ((*sample & WM97XX_ADCSEL_MASK) != adcsel) {
95 dbg ("adc wrong sample, read %x got %x", adcsel,
96@@ -303,11 +350,12 @@
97 static int wm9712_poll_touch(struct wm97xx* wm, struct wm97xx_data *data)
98 {
99 int rc;
100-
101 if ((rc = wm9712_poll_sample(wm, WM97XX_ADCSEL_X, &data->x)) != RC_VALID)
102 return rc;
103+
104 if ((rc = wm9712_poll_sample(wm, WM97XX_ADCSEL_Y, &data->y)) != RC_VALID)
105 return rc;
106+
107 if (pil && !five_wire) {
108 if ((rc = wm9712_poll_sample(wm, WM97XX_ADCSEL_PRES, &data->p)) != RC_VALID)
109 return rc;
110Index: linux-tosa/drivers/input/touchscreen/wm97xx-core.c
111===================================================================
112--- linux-tosa.orig/drivers/input/touchscreen/wm97xx-core.c 2006-08-29 16:52:36.008543280 +0100
113+++ linux-tosa/drivers/input/touchscreen/wm97xx-core.c 2006-08-29 16:52:50.924275744 +0100
114@@ -2,7 +2,7 @@
115 * wm97xx-core.c -- Touch screen driver core for Wolfson WM9705, WM9712
116 * and WM9713 AC97 Codecs.
117 *
118- * Copyright 2003, 2004, 2005 Wolfson Microelectronics PLC.
119+ * Copyright 2003, 2004, 2005, 2006 Wolfson Microelectronics PLC.
120 * Author: Liam Girdwood
121 * liam.girdwood@wolfsonmicro.com or linux@wolfsonmicro.com
122 * Parts Copyright : Ian Molton <spyro@f2s.com>
123@@ -67,6 +67,9 @@
124 * GPIOs) and 2.6 power management.
125 * 29th Nov 2004 Added WM9713 support.
126 * 4th Jul 2005 Moved codec specific code out to seperate files.
127+ * 29th Aug 2006 Mike Arthur <mike@mikearthur.co.uk>
128+ * Added fixes for Sharp SL-6000 (Tosa) LCD noise causing
129+ * touchscreen interference.
130 */
131
132 #include <linux/module.h>
133@@ -94,6 +97,7 @@
134 static DECLARE_MUTEX(gpio_sem);
135 static LIST_HEAD(wm97xx_misc_list);
136 static struct wm97xx* wm_codec = NULL;
137+struct wm97xx_machinfo *wm_machinfo;
138
139 /*
140 * WM97xx - enable/disable AUX ADC sysfs
141@@ -832,6 +836,23 @@
142 mdev->remove(wm_codec);
143 }
144
145+#ifdef CONFIG_MACH_TOSA
146+/* On the Sharp SL-6000 (Tosa), due to a noisy LCD, we need to perform a wait
147+ * before sampling the Y axis of the touchscreen */
148+unsigned long wm97xx_calc_lcd_waittime(struct wm97xx *wm) {
149+ unsigned long hsync_time = wm_machinfo->get_hsync_time();
150+ return hsync_time;
151+}
152+
153+void wm97xx_set_machinfo(struct wm97xx_machinfo *machinfo) {
154+ wm_machinfo = machinfo;
155+}
156+
157+void wm97xx_unset_machinfo() {
158+ wm_machinfo = NULL;
159+}
160+#endif
161+
162 static struct device_driver wm97xx_driver = {
163 .name = "ac97",
164 .bus = &ac97_bus_type,
165@@ -861,6 +882,9 @@
166 EXPORT_SYMBOL_GPL(wm97xx_reg_write);
167 EXPORT_SYMBOL_GPL(wm97xx_register_misc_dev);
168 EXPORT_SYMBOL_GPL(wm97xx_unregister_misc_dev);
169+EXPORT_SYMBOL_GPL(wm97xx_calc_lcd_waittime);
170+EXPORT_SYMBOL_GPL(wm97xx_set_machinfo);
171+EXPORT_SYMBOL_GPL(wm97xx_unset_machinfo);
172
173 module_init(wm97xx_init);
174 module_exit(wm97xx_exit);
175Index: linux-tosa/include/linux/wm97xx.h
176===================================================================
177--- linux-tosa.orig/include/linux/wm97xx.h 2006-08-29 16:52:36.008543280 +0100
178+++ linux-tosa/include/linux/wm97xx.h 2006-08-29 16:52:50.924275744 +0100
179@@ -207,6 +207,7 @@
180
181 struct wm97xx;
182 extern struct wm97xx_codec_drv wm97xx_codec;
183+extern struct wm97xx_machinfo *wm_machinfo;
184
185 /*
186 * Codec driver interface - allows mapping to WM9705/12/13 and newer codecs
187@@ -253,6 +254,11 @@
188 struct list_head list;
189 };
190
191+struct wm97xx_machinfo {
192+ unsigned long (*get_hsync_time)(void);
193+ void (*wait_hsync)(void);
194+};
195+
196 int wm97xx_register_misc_dev(struct wm97xx_misc_dev* mdev);
197 void wm97xx_unregister_misc_dev(struct wm97xx_misc_dev* mdev);
198
199@@ -281,4 +287,9 @@
200 int wm97xx_acc_startup(struct wm97xx* wm);
201 void wm97xx_acc_shutdown(struct wm97xx* wm);
202
203+
204+unsigned long wm97xx_calc_lcd_waittime(struct wm97xx *wm);
205+void wm97xx_set_machinfo(struct wm97xx_machinfo *machinfo);
206+void wm97xx_unset_machinfo(void);
207+
208 #endif
diff --git a/meta/packages/linux/linux-openzaurus.inc b/meta/packages/linux/linux-openzaurus.inc
index ce1e2270b6..532b35b748 100644
--- a/meta/packages/linux/linux-openzaurus.inc
+++ b/meta/packages/linux/linux-openzaurus.inc
@@ -28,7 +28,7 @@ KERNEL_IMAGETYPE_qemux86 = "bzImage"
28 28
29CMDLINE_CON = "console=ttyS0,115200n8 console=tty1 noinitrd" 29CMDLINE_CON = "console=ttyS0,115200n8 console=tty1 noinitrd"
30CMDLINE_ROOT = "root=/dev/mtdblock2 rootfstype=jffs2" 30CMDLINE_ROOT = "root=/dev/mtdblock2 rootfstype=jffs2"
31CMDLINE_ROOT_spitz = "root=/dev/hda1 rootfstype=ext3 rw" 31CMDLINE_ROOT_spitz = "root=/dev/hda1 rootfstype=ext3 rootdelay=1 rw"
32CMDLINE_OTHER = "dyntick=enable" 32CMDLINE_OTHER = "dyntick=enable"
33CMDLINE_DEBUG = '${@base_conditional("DISTRO_TYPE", "release", "quiet", "debug",d)}' 33CMDLINE_DEBUG = '${@base_conditional("DISTRO_TYPE", "release", "quiet", "debug",d)}'
34 34
@@ -53,6 +53,7 @@ ENABLE_ELPP = ${@bb.data.getVar("OZ_KERNEL_ENABLE_ELPP",d,1) or "no"}
53############################################################### 53###############################################################
54# module configs specific to this kernel 54# module configs specific to this kernel
55# 55#
56module_autoload_ohci-hcd_tosa = "ohci-hcd"
56module_autoload_pxaficp_ir = "pxaficp_ir" 57module_autoload_pxaficp_ir = "pxaficp_ir"
57module_autoload_snd-pcm-oss = "snd-pcm-oss" 58module_autoload_snd-pcm-oss = "snd-pcm-oss"
58module_autoload_snd-soc-corgi_c7x0 = "snd-soc-corgi" 59module_autoload_snd-soc-corgi_c7x0 = "snd-soc-corgi"
@@ -201,3 +202,7 @@ do_deploy() {
201do_deploy[dirs] = "${S}" 202do_deploy[dirs] = "${S}"
202 203
203addtask deploy before do_package after do_install 204addtask deploy before do_package after do_install
205
206# wlan-ng stuff need compiled kernel sources
207do_rm_work() {
208}
diff --git a/meta/packages/linux/linux-openzaurus_2.6.17.bb b/meta/packages/linux/linux-openzaurus_2.6.17.bb
index 8cc7517a8f..f5460ae54f 100644
--- a/meta/packages/linux/linux-openzaurus_2.6.17.bb
+++ b/meta/packages/linux/linux-openzaurus_2.6.17.bb
@@ -1,6 +1,6 @@
1require linux-openzaurus.inc 1require linux-openzaurus.inc
2 2
3PR = "r15" 3PR = "r27"
4 4
5# Handy URLs 5# Handy URLs
6# git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \ 6# git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \
@@ -25,10 +25,11 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \
25 ${RPSRC}/logo_rotate_fix-r1.patch;patch=1;status=merged \ 25 ${RPSRC}/logo_rotate_fix-r1.patch;patch=1;status=merged \
26 ${RPSRC}/collie_frontlight-r6.patch;patch=1;status=merged \ 26 ${RPSRC}/collie_frontlight-r6.patch;patch=1;status=merged \
27 ${RPSRC}/input_modalias_fix-r0.patch;patch=1;status=merged \ 27 ${RPSRC}/input_modalias_fix-r0.patch;patch=1;status=merged \
28 ${RPSRC}/spectrumcs_fix-r0.patch;patch=1 \
28 file://00-hostap.patch;patch=1;status=merged \ 29 file://00-hostap.patch;patch=1;status=merged \
29 file://10-pcnet.patch;patch=1;status=merged \ 30 file://10-pcnet.patch;patch=1;status=merged \
30 ${RPSRC}/asoc-v0.11pre5-oz.patch;patch=1 \ 31 ${RPSRC}/alsa/asoc-v0.11.5.patch;patch=1 \
31 ${RPSRC}/asoc_fixes2-r2.patch;patch=1 \ 32 ${RPSRC}/asoc_makefile-r0.patch;patch=1 \
32 ${RPSRC}/hx2750_base-r27.patch;patch=1 \ 33 ${RPSRC}/hx2750_base-r27.patch;patch=1 \
33 ${RPSRC}/hx2750_bl-r7.patch;patch=1 \ 34 ${RPSRC}/hx2750_bl-r7.patch;patch=1 \
34 ${RPSRC}/hx2750_pcmcia-r2.patch;patch=1 \ 35 ${RPSRC}/hx2750_pcmcia-r2.patch;patch=1 \
@@ -43,12 +44,13 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \
43 ${RPSRC}/usb_pxa27x_udc-r0.patch;patch=1 \ 44 ${RPSRC}/usb_pxa27x_udc-r0.patch;patch=1 \
44 ${RPSRC}/usb_add_epalloc-r1.patch;patch=1 \ 45 ${RPSRC}/usb_add_epalloc-r1.patch;patch=1 \
45 ${DOSRC}/kexec-arm-r3.patch;patch=1 \ 46 ${DOSRC}/kexec-arm-r3.patch;patch=1 \
46 ${RPSRC}/locomo_kbd_tweak-r0.patch;patch=1 \ 47 ${RPSRC}/locomo_kbd_tweak-r1.patch;patch=1 \
47 ${RPSRC}/poodle_pm-r1.patch;patch=1 \ 48 ${RPSRC}/poodle_pm-r3.patch;patch=1 \
48 ${RPSRC}/pxafb_changeres-r0.patch;patch=1 \ 49 ${RPSRC}/pxafb_changeres-r0.patch;patch=1 \
49 ${RPSRC}/poodle_audio-r1.patch;patch=1 \ 50 ${RPSRC}/poodle_audio-r4.patch;patch=1 \
51 ${RPSRC}/pxa27x_overlay-r2.patch;patch=1 \
50 file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \ 52 file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \
51 file://hrw-pcmcia-ids-r3.patch;patch=1 \ 53 file://hrw-pcmcia-ids-r4.patch;patch=1 \
52 ${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \ 54 ${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \
53 ${RPSRC}/logo_oz-r2.patch.bz2;patch=1;status=unmergable \ 55 ${RPSRC}/logo_oz-r2.patch.bz2;patch=1;status=unmergable \
54 ${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable \ 56 ${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable \
@@ -59,6 +61,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \
59 ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1;status=hack \ 61 ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1;status=hack \
60 file://pxa-serial-hack.patch;patch=1;status=hack \ 62 file://pxa-serial-hack.patch;patch=1;status=hack \
61 file://connectplus-remove-ide-HACK.patch;patch=1;status=hack \ 63 file://connectplus-remove-ide-HACK.patch;patch=1;status=hack \
64 file://orinoco-remove-all-which-are-in-hostap-HACK.patch;patch=1;status=unmergable-hack \
62 file://squashfs3.0-2.6.15.patch;patch=1;status=external \ 65 file://squashfs3.0-2.6.15.patch;patch=1;status=external \
63 file://defconfig-c7x0 \ 66 file://defconfig-c7x0 \
64 file://defconfig-ipaq-pxa270 \ 67 file://defconfig-ipaq-pxa270 \
@@ -113,7 +116,9 @@ SRC_URI_append_tosa = "\
113 ${DOSRC}/sharpsl-pm-postresume-r0.patch;patch=1 \ 116 ${DOSRC}/sharpsl-pm-postresume-r0.patch;patch=1 \
114 ${DOSRC}/wm97xx-dig-restore-r0.patch;patch=1 \ 117 ${DOSRC}/wm97xx-dig-restore-r0.patch;patch=1 \
115 ${DOSRC}/wm97xx-miscdevs-resume-r0.patch;patch=1 \ 118 ${DOSRC}/wm97xx-miscdevs-resume-r0.patch;patch=1 \
116 ${DOSRC}/wm9712-reset-loop-r1.patch;patch=1" 119 ${DOSRC}/wm9712-reset-loop-r1.patch;patch=1 \
120 file://tosa-lcdnoise-r0.patch;patch=1 \
121 file://wm97xx-lcdnoise-r0.patch;patch=1 "
117# ${DOSRC}/tosa-asoc-r1.patch;patch=1 " 122# ${DOSRC}/tosa-asoc-r1.patch;patch=1 "
118 123
119S = "${WORKDIR}/linux-2.6.17" 124S = "${WORKDIR}/linux-2.6.17"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 04:48:02 +0000