From: b-cousson@ti•com (Cousson, Benoit)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH 5/6] omap: iommu: hwmod device enable/disable routines
Date: Sat, 06 Nov 2010 17:17:51 -0400 [thread overview]
Message-ID: <4CD5C5FF.9050804@ti.com> (raw)
In-Reply-To: <1289006396-27230-6-git-send-email-omar.ramirez@ti.com>
You should use runtime PM directly. That omap_device step is useless.
Moreover, this patch should be merged with the previous one.
Benoit
On 11/5/2010 9:19 PM, Ramirez Luna, Omar wrote:
> Use omap device enable/disable routines.
>
> Signed-off-by: Omar Ramirez Luna<omar.ramirez@ti•com>
> ---
> arch/arm/mach-omap2/omap-iommu.c | 16 +++++++++++-----
> arch/arm/plat-omap/include/plat/iommu.h | 7 +++++--
> arch/arm/plat-omap/iommu.c | 24 +++++++++++++++---------
> 3 files changed, 31 insertions(+), 16 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/omap-iommu.c b/arch/arm/mach-omap2/omap-iommu.c
> index 65460ef..0a76bce 100644
> --- a/arch/arm/mach-omap2/omap-iommu.c
> +++ b/arch/arm/mach-omap2/omap-iommu.c
> @@ -28,14 +28,12 @@ static struct iommu_device omap3_devices[] = {
> {
> .pdata = {
> .name = "isp",
> - .clk_name = "cam_ick",
> },
> },
> #if defined(CONFIG_MPU_BRIDGE_IOMMU)
> {
> .pdata = {
> .name = "iva2",
> - .clk_name = "iva2_ck",
> },
> },
> #endif
> @@ -51,14 +49,12 @@ static struct iommu_device omap4_devices[] = {
> {
> .pdata = {
> .name = "ducati",
> - .clk_name = "ducati_ick",
> },
> },
> #if defined(CONFIG_MPU_TESLA_IOMMU)
> {
> .pdata = {
> .name = "tesla",
> - .clk_name = "tesla_ick",
> },
> },
> #endif
> @@ -69,6 +65,14 @@ static struct iommu_device omap4_devices[] = {
> #define NR_OMAP4_IOMMU_DEVICES 0
> #endif
>
> +static struct omap_device_pm_latency iommu_latencies[] = {
> + [0] = {
> + .activate_func = omap_device_enable_clocks,
> + .deactivate_func = omap_device_enable_clocks,
> + .flags = OMAP_DEVICE_LATENCY_AUTO_ADJUST
> + },
> +};
> +
> static int __init omap_iommu_init(void)
> {
> int i;
> @@ -94,10 +98,12 @@ static int __init omap_iommu_init(void)
>
> devices[i].pdata.mmu_attr =
> (struct omap_mmu_dev_attr *)oh->dev_attr;
> + devices[i].pdata.device_enable = omap_device_enable;
> + devices[i].pdata.device_disable = omap_device_idle;
>
> od = omap_device_build("omap-iommu", i, oh,
> &devices[i].pdata, sizeof(devices[i].pdata),
> - NULL, 0,
> + iommu_latencies, ARRAY_SIZE(iommu_latencies),
> 0);
> if (!od) {
> pr_err("%s: error device build failed\n", __func__);
> diff --git a/arch/arm/plat-omap/include/plat/iommu.h b/arch/arm/plat-omap/include/plat/iommu.h
> index 9650309..fd8ffeb 100644
> --- a/arch/arm/plat-omap/include/plat/iommu.h
> +++ b/arch/arm/plat-omap/include/plat/iommu.h
> @@ -13,6 +13,8 @@
> #ifndef __MACH_IOMMU_H
> #define __MACH_IOMMU_H
>
> +struct platform_device;
> +
> struct iotlb_entry {
> u32 da;
> u32 pa;
> @@ -28,7 +30,6 @@ struct iotlb_entry {
> struct iommu {
> const char *name;
> struct module *owner;
> - struct clk *clk;
> void __iomem *regbase;
> struct device *dev;
>
> @@ -109,8 +110,10 @@ struct omap_mmu_dev_attr {
>
> struct iommu_platform_data {
> const char *name;
> - const char *clk_name;
> struct omap_mmu_dev_attr *mmu_attr;
> +
> + int (*device_enable)(struct platform_device *pdev);
> + int (*device_disable)(struct platform_device *pdev);
> };
>
> #if defined(CONFIG_ARCH_OMAP1)
> diff --git a/arch/arm/plat-omap/iommu.c b/arch/arm/plat-omap/iommu.c
> index 0fc9d90..36b1b63 100644
> --- a/arch/arm/plat-omap/iommu.c
> +++ b/arch/arm/plat-omap/iommu.c
> @@ -100,11 +100,17 @@ EXPORT_SYMBOL_GPL(iommu_arch_version);
> static int iommu_enable(struct iommu *obj)
> {
> int err;
> + struct iommu_platform_data *pdata;
> + struct platform_device *pdev;
>
> if (!obj)
> return -EINVAL;
>
> - clk_enable(obj->clk);
> + pdev = container_of(obj->dev, struct platform_device, dev);
> + pdata = obj->dev->platform_data;
> +
> + if (pdata->device_enable)
> + pdata->device_enable(pdev);
>
> err = arch_iommu->enable(obj);
>
> @@ -113,12 +119,19 @@ static int iommu_enable(struct iommu *obj)
>
> static void iommu_disable(struct iommu *obj)
> {
> + struct iommu_platform_data *pdata;
> + struct platform_device *pdev;
> +
> if (!obj)
> return;
>
> arch_iommu->disable(obj);
>
> - clk_disable(obj->clk);
> + pdev = container_of(obj->dev, struct platform_device, dev);
> + pdata = obj->dev->platform_data;
> +
> + if (pdata->device_enable)
> + pdata->device_disable(pdev);
> }
>
> /*
> @@ -886,10 +899,6 @@ static int __devinit omap_iommu_probe(struct platform_device *pdev)
> if (!obj)
> return -ENOMEM;
>
> - obj->clk = clk_get(&pdev->dev, pdata->clk_name);
> - if (IS_ERR(obj->clk))
> - goto err_clk;
> -
> obj->nr_tlb_entries = pdata->mmu_attr->nr_tlb_entries;
> obj->name = pdata->name;
> obj->dev =&pdev->dev;
> @@ -949,8 +958,6 @@ err_irq:
> release_mem_region(res->start, resource_size(res));
> iounmap(obj->regbase);
> err_mem:
> - clk_put(obj->clk);
> -err_clk:
> kfree(obj);
> return err;
> }
> @@ -972,7 +979,6 @@ static int __devexit omap_iommu_remove(struct platform_device *pdev)
> release_mem_region(res->start, resource_size(res));
> iounmap(obj->regbase);
>
> - clk_put(obj->clk);
> dev_info(&pdev->dev, "%s removed\n", obj->name);
> kfree(obj);
> return 0;
next prev parent reply other threads:[~2010-11-06 21:17 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-06 1:19 [PATCH 0/6] omap: iommu: hwmod support and code reorganization Omar Ramirez Luna
2010-11-06 1:19 ` [PATCH 1/6] omap: iommu: remove redundant clock usage Omar Ramirez Luna
2010-11-06 19:11 ` Cousson, Benoit
2010-11-07 15:55 ` Ramirez Luna, Omar
2010-11-06 1:19 ` [PATCH 2/6] OMAP3: hwmod data: Add mmu for iva2 and isp Omar Ramirez Luna
2010-11-06 19:15 ` Cousson, Benoit
2010-11-07 16:00 ` Ramirez Luna, Omar
2010-11-08 23:05 ` Cousson, Benoit
2010-11-08 23:52 ` Ramirez Luna, Omar
2010-11-06 1:19 ` [PATCH 3/6] OMAP4: hwmod data: add mmu hwmod for ducati and tesla Omar Ramirez Luna
2010-11-06 20:47 ` Cousson, Benoit
2010-11-07 16:18 ` Ramirez Luna, Omar
2010-11-08 23:21 ` Cousson, Benoit
2010-11-08 23:48 ` Ramirez Luna, Omar
2010-11-09 0:03 ` Cousson, Benoit
2010-11-06 1:19 ` [PATCH 4/6] omap: iommu: intial hwmod support Omar Ramirez Luna
2010-11-06 21:05 ` Cousson, Benoit
2010-11-07 16:21 ` Ramirez Luna, Omar
2010-11-06 1:19 ` [PATCH 5/6] omap: iommu: hwmod device enable/disable routines Omar Ramirez Luna
2010-11-06 21:17 ` Cousson, Benoit [this message]
2010-11-07 16:24 ` Ramirez Luna, Omar
2010-11-06 1:19 ` [PATCH 6/6] omap: iommu: code reorganization and cleanup Omar Ramirez Luna
2010-11-06 8:34 ` Felipe Contreras
2010-11-07 16:29 ` Ramirez Luna, Omar
2010-11-06 21:28 ` Cousson, Benoit
2010-11-07 16:27 ` Ramirez Luna, Omar
2010-11-06 1:32 ` [PATCH 0/6] omap: iommu: hwmod support and code reorganization Ramirez Luna, Omar
2010-11-06 18:31 ` Cousson, Benoit
2010-11-07 15:43 ` Ramirez Luna, Omar
2010-11-08 21:56 ` Cousson, Benoit
2010-11-06 18:56 ` Cousson, Benoit
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=4CD5C5FF.9050804@ti.com \
--to=b-cousson@ti$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox