Skip to content

Commit cf15079

Browse files
1000001101000arndb
authored andcommitted
ARM: mv78xx0: adjust init logic for ts-wxl to reflect single core dev
Original code was largely copy-pasted from the reference board code, adjust pcie initialiazation to reflect the TS-WXL using the single-core variant of this SoC. Correct pcie_port_size to be a power of 2 as required. Signed-off-by: Jeremy J. Peper <[email protected]> Reviewed-by: Arnd Bergmann <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]>
1 parent ec79ed5 commit cf15079

File tree

2 files changed

+3
-11
lines changed

2 files changed

+3
-11
lines changed

arch/arm/mach-mv78xx0/buffalo-wxl-setup.c

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -125,16 +125,8 @@ static void __init wxl_init(void)
125125

126126
static int __init wxl_pci_init(void)
127127
{
128-
if (machine_is_terastation_wxl()) {
129-
/*
130-
* Assign the x16 PCIe slot on the board to CPU core
131-
* #0, and let CPU core #1 have the four x1 slots.
132-
*/
133-
if (mv78xx0_core_index() == 0)
134-
mv78xx0_pcie_init(0, 1);
135-
else
136-
mv78xx0_pcie_init(1, 0);
137-
}
128+
if (machine_is_terastation_wxl() && mv78xx0_core_index() == 0)
129+
mv78xx0_pcie_init(1, 1);
138130

139131
return 0;
140132
}

arch/arm/mach-mv78xx0/pcie.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ void __init mv78xx0_pcie_id(u32 *dev, u32 *rev)
4242

4343
u32 pcie_port_size[8] = {
4444
0,
45-
0x30000000,
45+
0x20000000,
4646
0x10000000,
4747
0x10000000,
4848
0x08000000,

0 commit comments

Comments
 (0)