recipes-kernel/linux/linux-3.0/pm-wip/voltdm/0047-OMAP4-hwmod-data-Align-interconnect-format-with-regu.patch

   1 From 3782f8cd9c2ac61028185ca2a12f7af62e302e60 Mon Sep 17 00:00:00 2001
   2 From: Benoit Cousson <b-cousson@ti.com>
   3 Date: Sat, 9 Jul 2011 19:14:28 -0600
   4 Subject: [PATCH 047/149] OMAP4: hwmod data: Align interconnect format with regular modules
   5
   6 The interconnect modules were using a slightly different layout than
   7 the regular modules.
   8 Align the layout for better consitency.
   9
  10 Signed-off-by: Benoit Cousson <b-cousson@ti.com>
  11 Cc: Paul Walmsley <paul@pwsan.com>
  12 Cc: Rajendra Nayak <rnayak@ti.com>
  13 Signed-off-by: Paul Walmsley <paul@pwsan.com>
  14 ---
  15  arch/arm/mach-omap2/omap_hwmod_44xx_data.c |   36 ++++++++++++++--------------
  16  1 files changed, 18 insertions(+), 18 deletions(-)
  17
  18 diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
  19 index 1975b05..e011437 100644
  20 --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
  21 +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
  22 @@ -80,7 +80,12 @@ static struct omap_hwmod_class omap44xx_dmm_hwmod_class = {
  23         .name   = "dmm",
  24  };
  25
  26 -/* dmm interface data */
  27 +/* dmm */
  28 +static struct omap_hwmod_irq_info omap44xx_dmm_irqs[] = {
  29 +       { .irq = 113 + OMAP44XX_IRQ_GIC_START },
  30 +       { .irq = -1 }
  31 +};
  32 +
  33  /* l3_main_1 -> dmm */
  34  static struct omap_hwmod_ocp_if omap44xx_l3_main_1__dmm = {
  35         .master         = &omap44xx_l3_main_1_hwmod,
  36 @@ -113,17 +118,12 @@ static struct omap_hwmod_ocp_if *omap44xx_dmm_slaves[] = {
  37         &omap44xx_mpu__dmm,
  38  };
  39
  40 -static struct omap_hwmod_irq_info omap44xx_dmm_irqs[] = {
  41 -       { .irq = 113 + OMAP44XX_IRQ_GIC_START },
  42 -       { .irq = -1 }
  43 -};
  44 -
  45  static struct omap_hwmod omap44xx_dmm_hwmod = {
  46         .name           = "dmm",
  47         .class          = &omap44xx_dmm_hwmod_class,
  48 +       .mpu_irqs       = omap44xx_dmm_irqs,
  49         .slaves         = omap44xx_dmm_slaves,
  50         .slaves_cnt     = ARRAY_SIZE(omap44xx_dmm_slaves),
  51 -       .mpu_irqs       = omap44xx_dmm_irqs,
  52         .omap_chip      = OMAP_CHIP_INIT(CHIP_IS_OMAP4430),
  53  };
  54
  55 @@ -135,7 +135,7 @@ static struct omap_hwmod_class omap44xx_emif_fw_hwmod_class = {
  56         .name   = "emif_fw",
  57  };
  58
  59 -/* emif_fw interface data */
  60 +/* emif_fw */
  61  /* dmm -> emif_fw */
  62  static struct omap_hwmod_ocp_if omap44xx_dmm__emif_fw = {
  63         .master         = &omap44xx_dmm_hwmod,
  64 @@ -184,7 +184,7 @@ static struct omap_hwmod_class omap44xx_l3_hwmod_class = {
  65         .name   = "l3",
  66  };
  67
  68 -/* l3_instr interface data */
  69 +/* l3_instr */
  70  /* iva -> l3_instr */
  71  static struct omap_hwmod_ocp_if omap44xx_iva__l3_instr = {
  72         .master         = &omap44xx_iva_hwmod,
  73 @@ -215,7 +215,7 @@ static struct omap_hwmod omap44xx_l3_instr_hwmod = {
  74         .omap_chip      = OMAP_CHIP_INIT(CHIP_IS_OMAP4430),
  75  };
  76
  77 -/* l3_main_1 interface data */
  78 +/* l3_main_1 */
  79  static struct omap_hwmod_irq_info omap44xx_l3_main_1_irqs[] = {
  80         { .name = "dbg_err", .irq = 9 + OMAP44XX_IRQ_GIC_START },
  81         { .name = "app_err", .irq = 10 + OMAP44XX_IRQ_GIC_START },
  82 @@ -302,13 +302,13 @@ static struct omap_hwmod_ocp_if *omap44xx_l3_main_1_slaves[] = {
  83  static struct omap_hwmod omap44xx_l3_main_1_hwmod = {
  84         .name           = "l3_main_1",
  85         .class          = &omap44xx_l3_hwmod_class,
  86 +       .mpu_irqs       = omap44xx_l3_main_1_irqs,
  87         .slaves         = omap44xx_l3_main_1_slaves,
  88         .slaves_cnt     = ARRAY_SIZE(omap44xx_l3_main_1_slaves),
  89 -       .mpu_irqs       = omap44xx_l3_main_1_irqs,
  90         .omap_chip      = OMAP_CHIP_INIT(CHIP_IS_OMAP4430),
  91  };
  92
  93 -/* l3_main_2 interface data */
  94 +/* l3_main_2 */
  95  /* dma_system -> l3_main_2 */
  96  static struct omap_hwmod_ocp_if omap44xx_dma_system__l3_main_2 = {
  97         .master         = &omap44xx_dma_system_hwmod,
  98 @@ -403,7 +403,7 @@ static struct omap_hwmod omap44xx_l3_main_2_hwmod = {
  99         .omap_chip      = OMAP_CHIP_INIT(CHIP_IS_OMAP4430),
 100  };
 101
 102 -/* l3_main_3 interface data */
 103 +/* l3_main_3 */
 104  static struct omap_hwmod_addr_space omap44xx_l3_main_3_addrs[] = {
 105         {
 106                 .pa_start       = 0x45000000,
 107 @@ -461,7 +461,7 @@ static struct omap_hwmod_class omap44xx_l4_hwmod_class = {
 108         .name   = "l4",
 109  };
 110
 111 -/* l4_abe interface data */
 112 +/* l4_abe */
 113  /* aess -> l4_abe */
 114  static struct omap_hwmod_ocp_if omap44xx_aess__l4_abe = {
 115         .master         = &omap44xx_aess_hwmod,
 116 @@ -510,7 +510,7 @@ static struct omap_hwmod omap44xx_l4_abe_hwmod = {
 117         .omap_chip      = OMAP_CHIP_INIT(CHIP_IS_OMAP4430),
 118  };
 119
 120 -/* l4_cfg interface data */
 121 +/* l4_cfg */
 122  /* l3_main_1 -> l4_cfg */
 123  static struct omap_hwmod_ocp_if omap44xx_l3_main_1__l4_cfg = {
 124         .master         = &omap44xx_l3_main_1_hwmod,
 125 @@ -532,7 +532,7 @@ static struct omap_hwmod omap44xx_l4_cfg_hwmod = {
 126         .omap_chip      = OMAP_CHIP_INIT(CHIP_IS_OMAP4430),
 127  };
 128
 129 -/* l4_per interface data */
 130 +/* l4_per */
 131  /* l3_main_2 -> l4_per */
 132  static struct omap_hwmod_ocp_if omap44xx_l3_main_2__l4_per = {
 133         .master         = &omap44xx_l3_main_2_hwmod,
 134 @@ -554,7 +554,7 @@ static struct omap_hwmod omap44xx_l4_per_hwmod = {
 135         .omap_chip      = OMAP_CHIP_INIT(CHIP_IS_OMAP4430),
 136  };
 137
 138 -/* l4_wkup interface data */
 139 +/* l4_wkup */
 140  /* l4_cfg -> l4_wkup */
 141  static struct omap_hwmod_ocp_if omap44xx_l4_cfg__l4_wkup = {
 142         .master         = &omap44xx_l4_cfg_hwmod,
 143 @@ -584,7 +584,7 @@ static struct omap_hwmod_class omap44xx_mpu_bus_hwmod_class = {
 144         .name   = "mpu_bus",
 145  };
 146
 147 -/* mpu_private interface data */
 148 +/* mpu_private */
 149  /* mpu -> mpu_private */
 150  static struct omap_hwmod_ocp_if omap44xx_mpu__mpu_private = {
 151         .master         = &omap44xx_mpu_hwmod,
 152 --
 153 1.6.6.1
 154