summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorPaul Walmsley <paul@pwsan.com>2012-04-19 04:03:52 -0600
committerPaul Walmsley <paul@pwsan.com>2012-04-19 04:03:52 -0600
commitd69dc64801603a9b3cf360d6a26fce3f013c17a7 (patch)
treea6f674825e8550c30920fac324494eaf0b30402e /arch/arm
parent4a9efb62198fdc70cdeab75f11e7290f330beb63 (diff)
downloadlinux-3.10-d69dc64801603a9b3cf360d6a26fce3f013c17a7.tar.gz
linux-3.10-d69dc64801603a9b3cf360d6a26fce3f013c17a7.tar.bz2
linux-3.10-d69dc64801603a9b3cf360d6a26fce3f013c17a7.zip
ARM: OMAP3: hwmod data: add DSS->L3 interconnect for 3430ES1
The OMAP3 hwmod data was missing a DSS->L3 interconnect link for the OMAP3430 ES1 DSS hwmod. Since the hwmod code and data is being modified to register interfaces rather than hwmods, this would result in the DSS hwmod not being registered correctly on OMAP3430ES1. Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-omap2/omap_hwmod_3xxx_data.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index 961800d6f65..8b5eb4d59cb 100644
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -134,6 +134,12 @@ static struct omap_hwmod_ocp_if *omap3xxx_l3_main_slaves[] = {
};
/* DSS -> l3 */
+static struct omap_hwmod_ocp_if omap3430es1_dss__l3 = {
+ .master = &omap3430es1_dss_core_hwmod,
+ .slave = &omap3xxx_l3_main_hwmod,
+ .user = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
static struct omap_hwmod_ocp_if omap3xxx_dss__l3 = {
.master = &omap3xxx_dss_core_hwmod,
.slave = &omap3xxx_l3_main_hwmod,
@@ -1411,6 +1417,7 @@ static struct omap_hwmod_dma_info omap3xxx_dss_sdma_chs[] = {
/* dss master ports */
static struct omap_hwmod_ocp_if *omap3xxx_dss_masters[] = {
&omap3xxx_dss__l3,
+ &omap3430es1_dss__l3,
};
/* l4_core -> dss */