Commit b3294e23 authored by Thara Gopinath's avatar Thara Gopinath Committed by Kevin Hilman

OMAP4: pm.c extensions for OMAP4 support

OMAP4 has an iva device and a dsp devcice where as OMAP2/3
has only an iva device. In this file the iva device in the
system is registered under the name dsp_dev and the API
to retrieve the iva device is omap2_get_dsp_device.
This patch renames the dsp_dev to iva_dev, renames
omap2_get_dsp_device to omap2_get_iva_device,
registers dsp_dev for OMAP4 and adds a new API
omap4_get_dsp_device to retrieve the dep_dev.
Signed-off-by: default avatarThara Gopinath <thara@ti.com>
Signed-off-by: default avatarKevin Hilman <khilman@deeprootsystems.com>
parent e7410cf7
...@@ -21,8 +21,9 @@ ...@@ -21,8 +21,9 @@
static struct omap_device_pm_latency *pm_lats; static struct omap_device_pm_latency *pm_lats;
static struct device *mpu_dev; static struct device *mpu_dev;
static struct device *dsp_dev; static struct device *iva_dev;
static struct device *l3_dev; static struct device *l3_dev;
static struct device *dsp_dev;
struct device *omap2_get_mpuss_device(void) struct device *omap2_get_mpuss_device(void)
{ {
...@@ -30,10 +31,10 @@ struct device *omap2_get_mpuss_device(void) ...@@ -30,10 +31,10 @@ struct device *omap2_get_mpuss_device(void)
return mpu_dev; return mpu_dev;
} }
struct device *omap2_get_dsp_device(void) struct device *omap2_get_iva_device(void)
{ {
WARN_ON_ONCE(!dsp_dev); WARN_ON_ONCE(!iva_dev);
return dsp_dev; return iva_dev;
} }
struct device *omap2_get_l3_device(void) struct device *omap2_get_l3_device(void)
...@@ -42,6 +43,13 @@ struct device *omap2_get_l3_device(void) ...@@ -42,6 +43,13 @@ struct device *omap2_get_l3_device(void)
return 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(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 device **new_dev)
{ {
...@@ -69,7 +77,9 @@ static int _init_omap_device(char *name, struct device **new_dev) ...@@ -69,7 +77,9 @@ static int _init_omap_device(char *name, struct device **new_dev)
static void omap2_init_processor_devices(void) static void omap2_init_processor_devices(void)
{ {
_init_omap_device("mpu", &mpu_dev); _init_omap_device("mpu", &mpu_dev);
_init_omap_device("iva", &dsp_dev); _init_omap_device("iva", &iva_dev);
if (cpu_is_omap44xx())
_init_omap_device("dsp", &dsp_dev);
_init_omap_device("l3_main", &l3_dev); _init_omap_device("l3_main", &l3_dev);
} }
......
...@@ -91,7 +91,8 @@ void omap3_map_io(void); ...@@ -91,7 +91,8 @@ void omap3_map_io(void);
}) })
extern struct device *omap2_get_mpuss_device(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 *omap2_get_l3_device(void);
extern struct device *omap4_get_dsp_device(void);
#endif /* __ARCH_ARM_MACH_OMAP_COMMON_H */ #endif /* __ARCH_ARM_MACH_OMAP_COMMON_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment