From patchwork Wed Jun 23 23:42:43 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 107719 X-Patchwork-Delegate: khilman@deeprootsystems.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o5NNeCTX009320 for ; Wed, 23 Jun 2010 23:43:49 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754141Ab0FWXnM (ORCPT ); Wed, 23 Jun 2010 19:43:12 -0400 Received: from mail-pw0-f46.google.com ([209.85.160.46]:34330 "EHLO mail-pw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754133Ab0FWXnL (ORCPT ); Wed, 23 Jun 2010 19:43:11 -0400 Received: by mail-pw0-f46.google.com with SMTP id 8so1605667pwj.19 for ; Wed, 23 Jun 2010 16:43:10 -0700 (PDT) Received: by 10.115.101.22 with SMTP id d22mr8404155wam.136.1277336590845; Wed, 23 Jun 2010 16:43:10 -0700 (PDT) Received: from localhost (c-24-18-179-55.hsd1.wa.comcast.net [24.18.179.55]) by mx.google.com with ESMTPS id h9sm48270561wal.12.2010.06.23.16.43.10 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 23 Jun 2010 16:43:10 -0700 (PDT) From: Kevin Hilman To: linux-omap@vger.kernel.org Cc: paul@pwsan.com Subject: [PATCH 13/13] OMAP3: hwmod data: add data for OMAP3 IVA2 Date: Wed, 23 Jun 2010 16:42:43 -0700 Message-Id: <1277336563-24988-14-git-send-email-khilman@deeprootsystems.com> X-Mailer: git-send-email 1.7.0.2 In-Reply-To: <1277336563-24988-1-git-send-email-khilman@deeprootsystems.com> References: <1277336563-24988-1-git-send-email-khilman@deeprootsystems.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Wed, 23 Jun 2010 23:43:51 +0000 (UTC) diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c index ec6a5f8..fe41089 100644 --- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c @@ -32,6 +32,7 @@ */ static struct omap_hwmod omap3xxx_mpu_hwmod; +static struct omap_hwmod omap3xxx_iva2_hwmod; static struct omap_hwmod omap3xxx_l3_hwmod; static struct omap_hwmod omap3xxx_l4_core_hwmod; static struct omap_hwmod omap3xxx_l4_per_hwmod; @@ -168,12 +169,42 @@ static struct omap_hwmod omap3xxx_mpu_hwmod = { .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430), }; +/* + * IVA2_2 interface data + */ + +/* IVA2 <- L3 interface */ +static struct omap_hwmod_ocp_if omap3xxx_l3__iva2 = { + .master = &omap3xxx_l3_hwmod, + .slave = &omap3xxx_iva2_hwmod, + .clk = "iva2_ck", + .user = OCP_USER_MPU | OCP_USER_SDMA, +}; + +static struct omap_hwmod_ocp_if *omap3xxx_iva2_masters[] = { + &omap3xxx_l3__iva2, +}; + +/* + * IVA2 (IVA2) + */ + +static struct omap_hwmod omap3xxx_iva2_hwmod = { + .name = "dsp", + .class = &dsp_hwmod_class, + .main_clk = "iva2_ck", + .masters = omap3xxx_iva2_masters, + .masters_cnt = ARRAY_SIZE(omap3xxx_iva2_masters), + .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430) +}; + static __initdata struct omap_hwmod *omap3xxx_hwmods[] = { &omap3xxx_l3_hwmod, &omap3xxx_l4_core_hwmod, &omap3xxx_l4_per_hwmod, &omap3xxx_l4_wkup_hwmod, &omap3xxx_mpu_hwmod, + &omap3xxx_iva2_hwmod, NULL, };