From patchwork Thu Jul 28 05:53:47 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nishanth Menon X-Patchwork-Id: 1014472 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p6S5ruce021620 for ; Thu, 28 Jul 2011 05:53:57 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753384Ab1G1Fxy (ORCPT ); Thu, 28 Jul 2011 01:53:54 -0400 Received: from na3sys009aog109.obsmtp.com ([74.125.149.201]:40119 "EHLO na3sys009aog109.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751971Ab1G1Fxx (ORCPT ); Thu, 28 Jul 2011 01:53:53 -0400 Received: from mail-gy0-f174.google.com ([209.85.160.174]) (using TLSv1) by na3sys009aob109.postini.com ([74.125.148.12]) with SMTP ID DSNKTjD5cNdNVmyMOrV/z8wzYuJ9ajnS04Gz@postini.com; Wed, 27 Jul 2011 22:53:53 PDT Received: by mail-gy0-f174.google.com with SMTP id 3so1976395gyh.5 for ; Wed, 27 Jul 2011 22:53:52 -0700 (PDT) Received: by 10.101.91.6 with SMTP id t6mr489673anl.30.1311832432449; Wed, 27 Jul 2011 22:53:52 -0700 (PDT) Received: from foobar (dragon.ti.com [192.94.94.33]) by mx.google.com with ESMTPS id l38sm473456ani.44.2011.07.27.22.53.50 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 27 Jul 2011 22:53:51 -0700 (PDT) Date: Thu, 28 Jul 2011 00:53:47 -0500 From: Nishanth Menon To: Felipe Balbi Cc: Kevin Hilman , Paul Walmsley , "G. Manjunath Kondaiah" , devicetree-discuss@lists.ozlabs.org, Grant Likely , linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: Re: [RFC/PATCH 2/7] OMAP3: beagle: don't touch omap_device internals Message-ID: <20110728055346.GA11921@foobar> References: <1311292338-11830-1-git-send-email-khilman@ti.com> <1311292338-11830-4-git-send-email-khilman@ti.com> <20110722085716.GI32058@legolas.emea.dhcp.ti.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20110722085716.GI32058@legolas.emea.dhcp.ti.com> User-Agent: Mutt/1.5.21 (2010-09-15) 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.6 (demeter1.kernel.org [140.211.167.41]); Thu, 28 Jul 2011 05:53:57 +0000 (UTC) On 11:57-20110722, Felipe Balbi wrote: [...] > > /* Custom OPP enabled for all xM versions */ > > if (cpu_is_omap3630()) { > > - struct omap_hwmod *mh = omap_hwmod_lookup("mpu"); > > - struct omap_hwmod *dh = omap_hwmod_lookup("iva"); > > - struct device *dev; > > + struct device *mpu_dev, *iva_dev; > > > > - if (!mh || !dh) { > > + mpu_dev = omap2_get_mpuss_device(); > > + iva_dev = omap2_get_iva_device(); > > out of curiosity again, nothing to do with this patch. > > Maybe it would be nicer to have an api such as: > > omap2_get_device(name); > > there are already four devices to be gotten, if that number grows any > bigger, so will the number of helper functions. I agree, in fact, on a different topic, I hit the same requirement here is the patch I had done: From 9f226def811bd50e4bac02f427604034cef77706 Mon Sep 17 00:00:00 2001 From: Nishanth Menon Date: Wed, 27 Jul 2011 15:02:32 -0500 Subject: [PATCH] OMAP: hwmod: add omap_hwmod_to_device omap_hwmod_to_device is useful for drivers when they need to look up the device associated with a hwmod name to map back into the device structure pointers. These ideally should be used by drivers in mach directory. This could in effect replace apis such as omap2_get_mpuss_device, omap2_get_iva_device, omap2_get_l3_device, omap4_get_dsp_device etc.. Signed-off-by: Nishanth Menon --- arch/arm/mach-omap2/omap_hwmod.c | 33 ++++++++++++++++++++++++++ arch/arm/plat-omap/include/plat/omap_hwmod.h | 2 + 2 files changed, 35 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index 293fa6c..77d01a2 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c @@ -142,6 +142,7 @@ #include "powerdomain.h" #include #include +#include #include #include "cm2xxx_3xxx.h" @@ -2369,3 +2370,35 @@ int omap_hwmod_no_setup_reset(struct omap_hwmod *oh) return 0; } + +/** + * omap_hwmod_to_device() - convert a hwmod name to device pointer + * @oh_name: name of the hwmod device + * + * returns back a struct device * pointer associated with a hwmod + * device represented by a hwmod_name + */ +struct device *omap_hwmod_to_device(const char *oh_name) +{ + struct omap_hwmod *oh; + + if (!oh_name) { + WARN(1, "%s: no hwmod name!\n", __func__); + return ERR_PTR(-EINVAL); + } + + oh = _lookup(oh_name); + if (IS_ERR_OR_NULL(oh)) { + WARN(1, "%s: no hwmod for %s\n", __func__, + oh_name); + return ERR_PTR(-ENODEV); + } + if (IS_ERR_OR_NULL(oh->od)) { + WARN(1, "%s: no omap_device for %s\n", __func__, + oh_name); + return ERR_PTR(-ENODEV); + } + + return &oh->od->pdev.dev; +} +EXPORT_SYMBOL(omap_hwmod_to_device); diff --git a/arch/arm/plat-omap/include/plat/omap_hwmod.h b/arch/arm/plat-omap/include/plat/omap_hwmod.h index 1adea9c..b9eec08 100644 --- a/arch/arm/plat-omap/include/plat/omap_hwmod.h +++ b/arch/arm/plat-omap/include/plat/omap_hwmod.h @@ -611,4 +611,6 @@ extern int omap2430_hwmod_init(void); extern int omap3xxx_hwmod_init(void); extern int omap44xx_hwmod_init(void); +extern struct device *omap_hwmod_to_device(const char *oh_name); + #endif