提交 8c7f6594 编写于 作者: K Kevin Hilman

OMAP3: beagle: don't touch omap_device internals

Board code should not touch omap_device internals.  To get the MPU/IVA devices,
use existing APIs: omap2_get_mpu_device(), omap2_get_iva_device().
Signed-off-by: NKevin Hilman <khilman@ti.com>
上级 b66a4026
...@@ -491,23 +491,22 @@ static void __init beagle_opp_init(void) ...@@ -491,23 +491,22 @@ static void __init beagle_opp_init(void)
/* Custom OPP enabled for all xM versions */ /* Custom OPP enabled for all xM versions */
if (cpu_is_omap3630()) { if (cpu_is_omap3630()) {
struct omap_hwmod *mh = omap_hwmod_lookup("mpu"); struct device *mpu_dev, *iva_dev;
struct omap_hwmod *dh = omap_hwmod_lookup("iva");
struct device *dev;
if (!mh || !dh) { mpu_dev = omap2_get_mpuss_device();
iva_dev = omap2_get_iva_device();
if (!mpu_dev || !iva_dev) {
pr_err("%s: Aiee.. no mpu/dsp devices? %p %p\n", pr_err("%s: Aiee.. no mpu/dsp devices? %p %p\n",
__func__, mh, dh); __func__, mpu_dev, iva_dev);
return; return;
} }
/* Enable MPU 1GHz and lower opps */ /* Enable MPU 1GHz and lower opps */
dev = &mh->od->pdev.dev; r = opp_enable(mpu_dev, 800000000);
r = opp_enable(dev, 800000000);
/* TODO: MPU 1GHz needs SR and ABB */ /* TODO: MPU 1GHz needs SR and ABB */
/* Enable IVA 800MHz and lower opps */ /* Enable IVA 800MHz and lower opps */
dev = &dh->od->pdev.dev; r |= opp_enable(iva_dev, 660000000);
r |= opp_enable(dev, 660000000);
/* TODO: DSP 800MHz needs SR and ABB */ /* TODO: DSP 800MHz needs SR and ABB */
if (r) { if (r) {
pr_err("%s: failed to enable higher opp %d\n", pr_err("%s: failed to enable higher opp %d\n",
...@@ -516,10 +515,8 @@ static void __init beagle_opp_init(void) ...@@ -516,10 +515,8 @@ static void __init beagle_opp_init(void)
* Cleanup - disable the higher freqs - we dont care * Cleanup - disable the higher freqs - we dont care
* about the results * about the results
*/ */
dev = &mh->od->pdev.dev; opp_disable(mpu_dev, 800000000);
opp_disable(dev, 800000000); opp_disable(iva_dev, 660000000);
dev = &dh->od->pdev.dev;
opp_disable(dev, 660000000);
} }
} }
return; return;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册