Messages in this thread Patch in this message | | | Subject | Re: [PATCH] pcmcia: Add disable_clkrun option | From | OGAWA Hirofumi <> | Date | Tue, 23 Nov 2004 12:47:24 +0900 |
| |
OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> writes:
> +MODULE_PARM_DESC(disable_clkrun, "If PC card does'nt function properly, please try this option"); ^^^^^^^ Oooops. Typo. I'm sorry. Please apply the following instead. -- OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
drivers/pcmcia/ti113x.h | 11 ++++++++--- drivers/pcmcia/yenta_socket.c | 3 +++ 2 files changed, 11 insertions(+), 3 deletions(-)
diff -puN drivers/pcmcia/ti113x.h~pcmcia-clkrun-disable drivers/pcmcia/ti113x.h --- linux-2.6.10-rc2/drivers/pcmcia/ti113x.h~pcmcia-clkrun-disable 2004-11-23 12:33:20.000000000 +0900 +++ linux-2.6.10-rc2-hirofumi/drivers/pcmcia/ti113x.h 2004-11-23 12:33:20.000000000 +0900 @@ -592,15 +592,20 @@ out: static int ti12xx_override(struct yenta_socket *socket) { - u32 val; + u32 val, val_orig; /* make sure that memory burst is active */ - val = config_readl(socket, TI113X_SYSTEM_CONTROL); + val_orig = val = config_readl(socket, TI113X_SYSTEM_CONTROL); + if (disable_clkrun && PCI_FUNC(socket->dev->devfn) == 0) { + printk(KERN_INFO "Yenta: Disabling CLKRUN feature\n"); + val |= TI113X_SCR_KEEPCLK; + } if (!(val & TI122X_SCR_MRBURSTUP)) { printk(KERN_INFO "Yenta: Enabling burst memory read transactions\n"); val |= TI122X_SCR_MRBURSTUP; - config_writel(socket, TI113X_SYSTEM_CONTROL, val); } + if (val_orig != val) + config_writel(socket, TI113X_SYSTEM_CONTROL, val); /* * for EnE bridges only: clear testbit TLTEnable. this makes the diff -puN drivers/pcmcia/yenta_socket.c~pcmcia-clkrun-disable drivers/pcmcia/yenta_socket.c --- linux-2.6.10-rc2/drivers/pcmcia/yenta_socket.c~pcmcia-clkrun-disable 2004-11-23 12:33:20.000000000 +0900 +++ linux-2.6.10-rc2-hirofumi/drivers/pcmcia/yenta_socket.c 2004-11-23 12:37:34.000000000 +0900 @@ -28,6 +28,9 @@ #include "yenta_socket.h" #include "i82365.h" +static int disable_clkrun; +module_param(disable_clkrun, bool, 0444); +MODULE_PARM_DESC(disable_clkrun, "If PC card doesn't function properly, please try this option"); #if 0 #define debug(x,args...) printk(KERN_DEBUG "%s: " x, __func__ , ##args) _ - 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/
| |