Skip to content

Commit

Permalink
ARM: OMAP2+: pm: Remove static devices variable for mpu, dsp, iva and…
Browse files Browse the repository at this point in the history
… l3 PM

Since the device pointer is now retrieved using the hwmod name, remove
the static variables used to store the device pointers for DSP, MPU, IVA
and L3 devices for PM/DVFS usage.

Signed-off-by: Benoit Cousson <b-cousson@ti.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
  • Loading branch information
Benoit Cousson authored and Kevin Hilman committed Oct 4, 2011
1 parent 0f7aa00 commit 766e7af
Showing 1 changed file with 7 additions and 40 deletions.
47 changes: 7 additions & 40 deletions arch/arm/mach-omap2/pm.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,38 +26,7 @@

static struct omap_device_pm_latency *pm_lats;

static struct device *mpu_dev;
static struct device *iva_dev;
static struct device *l3_dev;
static struct device *dsp_dev;

struct device *omap2_get_mpuss_device(void)
{
WARN_ON_ONCE(!mpu_dev);
return mpu_dev;
}

struct device *omap2_get_iva_device(void)
{
WARN_ON_ONCE(!iva_dev);
return iva_dev;
}

struct device *omap2_get_l3_device(void)
{
WARN_ON_ONCE(!l3_dev);
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)
static int _init_omap_device(char *name)
{
struct omap_hwmod *oh;
struct platform_device *pdev;
Expand All @@ -72,8 +41,6 @@ static int _init_omap_device(char *name, struct device **new_dev)
__func__, name))
return -ENODEV;

*new_dev = &pdev->dev;

return 0;
}

Expand All @@ -82,16 +49,16 @@ static int _init_omap_device(char *name, struct device **new_dev)
*/
static void omap2_init_processor_devices(void)
{
_init_omap_device("mpu", &mpu_dev);
_init_omap_device("mpu");
if (omap3_has_iva())
_init_omap_device("iva", &iva_dev);
_init_omap_device("iva");

if (cpu_is_omap44xx()) {
_init_omap_device("l3_main_1", &l3_dev);
_init_omap_device("dsp", &dsp_dev);
_init_omap_device("iva", &iva_dev);
_init_omap_device("l3_main_1");
_init_omap_device("dsp");
_init_omap_device("iva");
} else {
_init_omap_device("l3_main", &l3_dev);
_init_omap_device("l3_main");
}
}

Expand Down

0 comments on commit 766e7af

Please sign in to comment.