From patchwork Wed Jun 23 23:42: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: 107717 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 o5NNeCTV009320 for ; Wed, 23 Jun 2010 23:43:48 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754135Ab0FWXnJ (ORCPT ); Wed, 23 Jun 2010 19:43:09 -0400 Received: from mail-px0-f174.google.com ([209.85.212.174]:42006 "EHLO mail-px0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754093Ab0FWXnH (ORCPT ); Wed, 23 Jun 2010 19:43:07 -0400 Received: by mail-px0-f174.google.com with SMTP id 7so469497pxi.19 for ; Wed, 23 Jun 2010 16:43:07 -0700 (PDT) Received: by 10.142.75.17 with SMTP id x17mr8072299wfa.46.1277336587481; Wed, 23 Jun 2010 16:43:07 -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 b2sm991930rvn.7.2010.06.23.16.43.05 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 23 Jun 2010 16:43:06 -0700 (PDT) From: Kevin Hilman To: linux-omap@vger.kernel.org Cc: paul@pwsan.com Subject: [PATCH 11/13] OMAP: create omap_devices for MPU, DSP, L3 Date: Wed, 23 Jun 2010 16:42:41 -0700 Message-Id: <1277336563-24988-12-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:49 +0000 (UTC) diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 03e6c9e..62920ac 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include @@ -29,6 +30,7 @@ #include #include #include +#include #include "mux.h" diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index 3cfb425..ecebbbf 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c @@ -45,7 +45,7 @@ #include #include "clockdomains.h" -#include +#include /* * The machine specific code may provide the extra mapping besides the @@ -313,6 +313,58 @@ static int __init _omap2_init_reprogram_sdrc(void) return v; } +static struct omap_device_pm_latency *pm_lats; + +static DEFINE_PER_CPU(struct device *, mpu_dev); +static struct device *dsp_dev; +static struct device *l3_dev; + +struct device *omap_get_mpu_device(void) +{ + mpu_dev = per_cpu(mpu_dev, smp_processor_id()); + WARN_ON_ONCE(!mpu_dev); + return mpu_dev; +} + +struct device *omap_get_dsp_device(void) +{ + WARN_ON_ONCE(!dsp_dev); + return dsp_dev; +} + +struct device *omap_get_l3_device(void) +{ + WARN_ON_ONCE(!l3_dev); + return l3_dev; +} + +static int _init_omap_device(struct omap_hwmod *oh, void *user) +{ + struct omap_device *od; + const char *name = oh->name; + struct device **new_dev = (struct device **)user; + + od = omap_device_build(name, 0, oh, NULL, 0, pm_lats, 0, true); + if (WARN(IS_ERR(od), "Could not build omap_device for %s\n", name)) + return -ENODEV; + + *new_dev = &od->pdev.dev; + + return 0; +} + +/* + * Build omap_devices for processors and bus. + */ +static void omap_init_processor_devices(void) +{ + mpu_dev = per_cpu(mpu_dev, smp_processor_id()); + + omap_hwmod_for_each_by_class("mpu", _init_omap_device, &mpu_dev); + omap_hwmod_for_each_by_class("dsp", _init_omap_device, &dsp_dev); + omap_hwmod_for_each_by_class("l3", _init_omap_device, &l3_dev); +} + void __init omap2_init_common_hw(struct omap_sdrc_params *sdrc_cs0, struct omap_sdrc_params *sdrc_cs1) { @@ -342,6 +394,7 @@ void __init omap2_init_common_hw(struct omap_sdrc_params *sdrc_cs0, omap_serial_early_init(); if (cpu_is_omap24xx() || cpu_is_omap34xx()) /* FIXME: OMAP4 */ omap_hwmod_late_init(); + omap_init_processor_devices(); omap_pm_if_init(); if (cpu_is_omap24xx() || cpu_is_omap34xx()) { omap2_sdrc_init(sdrc_cs0, sdrc_cs1); diff --git a/arch/arm/plat-omap/include/plat/common.h b/arch/arm/plat-omap/include/plat/common.h index d265018..0059dec 100644 --- a/arch/arm/plat-omap/include/plat/common.h +++ b/arch/arm/plat-omap/include/plat/common.h @@ -87,4 +87,8 @@ void omap2_set_globals_uart(struct omap_globals *); } \ }) +struct device *omap_get_mpu_device(void); +struct device *omap_get_dsp_device(void); +struct device *omap_get_l3_device(void); + #endif /* __ARCH_ARM_MACH_OMAP_COMMON_H */