target/linux/mvebu/patches-3.10/0052-bus-mvebu-mbus-Factorize-Armada-370-XP-data-structur.patch

   1 From 2c8f0b1810ff9cd45ed2055441b4c43afcfb7d2a Mon Sep 17 00:00:00 2001
   2 From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
   3 Date: Fri, 5 Jul 2013 14:54:26 +0200
   4 Subject: [PATCH 052/203] bus: mvebu-mbus: Factorize Armada 370/XP data
   5  structures
   6
   7 These structures were only different in the mapping tables.
   8 Now that those tables have been removed, it doesn't make any sense
   9 to keep different structures.
  10
  11 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  12 Tested-by: Andrew Lunn <andrew@lunn.ch>
  13 Tested-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
  14 ---
  15  drivers/bus/mvebu-mbus.c | 14 +++-----------
  16  1 file changed, 3 insertions(+), 11 deletions(-)
  17
  18 --- a/drivers/bus/mvebu-mbus.c
  19 +++ b/drivers/bus/mvebu-mbus.c
  20 @@ -536,15 +536,7 @@ mvebu_mbus_dove_setup_cpu_target(struct
  21         mvebu_mbus_dram_info.num_cs = cs;
  22  }
  23
  24 -static const struct mvebu_mbus_soc_data armada_370_mbus_data = {
  25 -       .num_wins            = 20,
  26 -       .num_remappable_wins = 8,
  27 -       .win_cfg_offset      = armada_370_xp_mbus_win_offset,
  28 -       .setup_cpu_target    = mvebu_mbus_default_setup_cpu_target,
  29 -       .show_cpu_target     = mvebu_sdram_debug_show_orion,
  30 -};
  31 -
  32 -static const struct mvebu_mbus_soc_data armada_xp_mbus_data = {
  33 +static const struct mvebu_mbus_soc_data armada_370_xp_mbus_data = {
  34         .num_wins            = 20,
  35         .num_remappable_wins = 8,
  36         .win_cfg_offset      = armada_370_xp_mbus_win_offset,
  37 @@ -604,9 +596,9 @@ static const struct mvebu_mbus_soc_data
  38   */
  39  static const struct of_device_id of_mvebu_mbus_ids[] = {
  40         { .compatible = "marvell,armada370-mbus",
  41 -         .data = &armada_370_mbus_data, },
  42 +         .data = &armada_370_xp_mbus_data, },
  43         { .compatible = "marvell,armadaxp-mbus",
  44 -         .data = &armada_xp_mbus_data, },
  45 +         .data = &armada_370_xp_mbus_data, },
  46         { .compatible = "marvell,kirkwood-mbus",
  47           .data = &kirkwood_mbus_data, },
  48         { .compatible = "marvell,dove-mbus",