hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: Andrew Lunn <andrew@lunn.ch>
Tested-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
This commit is contained in:
Thomas Petazzoni 2013-07-26 10:17:53 -03:00 committed by Jason Cooper
parent 6275afef74
commit 59cb2fc6f9
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/bus/mvebu-mbus.c
View File

@ -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 = {
*/ */
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",