|
@@ -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;
|
|
@@ -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;
|
|
|
}
|
|
|
|
|
@@ -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");
|
|
|
}
|
|
|
}
|
|
|
|