From patchwork Tue Sep 14 18:21:41 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 180062 X-Patchwork-Delegate: khilman@deeprootsystems.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o8EILoJZ031236 for ; Tue, 14 Sep 2010 18:21:50 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752060Ab0INSVt (ORCPT ); Tue, 14 Sep 2010 14:21:49 -0400 Received: from mail-ey0-f174.google.com ([209.85.215.174]:54397 "EHLO mail-ey0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751993Ab0INSVs (ORCPT ); Tue, 14 Sep 2010 14:21:48 -0400 Received: by eyb6 with SMTP id 6so3269467eyb.19 for ; Tue, 14 Sep 2010 11:21:47 -0700 (PDT) Received: by 10.223.103.203 with SMTP id l11mr105433fao.82.1284488507269; Tue, 14 Sep 2010 11:21:47 -0700 (PDT) Received: from [192.168.1.215] (c-24-18-179-55.hsd1.wa.comcast.net [24.18.179.55]) by mx.google.com with ESMTPS id b11sm186874faq.30.2010.09.14.11.21.43 (version=SSLv3 cipher=RC4-MD5); Tue, 14 Sep 2010 11:21:45 -0700 (PDT) Subject: Re: [PATCH v3] OMAP4: pm.c extensions for OMAP4 support From: Kevin Hilman To: Thara Gopinath Cc: linux-omap@vger.kernel.org, paul@pwsan.com, vishwanath.bs@ti.com, sawant@ti.com In-Reply-To: <1283328893-14556-1-git-send-email-thara@ti.com> References: <1283328893-14556-1-git-send-email-thara@ti.com> Organization: Deep Root Systems, LLC Date: Tue, 14 Sep 2010 11:21:41 -0700 Message-ID: <1284488501.2661.72.camel@localhost> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 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 (demeter1.kernel.org [140.211.167.41]); Tue, 14 Sep 2010 18:21:51 +0000 (UTC) diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c index 6bbfdd7..7e93726 100644 --- a/arch/arm/mach-omap2/pm.c +++ b/arch/arm/mach-omap2/pm.c @@ -23,8 +23,9 @@ extern int __init omap3_pm_init_opp_table(void); static struct omap_device_pm_latency *pm_lats; static struct device *mpu_dev; -static struct device *dsp_dev; +static struct device *iva_dev; static struct device *l3_dev; +static struct device *dsp_dev; struct device *omap2_get_mpuss_device(void) { @@ -32,10 +33,10 @@ struct device *omap2_get_mpuss_device(void) return mpu_dev; } -struct device *omap2_get_dsp_device(void) +struct device *omap2_get_iva_device(void) { - WARN_ON_ONCE(!dsp_dev); - return dsp_dev; + WARN_ON_ONCE(!iva_dev); + return iva_dev; } struct device *omap2_get_l3_device(void) @@ -44,6 +45,13 @@ struct device *omap2_get_l3_device(void) return l3_dev; } +struct device *omap4_get_dsp_device(void) +{ + WARN_ON_ONCE(!dsp_dev); + return dsp_dev; +} +EXPORT_SYMBOL(omap4_get_dsp_device); + /* static int _init_omap_device(struct omap_hwmod *oh, void *user) */ static int _init_omap_device(char *name, struct device **new_dev) { @@ -72,10 +80,12 @@ static void omap2_init_processor_devices(void) { _init_omap_device("mpu", &mpu_dev); _init_omap_device("iva", &dsp_dev); - if (cpu_is_omap44xx()) + if (cpu_is_omap44xx()) { _init_omap_device("l3_main_1", &l3_dev); - else + _init_omap_device("dsp", &dsp_dev); + } else { _init_omap_device("l3_main", &l3_dev); + } } static int __init omap2_common_pm_init(void) diff --git a/arch/arm/plat-omap/include/plat/common.h b/arch/arm/plat-omap/include/plat/common.h index 1a36172..159e45c 100644 --- a/arch/arm/plat-omap/include/plat/common.h +++ b/arch/arm/plat-omap/include/plat/common.h @@ -90,7 +90,8 @@ void omap3_map_io(void); }) extern struct device *omap2_get_mpuss_device(void); -extern struct device *omap2_get_dsp_device(void); +extern struct device *omap2_get_iva_device(void); extern struct device *omap2_get_l3_device(void); +extern struct device *omap4_get_dsp_device(void); #endif /* __ARCH_ARM_MACH_OMAP_COMMON_H */