mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-16 22:38:04 +00:00
Koen Kooi
155 lines
5.0 KiB
Diff
155 lines
5.0 KiB
Diff
From b47c49426b8f986331816c48996d9a64f0ebc0aa Mon Sep 17 00:00:00 2001
|
|
From: Benoit Cousson <b-cousson@ti.com>
|
|
Date: Sat, 9 Jul 2011 19:14:28 -0600
|
|
Subject: [PATCH 047/149] OMAP4: hwmod data: Align interconnect format with regular modules
|
|
|
|
The interconnect modules were using a slightly different layout than
|
|
the regular modules.
|
|
Align the layout for better consitency.
|
|
|
|
Signed-off-by: Benoit Cousson <b-cousson@ti.com>
|
|
Cc: Paul Walmsley <paul@pwsan.com>
|
|
Cc: Rajendra Nayak <rnayak@ti.com>
|
|
Signed-off-by: Paul Walmsley <paul@pwsan.com>
|
|
---
|
|
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 36 ++++++++++++++--------------
|
|
1 files changed, 18 insertions(+), 18 deletions(-)
|
|
|
|
diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
|
|
index 1975b05..e011437 100644
|
|
--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
|
|
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
|
|
@@ -80,7 +80,12 @@ static struct omap_hwmod_class omap44xx_dmm_hwmod_class = {
|
|
.name = "dmm",
|
|
};
|
|
|
|
-/* dmm interface data */
|
|
+/* dmm */
|
|
+static struct omap_hwmod_irq_info omap44xx_dmm_irqs[] = {
|
|
+ { .irq = 113 + OMAP44XX_IRQ_GIC_START },
|
|
+ { .irq = -1 }
|
|
+};
|
|
+
|
|
/* l3_main_1 -> dmm */
|
|
static struct omap_hwmod_ocp_if omap44xx_l3_main_1__dmm = {
|
|
.master = &omap44xx_l3_main_1_hwmod,
|
|
@@ -113,17 +118,12 @@ static struct omap_hwmod_ocp_if *omap44xx_dmm_slaves[] = {
|
|
&omap44xx_mpu__dmm,
|
|
};
|
|
|
|
-static struct omap_hwmod_irq_info omap44xx_dmm_irqs[] = {
|
|
- { .irq = 113 + OMAP44XX_IRQ_GIC_START },
|
|
- { .irq = -1 }
|
|
-};
|
|
-
|
|
static struct omap_hwmod omap44xx_dmm_hwmod = {
|
|
.name = "dmm",
|
|
.class = &omap44xx_dmm_hwmod_class,
|
|
+ .mpu_irqs = omap44xx_dmm_irqs,
|
|
.slaves = omap44xx_dmm_slaves,
|
|
.slaves_cnt = ARRAY_SIZE(omap44xx_dmm_slaves),
|
|
- .mpu_irqs = omap44xx_dmm_irqs,
|
|
.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430),
|
|
};
|
|
|
|
@@ -135,7 +135,7 @@ static struct omap_hwmod_class omap44xx_emif_fw_hwmod_class = {
|
|
.name = "emif_fw",
|
|
};
|
|
|
|
-/* emif_fw interface data */
|
|
+/* emif_fw */
|
|
/* dmm -> emif_fw */
|
|
static struct omap_hwmod_ocp_if omap44xx_dmm__emif_fw = {
|
|
.master = &omap44xx_dmm_hwmod,
|
|
@@ -184,7 +184,7 @@ static struct omap_hwmod_class omap44xx_l3_hwmod_class = {
|
|
.name = "l3",
|
|
};
|
|
|
|
-/* l3_instr interface data */
|
|
+/* l3_instr */
|
|
/* iva -> l3_instr */
|
|
static struct omap_hwmod_ocp_if omap44xx_iva__l3_instr = {
|
|
.master = &omap44xx_iva_hwmod,
|
|
@@ -215,7 +215,7 @@ static struct omap_hwmod omap44xx_l3_instr_hwmod = {
|
|
.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430),
|
|
};
|
|
|
|
-/* l3_main_1 interface data */
|
|
+/* l3_main_1 */
|
|
static struct omap_hwmod_irq_info omap44xx_l3_main_1_irqs[] = {
|
|
{ .name = "dbg_err", .irq = 9 + OMAP44XX_IRQ_GIC_START },
|
|
{ .name = "app_err", .irq = 10 + OMAP44XX_IRQ_GIC_START },
|
|
@@ -302,13 +302,13 @@ static struct omap_hwmod_ocp_if *omap44xx_l3_main_1_slaves[] = {
|
|
static struct omap_hwmod omap44xx_l3_main_1_hwmod = {
|
|
.name = "l3_main_1",
|
|
.class = &omap44xx_l3_hwmod_class,
|
|
+ .mpu_irqs = omap44xx_l3_main_1_irqs,
|
|
.slaves = omap44xx_l3_main_1_slaves,
|
|
.slaves_cnt = ARRAY_SIZE(omap44xx_l3_main_1_slaves),
|
|
- .mpu_irqs = omap44xx_l3_main_1_irqs,
|
|
.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430),
|
|
};
|
|
|
|
-/* l3_main_2 interface data */
|
|
+/* l3_main_2 */
|
|
/* dma_system -> l3_main_2 */
|
|
static struct omap_hwmod_ocp_if omap44xx_dma_system__l3_main_2 = {
|
|
.master = &omap44xx_dma_system_hwmod,
|
|
@@ -403,7 +403,7 @@ static struct omap_hwmod omap44xx_l3_main_2_hwmod = {
|
|
.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430),
|
|
};
|
|
|
|
-/* l3_main_3 interface data */
|
|
+/* l3_main_3 */
|
|
static struct omap_hwmod_addr_space omap44xx_l3_main_3_addrs[] = {
|
|
{
|
|
.pa_start = 0x45000000,
|
|
@@ -461,7 +461,7 @@ static struct omap_hwmod_class omap44xx_l4_hwmod_class = {
|
|
.name = "l4",
|
|
};
|
|
|
|
-/* l4_abe interface data */
|
|
+/* l4_abe */
|
|
/* aess -> l4_abe */
|
|
static struct omap_hwmod_ocp_if omap44xx_aess__l4_abe = {
|
|
.master = &omap44xx_aess_hwmod,
|
|
@@ -510,7 +510,7 @@ static struct omap_hwmod omap44xx_l4_abe_hwmod = {
|
|
.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430),
|
|
};
|
|
|
|
-/* l4_cfg interface data */
|
|
+/* l4_cfg */
|
|
/* l3_main_1 -> l4_cfg */
|
|
static struct omap_hwmod_ocp_if omap44xx_l3_main_1__l4_cfg = {
|
|
.master = &omap44xx_l3_main_1_hwmod,
|
|
@@ -532,7 +532,7 @@ static struct omap_hwmod omap44xx_l4_cfg_hwmod = {
|
|
.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430),
|
|
};
|
|
|
|
-/* l4_per interface data */
|
|
+/* l4_per */
|
|
/* l3_main_2 -> l4_per */
|
|
static struct omap_hwmod_ocp_if omap44xx_l3_main_2__l4_per = {
|
|
.master = &omap44xx_l3_main_2_hwmod,
|
|
@@ -554,7 +554,7 @@ static struct omap_hwmod omap44xx_l4_per_hwmod = {
|
|
.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430),
|
|
};
|
|
|
|
-/* l4_wkup interface data */
|
|
+/* l4_wkup */
|
|
/* l4_cfg -> l4_wkup */
|
|
static struct omap_hwmod_ocp_if omap44xx_l4_cfg__l4_wkup = {
|
|
.master = &omap44xx_l4_cfg_hwmod,
|
|
@@ -584,7 +584,7 @@ static struct omap_hwmod_class omap44xx_mpu_bus_hwmod_class = {
|
|
.name = "mpu_bus",
|
|
};
|
|
|
|
-/* mpu_private interface data */
|
|
+/* mpu_private */
|
|
/* mpu -> mpu_private */
|
|
static struct omap_hwmod_ocp_if omap44xx_mpu__mpu_private = {
|
|
.master = &omap44xx_mpu_hwmod,
|
|
--
|
|
1.7.2.5
|
|
|