Commit 59f16137 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Jason Cooper

arm: plat-orion: use mv_mbus_dram_info() in PCIe code

The PCIe code was directly accessing the orion_mbus_dram_info
structure to get access to a description of the SDRAM chip selects in
order to configure the PCIe -> SDRAM address decoding
windows.

However, with the introduction of the orion-mbus driver, we are going
to remove this global structure and instead leave only the exported
mv_mbus_dram_info() function to access this description of the SDRAM
chip selects. Therefore, we simply switch to using this API.
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent efaaa98d
...@@ -120,12 +120,14 @@ void __init orion_pcie_reset(void __iomem *base) ...@@ -120,12 +120,14 @@ void __init orion_pcie_reset(void __iomem *base)
* BAR[0,2] -> disabled, BAR[1] -> covers all DRAM banks * BAR[0,2] -> disabled, BAR[1] -> covers all DRAM banks
* WIN[0-3] -> DRAM bank[0-3] * WIN[0-3] -> DRAM bank[0-3]
*/ */
static void __init orion_pcie_setup_wins(void __iomem *base, static void __init orion_pcie_setup_wins(void __iomem *base)
struct mbus_dram_target_info *dram)
{ {
const struct mbus_dram_target_info *dram;
u32 size; u32 size;
int i; int i;
dram = mv_mbus_dram_info();
/* /*
* First, disable and clear BARs and windows. * First, disable and clear BARs and windows.
*/ */
...@@ -150,7 +152,7 @@ static void __init orion_pcie_setup_wins(void __iomem *base, ...@@ -150,7 +152,7 @@ static void __init orion_pcie_setup_wins(void __iomem *base,
*/ */
size = 0; size = 0;
for (i = 0; i < dram->num_cs; i++) { for (i = 0; i < dram->num_cs; i++) {
struct mbus_dram_window *cs = dram->cs + i; const struct mbus_dram_window *cs = dram->cs + i;
writel(cs->base & 0xffff0000, base + PCIE_WIN04_BASE_OFF(i)); writel(cs->base & 0xffff0000, base + PCIE_WIN04_BASE_OFF(i));
writel(0, base + PCIE_WIN04_REMAP_OFF(i)); writel(0, base + PCIE_WIN04_REMAP_OFF(i));
...@@ -184,7 +186,7 @@ void __init orion_pcie_setup(void __iomem *base) ...@@ -184,7 +186,7 @@ void __init orion_pcie_setup(void __iomem *base)
/* /*
* Point PCIe unit MBUS decode windows to DRAM space. * Point PCIe unit MBUS decode windows to DRAM space.
*/ */
orion_pcie_setup_wins(base, &orion_mbus_dram_info); orion_pcie_setup_wins(base);
/* /*
* Master + slave enable. * Master + slave enable.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment