49 lines
1.8 KiB
Diff
49 lines
1.8 KiB
Diff
|
From 2c8f0b1810ff9cd45ed2055441b4c43afcfb7d2a Mon Sep 17 00:00:00 2001
|
||
|
|
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||
|
|
Date: Fri, 5 Jul 2013 14:54:26 +0200
|
||
|
|
Subject: [PATCH 052/203] 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>
|
||
|
|
---
|
||
|
|
drivers/bus/mvebu-mbus.c | 14 +++-----------
|
||
|
|
1 file changed, 3 insertions(+), 11 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/bus/mvebu-mbus.c
|
||
|
|
+++ b/drivers/bus/mvebu-mbus.c
|
||
|
|
@@ -536,15 +536,7 @@ mvebu_mbus_dove_setup_cpu_target(struct
|
||
|
|
mvebu_mbus_dram_info.num_cs = cs;
|
||
|
|
}
|
||
|
|
|
||
|
|
-static const struct mvebu_mbus_soc_data armada_370_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 = {
|
||
|
|
+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,
|
||
|
|
@@ -604,9 +596,9 @@ static const struct mvebu_mbus_soc_data
|
||
|
|
*/
|
||
|
|
static const struct of_device_id of_mvebu_mbus_ids[] = {
|
||
|
|
{ .compatible = "marvell,armada370-mbus",
|
||
|
|
- .data = &armada_370_mbus_data, },
|
||
|
|
+ .data = &armada_370_xp_mbus_data, },
|
||
|
|
{ .compatible = "marvell,armadaxp-mbus",
|
||
|
|
- .data = &armada_xp_mbus_data, },
|
||
|
|
+ .data = &armada_370_xp_mbus_data, },
|
||
|
|
{ .compatible = "marvell,kirkwood-mbus",
|
||
|
|
.data = &kirkwood_mbus_data, },
|
||
|
|
{ .compatible = "marvell,dove-mbus",
|