Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
6d6aae19
Commit
6d6aae19
authored
Nov 23, 2007
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Import 2.3.99pre3-2
parent
8ca3b9de
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
24 deletions
+21
-24
drivers/pcmcia/ti113x.h
drivers/pcmcia/ti113x.h
+21
-5
drivers/pcmcia/yenta.c
drivers/pcmcia/yenta.c
+0
-19
No files found.
drivers/pcmcia/ti113x.h
View file @
6d6aae19
...
...
@@ -137,15 +137,31 @@
#ifdef CONFIG_CARDBUS
/*
* Generic TI
open
- TI has an extension for the
* Generic TI
init
- TI has an extension for the
* INTCTL register that sets the PCI CSC interrupt.
* Make sure we set it correctly at open and init
* time.
* time
* - open: disable the PCI CSC interrupt. This makes
* it possible to use the CSC interrupt to probe the
* ISA interrupts.
* - init: set the interrupt to match our PCI state.
* This makes us correctly get PCI CSC interrupt
* events.
*/
static
int
ti_open
(
pci_socket_t
*
socket
)
{
u8
new
,
reg
=
exca_readb
(
socket
,
I365_INTCTL
);
new
=
reg
&
~
I365_INTR_ENA
;
if
(
new
!=
reg
)
exca_writeb
(
socket
,
I365_INTCTL
,
new
);
return
0
;
}
static
int
ti_intctl
(
pci_socket_t
*
socket
)
{
u8
new
,
reg
=
exca_readb
(
socket
,
I365_INTCTL
);
new
=
reg
&
~
I365_INTR_ENA
;
if
(
socket
->
cb_irq
)
new
|=
I365_INTR_ENA
;
...
...
@@ -157,7 +173,7 @@ static int ti_open(pci_socket_t *socket)
static
int
ti_init
(
pci_socket_t
*
socket
)
{
yenta_init
(
socket
);
ti_
open
(
socket
);
ti_
intctl
(
socket
);
return
0
;
}
...
...
@@ -200,7 +216,7 @@ static int ti113x_init(pci_socket_t *socket)
config_writel
(
socket
,
TI113X_SYSTEM_CONTROL
,
ti_sysctl
(
socket
));
config_writeb
(
socket
,
TI113X_CARD_CONTROL
,
ti_cardctl
(
socket
));
config_writeb
(
socket
,
TI113X_DEVICE_CONTROL
,
ti_devctl
(
socket
));
ti_
open
(
socket
);
ti_
intctl
(
socket
);
return
0
;
}
...
...
@@ -237,7 +253,7 @@ static int ti1250_init(pci_socket_t *socket)
yenta_init
(
socket
);
config_writeb
(
socket
,
TI1250_DIAGNOSTIC
,
ti_diag
(
socket
));
ti_
open
(
socket
);
ti_
intctl
(
socket
);
return
0
;
}
...
...
drivers/pcmcia/yenta.c
View file @
6d6aae19
...
...
@@ -851,22 +851,3 @@ struct pci_socket_ops yenta_operations = {
yenta_proc_setup
};
EXPORT_SYMBOL
(
yenta_operations
);
/*
* Ricoh cardbus bridge: standard cardbus, except it needs
* some extra init code to set timings etc.
*/
struct
pci_socket_ops
ricoh_operations
=
{
yenta_open
,
yenta_close
,
ricoh_init
,
yenta_suspend
,
yenta_get_status
,
yenta_get_socket
,
yenta_set_socket
,
yenta_get_io_map
,
yenta_set_io_map
,
yenta_get_mem_map
,
yenta_set_mem_map
,
yenta_proc_setup
};
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment