Commit 59cb2fc6 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Jason Cooper
Browse files

bus: mvebu-mbus: Factorize Armada 370/XP data structures



These structures were only different in the mapping tables.
Now that those tables have been removed, it doesn't make any sense
to keep different structures.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: default avatarAndrew Lunn <andrew@lunn.ch>
Tested-by: default avatarSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 6275afef
...@@ -536,15 +536,7 @@ mvebu_mbus_dove_setup_cpu_target(struct mvebu_mbus_state *mbus) ...@@ -536,15 +536,7 @@ mvebu_mbus_dove_setup_cpu_target(struct mvebu_mbus_state *mbus)
mvebu_mbus_dram_info.num_cs = cs; mvebu_mbus_dram_info.num_cs = cs;
} }
static const struct mvebu_mbus_soc_data armada_370_mbus_data = { static const struct mvebu_mbus_soc_data armada_370_xp_mbus_data = {
.num_wins = 20,
.num_remappable_wins = 8,
.win_cfg_offset = armada_370_xp_mbus_win_offset,
.setup_cpu_target = mvebu_mbus_default_setup_cpu_target,
.show_cpu_target = mvebu_sdram_debug_show_orion,
};
static const struct mvebu_mbus_soc_data armada_xp_mbus_data = {
.num_wins = 20, .num_wins = 20,
.num_remappable_wins = 8, .num_remappable_wins = 8,
.win_cfg_offset = armada_370_xp_mbus_win_offset, .win_cfg_offset = armada_370_xp_mbus_win_offset,
...@@ -604,9 +596,9 @@ static const struct mvebu_mbus_soc_data mv78xx0_mbus_data = { ...@@ -604,9 +596,9 @@ static const struct mvebu_mbus_soc_data mv78xx0_mbus_data = {
*/ */
static const struct of_device_id of_mvebu_mbus_ids[] = { static const struct of_device_id of_mvebu_mbus_ids[] = {
{ .compatible = "marvell,armada370-mbus", { .compatible = "marvell,armada370-mbus",
.data = &armada_370_mbus_data, }, .data = &armada_370_xp_mbus_data, },
{ .compatible = "marvell,armadaxp-mbus", { .compatible = "marvell,armadaxp-mbus",
.data = &armada_xp_mbus_data, }, .data = &armada_370_xp_mbus_data, },
{ .compatible = "marvell,kirkwood-mbus", { .compatible = "marvell,kirkwood-mbus",
.data = &kirkwood_mbus_data, }, .data = &kirkwood_mbus_data, },
{ .compatible = "marvell,dove-mbus", { .compatible = "marvell,dove-mbus",
......
Supports Markdown
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