lkml.org 
[lkml]   [2003]   [Oct]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH] Fix PCMCIA card detection
I'm intending sending Linus the following patch to fix PCMCIA card
detection about 24 hours (on 21:26 GMT on Oct 29th.) A couple of
people have tested it and reported that it fixes their card detection
problems. I'd like people _without_ this problem to try the patch
and report if they see any breakages.


Idea from David Hinds.

Some PCMCIA/Cardbus controllers seem to get upset when we ask
them to re-do card interrogation - they miss the next insertion
event.

We therefore avoid forcing needless card interrogations if a
card has already been succesfully detected and interrogated.

diff -Nru a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c
--- a/drivers/pcmcia/yenta_socket.c Mon Oct 27 23:27:19 2003
+++ b/drivers/pcmcia/yenta_socket.c Mon Oct 27 23:27:19 2003
@@ -461,6 +461,7 @@
static int yenta_sock_init(struct pcmcia_socket *sock)
{
struct yenta_socket *socket = container_of(sock, struct yenta_socket, socket);
+ u32 state;
u16 bridge;

bridge = config_readw(socket, CB_BRIDGE_CONTROL) & ~CB_BRIDGE_INTR;
@@ -472,7 +473,10 @@
exca_writeb(socket, I365_GENCTL, 0x00);

/* Redo card voltage interrogation */
- cb_writel(socket, CB_SOCKET_FORCE, CB_CVSTEST);
+ state = cb_readl(socket, CB_SOCKET_STATE);
+ if (!(state & (CB_CDETECT1 | CB_CDETECT2 | CB_5VCARD |
+ CB_3VCARD | CB_XVCARD | CB_YVCARD)))
+ cb_writel(socket, CB_SOCKET_FORCE, CB_CVSTEST);

yenta_clear_maps(socket);

--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of: 2.6 PCMCIA - http://pcmcia.arm.linux.org.uk/
2.6 Serial core
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-03-22 13:58    [W:0.126 / U:0.464 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site