From: Kevin Hilman <khilman@ti.com> To: linux-omap@vger.kernel.org, Paul Walmsley <paul@pwsan.com>, Grant Likely <grant.likely@secretlab.ca> Cc: "G. Manjunath Kondaiah" <manjugk@ti.com>, linux-arm-kernel@lists.infradead.org, devicetree-discuss@lists.ozlabs.org Subject: [RFC/PATCH 2/7] OMAP3: beagle: don't touch omap_device internals Date: Thu, 21 Jul 2011 16:52:13 -0700 [thread overview] Message-ID: <1311292338-11830-4-git-send-email-khilman@ti.com> (raw) In-Reply-To: <1311292338-11830-1-git-send-email-khilman@ti.com> 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: Kevin Hilman <khilman@ti.com> --- arch/arm/mach-omap2/board-omap3beagle.c | 23 ++++++++++------------- 1 files changed, 10 insertions(+), 13 deletions(-) diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index 32f5f89..3ae16b4 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c @@ -491,23 +491,22 @@ static void __init beagle_opp_init(void) /* Custom OPP enabled for all xM versions */ if (cpu_is_omap3630()) { - struct omap_hwmod *mh = omap_hwmod_lookup("mpu"); - struct omap_hwmod *dh = omap_hwmod_lookup("iva"); - struct device *dev; + struct device *mpu_dev, *iva_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", - __func__, mh, dh); + __func__, mpu_dev, iva_dev); return; } /* Enable MPU 1GHz and lower opps */ - dev = &mh->od->pdev.dev; - r = opp_enable(dev, 800000000); + r = opp_enable(mpu_dev, 800000000); /* TODO: MPU 1GHz needs SR and ABB */ /* Enable IVA 800MHz and lower opps */ - dev = &dh->od->pdev.dev; - r |= opp_enable(dev, 660000000); + r |= opp_enable(iva_dev, 660000000); /* TODO: DSP 800MHz needs SR and ABB */ if (r) { pr_err("%s: failed to enable higher opp %d\n", @@ -516,10 +515,8 @@ static void __init beagle_opp_init(void) * Cleanup - disable the higher freqs - we dont care * about the results */ - dev = &mh->od->pdev.dev; - opp_disable(dev, 800000000); - dev = &dh->od->pdev.dev; - opp_disable(dev, 660000000); + opp_disable(mpu_dev, 800000000); + opp_disable(iva_dev, 660000000); } } return; -- 1.7.6
WARNING: multiple messages have this Message-ID (diff)
From: khilman@ti.com (Kevin Hilman) To: linux-arm-kernel@lists.infradead.org Subject: [RFC/PATCH 2/7] OMAP3: beagle: don't touch omap_device internals Date: Thu, 21 Jul 2011 16:52:13 -0700 [thread overview] Message-ID: <1311292338-11830-4-git-send-email-khilman@ti.com> (raw) In-Reply-To: <1311292338-11830-1-git-send-email-khilman@ti.com> 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: Kevin Hilman <khilman@ti.com> --- arch/arm/mach-omap2/board-omap3beagle.c | 23 ++++++++++------------- 1 files changed, 10 insertions(+), 13 deletions(-) diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index 32f5f89..3ae16b4 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c @@ -491,23 +491,22 @@ static void __init beagle_opp_init(void) /* Custom OPP enabled for all xM versions */ if (cpu_is_omap3630()) { - struct omap_hwmod *mh = omap_hwmod_lookup("mpu"); - struct omap_hwmod *dh = omap_hwmod_lookup("iva"); - struct device *dev; + struct device *mpu_dev, *iva_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", - __func__, mh, dh); + __func__, mpu_dev, iva_dev); return; } /* Enable MPU 1GHz and lower opps */ - dev = &mh->od->pdev.dev; - r = opp_enable(dev, 800000000); + r = opp_enable(mpu_dev, 800000000); /* TODO: MPU 1GHz needs SR and ABB */ /* Enable IVA 800MHz and lower opps */ - dev = &dh->od->pdev.dev; - r |= opp_enable(dev, 660000000); + r |= opp_enable(iva_dev, 660000000); /* TODO: DSP 800MHz needs SR and ABB */ if (r) { pr_err("%s: failed to enable higher opp %d\n", @@ -516,10 +515,8 @@ static void __init beagle_opp_init(void) * Cleanup - disable the higher freqs - we dont care * about the results */ - dev = &mh->od->pdev.dev; - opp_disable(dev, 800000000); - dev = &dh->od->pdev.dev; - opp_disable(dev, 660000000); + opp_disable(mpu_dev, 800000000); + opp_disable(iva_dev, 660000000); } } return; -- 1.7.6
next prev parent reply other threads:[~2011-07-21 23:52 UTC|newest] Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-07-21 23:52 [RFC/PATCH 0/7] decouple platform_device from omap_device Kevin Hilman 2011-07-21 23:52 ` Kevin Hilman 2011-07-21 23:52 ` [PATCH] OMAP: omap_device: replace _find_by_pdev() with to_omap_device() Kevin Hilman 2011-07-21 23:52 ` Kevin Hilman 2011-07-22 8:53 ` Felipe Balbi 2011-07-22 8:53 ` Felipe Balbi 2011-07-21 23:52 ` [RFC/PATCH 1/7] OMAP: omap_device: replace debug/warning/error prints with dev_* macros Kevin Hilman 2011-07-21 23:52 ` Kevin Hilman 2011-07-21 23:52 ` Kevin Hilman [this message] 2011-07-21 23:52 ` [RFC/PATCH 2/7] OMAP3: beagle: don't touch omap_device internals Kevin Hilman 2011-07-22 8:57 ` Felipe Balbi 2011-07-22 8:57 ` Felipe Balbi 2011-07-28 5:53 ` Nishanth Menon 2011-07-28 5:53 ` Nishanth Menon 2011-07-28 10:10 ` Russell King - ARM Linux 2011-07-28 10:10 ` Russell King - ARM Linux 2011-07-28 12:57 ` Cousson, Benoit 2011-07-28 12:57 ` Cousson, Benoit 2011-07-28 12:59 ` Felipe Balbi 2011-07-28 12:59 ` Felipe Balbi 2011-07-28 13:31 ` Menon, Nishanth 2011-07-28 13:31 ` Menon, Nishanth 2011-07-29 13:49 ` Nishanth Menon 2011-07-29 13:49 ` Nishanth Menon 2011-07-29 14:05 ` Felipe Balbi 2011-07-29 14:05 ` Felipe Balbi 2011-07-29 23:07 ` Menon, Nishanth 2011-07-29 23:07 ` Menon, Nishanth 2011-08-01 8:52 ` Felipe Balbi 2011-08-01 8:52 ` Felipe Balbi 2011-07-28 8:36 ` Jean Pihet 2011-07-28 8:36 ` Jean Pihet 2011-07-28 8:40 ` Jean Pihet 2011-07-28 8:40 ` Jean Pihet 2011-07-21 23:52 ` [RFC/PATCH 3/7] OMAP: McBSP: use existing macros for converting between devices Kevin Hilman 2011-07-21 23:52 ` Kevin Hilman 2011-07-22 8:58 ` Felipe Balbi 2011-07-22 8:58 ` Felipe Balbi 2011-07-22 12:32 ` Sergei Shtylyov 2011-07-22 12:32 ` Sergei Shtylyov 2011-07-22 20:19 ` Kevin Hilman 2011-07-22 20:19 ` Kevin Hilman 2011-07-21 23:52 ` [RFC/PATCH 4/7] OMAP: omap_device: remove internal functions from omap_device.h Kevin Hilman 2011-07-21 23:52 ` Kevin Hilman 2011-07-21 23:52 ` [RFC/PATCH 5/7] OMAP: omap_device: when building return platform_device instead of omap_device Kevin Hilman 2011-07-21 23:52 ` Kevin Hilman 2011-07-21 23:52 ` [RFC/PATCH 6/7] OMAP: omap_device: device register functions now take platform_device pointer Kevin Hilman 2011-07-21 23:52 ` Kevin Hilman 2011-07-22 6:16 ` Grant Likely 2011-07-22 6:16 ` Grant Likely 2011-07-21 23:52 ` [RFC/PATCH 7/7] WIP: HACK/RFC: omap_device: begin to decouple platform_device from omap_device Kevin Hilman 2011-07-21 23:52 ` Kevin Hilman 2011-07-22 2:20 ` Grant Likely 2011-07-22 2:20 ` Grant Likely 2011-07-30 12:03 ` Russell King - ARM Linux 2011-07-30 12:03 ` Russell King - ARM Linux 2011-07-31 2:58 ` Grant Likely 2011-07-31 2:58 ` Grant Likely 2011-07-31 15:05 ` Russell King - ARM Linux 2011-07-31 15:05 ` Russell King - ARM Linux 2011-08-01 15:42 ` Kevin Hilman 2011-08-01 15:42 ` Kevin Hilman 2011-08-01 15:44 ` Grant Likely 2011-08-01 15:44 ` Grant Likely 2011-08-01 18:50 ` Felipe Balbi 2011-08-01 18:50 ` Felipe Balbi 2011-08-01 20:07 ` Russell King - ARM Linux 2011-08-01 20:07 ` Russell King - ARM Linux 2011-08-01 22:11 ` Kevin Hilman 2011-08-01 22:11 ` Kevin Hilman 2011-08-01 22:55 ` Felipe Balbi 2011-08-01 22:55 ` Felipe Balbi 2011-08-01 23:09 ` Russell King - ARM Linux 2011-08-01 23:09 ` Russell King - ARM Linux 2011-08-02 0:00 ` Grant Likely 2011-08-02 0:00 ` Grant Likely 2011-07-27 14:04 ` [RFC/PATCH 0/7] " G, Manjunath Kondaiah 2011-07-27 14:04 ` G, Manjunath Kondaiah 2011-07-27 21:45 ` Hilman, Kevin 2011-07-27 21:45 ` Hilman, Kevin 2011-07-28 4:50 ` G, Manjunath Kondaiah 2011-07-28 4:50 ` G, Manjunath Kondaiah 2011-07-29 23:59 ` Kevin Hilman 2011-07-29 23:59 ` Kevin Hilman
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1311292338-11830-4-git-send-email-khilman@ti.com \ --to=khilman@ti.com \ --cc=devicetree-discuss@lists.ozlabs.org \ --cc=grant.likely@secretlab.ca \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-omap@vger.kernel.org \ --cc=manjugk@ti.com \ --cc=paul@pwsan.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.