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
a87182b3
Commit
a87182b3
authored
Jul 05, 2010
by
Nicolas Pitre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[ARM] Kirkwood: more factorization of the PCIe init code
Signed-off-by:
Nicolas Pitre
<
nico@fluxnic.net
>
parent
16bc90af
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
19 additions
and
33 deletions
+19
-33
arch/arm/mach-kirkwood/pcie.c
arch/arm/mach-kirkwood/pcie.c
+19
-33
No files found.
arch/arm/mach-kirkwood/pcie.c
View file @
a87182b3
...
@@ -108,9 +108,10 @@ static struct pci_ops pcie_ops = {
...
@@ -108,9 +108,10 @@ static struct pci_ops pcie_ops = {
.
write
=
pcie_wr_conf
,
.
write
=
pcie_wr_conf
,
};
};
static
int
__init
pcie0_ioresources_setup
(
struct
pci_sys_data
*
sys
)
static
void
__init
pcie0_ioresources_init
(
struct
pcie_port
*
pp
)
{
{
struct
pcie_port
*
pp
=
(
struct
pcie_port
*
)
sys
->
private_data
;
pp
->
base
=
(
void
__iomem
*
)
PCIE_VIRT_BASE
;
pp
->
irq
=
IRQ_KIRKWOOD_PCIE
;
/*
/*
* IORESOURCE_IO
* IORESOURCE_IO
...
@@ -119,9 +120,6 @@ static int __init pcie0_ioresources_setup(struct pci_sys_data *sys)
...
@@ -119,9 +120,6 @@ static int __init pcie0_ioresources_setup(struct pci_sys_data *sys)
pp
->
res
[
0
].
start
=
KIRKWOOD_PCIE_IO_PHYS_BASE
;
pp
->
res
[
0
].
start
=
KIRKWOOD_PCIE_IO_PHYS_BASE
;
pp
->
res
[
0
].
end
=
pp
->
res
[
0
].
start
+
KIRKWOOD_PCIE_IO_SIZE
-
1
;
pp
->
res
[
0
].
end
=
pp
->
res
[
0
].
start
+
KIRKWOOD_PCIE_IO_SIZE
-
1
;
pp
->
res
[
0
].
flags
=
IORESOURCE_IO
;
pp
->
res
[
0
].
flags
=
IORESOURCE_IO
;
if
(
request_resource
(
&
ioport_resource
,
&
pp
->
res
[
0
]))
panic
(
"Request PCIe 0 IO resource failed
\n
"
);
sys
->
resource
[
0
]
=
&
pp
->
res
[
0
];
/*
/*
* IORESOURCE_MEM
* IORESOURCE_MEM
...
@@ -130,19 +128,12 @@ static int __init pcie0_ioresources_setup(struct pci_sys_data *sys)
...
@@ -130,19 +128,12 @@ static int __init pcie0_ioresources_setup(struct pci_sys_data *sys)
pp
->
res
[
1
].
start
=
KIRKWOOD_PCIE_MEM_PHYS_BASE
;
pp
->
res
[
1
].
start
=
KIRKWOOD_PCIE_MEM_PHYS_BASE
;
pp
->
res
[
1
].
end
=
pp
->
res
[
1
].
start
+
KIRKWOOD_PCIE_MEM_SIZE
-
1
;
pp
->
res
[
1
].
end
=
pp
->
res
[
1
].
start
+
KIRKWOOD_PCIE_MEM_SIZE
-
1
;
pp
->
res
[
1
].
flags
=
IORESOURCE_MEM
;
pp
->
res
[
1
].
flags
=
IORESOURCE_MEM
;
if
(
request_resource
(
&
iomem_resource
,
&
pp
->
res
[
1
]))
panic
(
"Request PCIe 0 Memory resource failed
\n
"
);
sys
->
resource
[
1
]
=
&
pp
->
res
[
1
];
sys
->
resource
[
2
]
=
NULL
;
sys
->
io_offset
=
0
;
return
1
;
}
}
static
int
__init
pcie1_ioresources_setup
(
struct
pci_sys_data
*
sys
)
static
void
__init
pcie1_ioresources_init
(
struct
pcie_port
*
pp
)
{
{
struct
pcie_port
*
pp
=
(
struct
pcie_port
*
)
sys
->
private_data
;
pp
->
base
=
(
void
__iomem
*
)
PCIE1_VIRT_BASE
;
pp
->
irq
=
IRQ_KIRKWOOD_PCIE1
;
/*
/*
* IORESOURCE_IO
* IORESOURCE_IO
...
@@ -151,9 +142,6 @@ static int __init pcie1_ioresources_setup(struct pci_sys_data *sys)
...
@@ -151,9 +142,6 @@ static int __init pcie1_ioresources_setup(struct pci_sys_data *sys)
pp
->
res
[
0
].
start
=
KIRKWOOD_PCIE1_IO_PHYS_BASE
;
pp
->
res
[
0
].
start
=
KIRKWOOD_PCIE1_IO_PHYS_BASE
;
pp
->
res
[
0
].
end
=
pp
->
res
[
0
].
start
+
KIRKWOOD_PCIE1_IO_SIZE
-
1
;
pp
->
res
[
0
].
end
=
pp
->
res
[
0
].
start
+
KIRKWOOD_PCIE1_IO_SIZE
-
1
;
pp
->
res
[
0
].
flags
=
IORESOURCE_IO
;
pp
->
res
[
0
].
flags
=
IORESOURCE_IO
;
if
(
request_resource
(
&
ioport_resource
,
&
pp
->
res
[
0
]))
panic
(
"Request PCIe 1 IO resource failed
\n
"
);
sys
->
resource
[
0
]
=
&
pp
->
res
[
0
];
/*
/*
* IORESOURCE_MEM
* IORESOURCE_MEM
...
@@ -162,14 +150,6 @@ static int __init pcie1_ioresources_setup(struct pci_sys_data *sys)
...
@@ -162,14 +150,6 @@ static int __init pcie1_ioresources_setup(struct pci_sys_data *sys)
pp
->
res
[
1
].
start
=
KIRKWOOD_PCIE1_MEM_PHYS_BASE
;
pp
->
res
[
1
].
start
=
KIRKWOOD_PCIE1_MEM_PHYS_BASE
;
pp
->
res
[
1
].
end
=
pp
->
res
[
1
].
start
+
KIRKWOOD_PCIE1_MEM_SIZE
-
1
;
pp
->
res
[
1
].
end
=
pp
->
res
[
1
].
start
+
KIRKWOOD_PCIE1_MEM_SIZE
-
1
;
pp
->
res
[
1
].
flags
=
IORESOURCE_MEM
;
pp
->
res
[
1
].
flags
=
IORESOURCE_MEM
;
if
(
request_resource
(
&
iomem_resource
,
&
pp
->
res
[
1
]))
panic
(
"Request PCIe 1 Memory resource failed
\n
"
);
sys
->
resource
[
1
]
=
&
pp
->
res
[
1
];
sys
->
resource
[
2
]
=
NULL
;
sys
->
io_offset
=
0
;
return
1
;
}
}
static
int
__init
kirkwood_pcie_setup
(
int
nr
,
struct
pci_sys_data
*
sys
)
static
int
__init
kirkwood_pcie_setup
(
int
nr
,
struct
pci_sys_data
*
sys
)
...
@@ -193,21 +173,27 @@ static int __init kirkwood_pcie_setup(int nr, struct pci_sys_data *sys)
...
@@ -193,21 +173,27 @@ static int __init kirkwood_pcie_setup(int nr, struct pci_sys_data *sys)
switch
(
index
)
{
switch
(
index
)
{
case
0
:
case
0
:
pp
->
base
=
(
void
__iomem
*
)
PCIE_VIRT_BASE
;
pp
->
irq
=
IRQ_KIRKWOOD_PCIE
;
kirkwood_clk_ctrl
|=
CGC_PEX0
;
kirkwood_clk_ctrl
|=
CGC_PEX0
;
pcie0_ioresources_
setup
(
sys
);
pcie0_ioresources_
init
(
pp
);
break
;
break
;
case
1
:
case
1
:
pp
->
base
=
(
void
__iomem
*
)
PCIE1_VIRT_BASE
;
pp
->
irq
=
IRQ_KIRKWOOD_PCIE1
;
kirkwood_clk_ctrl
|=
CGC_PEX1
;
kirkwood_clk_ctrl
|=
CGC_PEX1
;
pcie1_ioresources_
setup
(
sys
);
pcie1_ioresources_
init
(
pp
);
break
;
break
;
default:
default:
panic
(
"PCIe setup: invalid controller
"
);
panic
(
"PCIe setup: invalid controller
%d"
,
index
);
}
}
if
(
request_resource
(
&
ioport_resource
,
&
pp
->
res
[
0
]))
panic
(
"Request PCIe%d IO resource failed
\n
"
,
index
);
if
(
request_resource
(
&
iomem_resource
,
&
pp
->
res
[
1
]))
panic
(
"Request PCIe%d Memory resource failed
\n
"
,
index
);
sys
->
resource
[
0
]
=
&
pp
->
res
[
0
];
sys
->
resource
[
1
]
=
&
pp
->
res
[
1
];
sys
->
resource
[
2
]
=
NULL
;
sys
->
io_offset
=
0
;
/*
/*
* Generic PCIe unit setup.
* Generic PCIe unit 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