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
951a681b
Commit
951a681b
authored
Apr 20, 2009
by
Paul Mundt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
sh: pci: Convert dreamcast to new-style interface.
Signed-off-by:
Paul Mundt
<
lethal@linux-sh.org
>
parent
37c8ac36
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
20 deletions
+14
-20
arch/sh/drivers/pci/Kconfig
arch/sh/drivers/pci/Kconfig
+1
-4
arch/sh/drivers/pci/fixups-dreamcast.c
arch/sh/drivers/pci/fixups-dreamcast.c
+1
-1
arch/sh/drivers/pci/pci-dreamcast.c
arch/sh/drivers/pci/pci-dreamcast.c
+12
-15
No files found.
arch/sh/drivers/pci/Kconfig
View file @
951a681b
...
@@ -20,11 +20,8 @@ config SH_PCIDMA_NONCOHERENT
...
@@ -20,11 +20,8 @@ config SH_PCIDMA_NONCOHERENT
# Temporary config option for transitioning off of PCI_AUTO
# Temporary config option for transitioning off of PCI_AUTO
config PCI_NEW
config PCI_NEW
bool
def_bool y
depends on PCI
depends on PCI
default y if CPU_SUBTYPE_SH7763 || CPU_SUBTYPE_SH7780 || \
CPU_SUBTYPE_SH7785 || CPU_SH5 || \
CPU_SUBTYPE_SH7751 || CPU_SUBTYPE_SH7751R
# This is also board-specific
# This is also board-specific
config PCI_AUTO
config PCI_AUTO
...
...
arch/sh/drivers/pci/fixups-dreamcast.c
View file @
951a681b
...
@@ -30,7 +30,7 @@
...
@@ -30,7 +30,7 @@
static
void
__init
gapspci_fixup_resources
(
struct
pci_dev
*
dev
)
static
void
__init
gapspci_fixup_resources
(
struct
pci_dev
*
dev
)
{
{
struct
pci_channel
*
p
=
board_pci_channels
;
struct
pci_channel
*
p
=
dev
->
sysdata
;
printk
(
KERN_NOTICE
"PCI: Fixing up device %s
\n
"
,
pci_name
(
dev
));
printk
(
KERN_NOTICE
"PCI: Fixing up device %s
\n
"
,
pci_name
(
dev
));
...
...
arch/sh/drivers/pci/pci-dreamcast.c
View file @
951a681b
...
@@ -21,7 +21,6 @@
...
@@ -21,7 +21,6 @@
#include <linux/irq.h>
#include <linux/irq.h>
#include <linux/pci.h>
#include <linux/pci.h>
#include <linux/module.h>
#include <linux/module.h>
#include <asm/io.h>
#include <asm/io.h>
#include <asm/irq.h>
#include <asm/irq.h>
#include <mach/pci.h>
#include <mach/pci.h>
...
@@ -40,11 +39,19 @@ static struct resource gapspci_mem_resource = {
...
@@ -40,11 +39,19 @@ static struct resource gapspci_mem_resource = {
.
flags
=
IORESOURCE_MEM
,
.
flags
=
IORESOURCE_MEM
,
};
};
static
struct
pci_channel
dreamcast_pci_controller
=
{
.
pci_ops
=
&
gapspci_pci_ops
,
.
io_resource
=
&
gapspci_io_resource
,
.
io_offset
=
0x00000000
,
.
mem_resource
=
&
gapspci_mem_resource
,
.
mem_offset
=
0x00000000
,
};
/*
/*
* gapspci init
* gapspci init
*/
*/
static
int
__init
gapspci_init
(
struct
pci_channel
*
chan
)
static
int
__init
gapspci_init
(
void
)
{
{
char
idbuf
[
16
];
char
idbuf
[
16
];
int
i
;
int
i
;
...
@@ -88,18 +95,8 @@ static int __init gapspci_init(struct pci_channel *chan)
...
@@ -88,18 +95,8 @@ static int __init gapspci_init(struct pci_channel *chan)
outl
(
0x00002001
,
GAPSPCI_BBA_CONFIG
+
0x10
);
outl
(
0x00002001
,
GAPSPCI_BBA_CONFIG
+
0x10
);
outl
(
0x01000000
,
GAPSPCI_BBA_CONFIG
+
0x14
);
outl
(
0x01000000
,
GAPSPCI_BBA_CONFIG
+
0x14
);
register_pci_controller
(
&
dreamcast_pci_controller
);
return
0
;
return
0
;
}
}
arch_initcall
(
gapspci_init
);
struct
pci_channel
board_pci_channels
[]
=
{
{
.
init
=
gapspci_init
,
.
pci_ops
=
&
gapspci_pci_ops
,
.
io_resource
=
&
gapspci_io_resource
,
.
mem_resource
=
&
gapspci_mem_resource
,
.
first_devfn
=
0
,
.
last_devfn
=
1
,
},
{
.
init
=
NULL
,
}
};
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