From patchwork Fri Oct 12 01:06:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Omar Ramirez Luna X-Patchwork-Id: 1584641 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id DDAD9DFABE for ; Fri, 12 Oct 2012 01:06:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752472Ab2JLBGr (ORCPT ); Thu, 11 Oct 2012 21:06:47 -0400 Received: from mail-oa0-f46.google.com ([209.85.219.46]:39755 "EHLO mail-oa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752507Ab2JLBGp (ORCPT ); Thu, 11 Oct 2012 21:06:45 -0400 Received: by mail-oa0-f46.google.com with SMTP id h16so2411982oag.19 for ; Thu, 11 Oct 2012 18:06:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=X7q2qjZlheZXZPcbDYY/PpJwKhR5So5AQEhjXkNogeY=; b=oPpVvTOL9jUTw1BpqLTrXIU4AKmbBZPkSlMymbjhckx28kw2fr1DtThtZnXyBFitnw 2SEQ1WVjkdvxJ8GlgdEmEOUQv8Bwm7AV56/t+hnyOiVL88T/oYWIZQAMd6DdEuYfGniF 9e/0FQQDKD8C3KLK2ewFwIBbkFc6ESwH3d7czodK0kd/YPoRb4qkmF0g965E9H+tpguX eEQxVJpTyTT8MRDX//pTjZF3imQiP71L+R3X/3z8gaDlScqmi6Sqvg3xo/j8LWuTNh6s xTS/BVvUo7mnixcormiOxkOESamMflTxoVHRuApymCqr4oj+xTjVcZtDX4IMwYKPk5Se dHHQ== Received: by 10.60.7.226 with SMTP id m2mr2311573oea.72.1350004005154; Thu, 11 Oct 2012 18:06:45 -0700 (PDT) Received: from uda0273944.am.dhcp.ti.com (dragon.ti.com. [192.94.94.33]) by mx.google.com with ESMTPS id b7sm4291259oef.12.2012.10.11.18.06.44 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 11 Oct 2012 18:06:44 -0700 (PDT) From: Omar Ramirez Luna To: Tony Lindgren , Joerg Roedel Cc: Russell King , Omar Ramirez Luna , Benoit Cousson , Ohad Ben-Cohen , Paul Walmsley , Laurent Pinchart , devicetree-discuss@lists.ozlabs.org, linux-doc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org, iommu@lists.linux-foundation.org Subject: [PATCH v3 5/6] ARM: OMAP: iommu: add device tree support Date: Thu, 11 Oct 2012 20:06:14 -0500 Message-Id: <1350003977-32744-10-git-send-email-omar.luna@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1350003977-32744-1-git-send-email-omar.luna@linaro.org> References: <1350003977-32744-1-git-send-email-omar.luna@linaro.org> X-Gm-Message-State: ALoCoQkDVYik+BflcdFI5sYIwiyg9C58K7AIfeOvgzuttDo8W4Vkg0SFGn1vclQK7ptGRyDuduWM Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Adapt driver to use DT if provided. Signed-off-by: Omar Ramirez Luna --- .../devicetree/bindings/arm/omap/iommu.txt | 10 +++ arch/arm/mach-omap2/omap-iommu.c | 4 ++ drivers/iommu/omap-iommu.c | 65 +++++++++++++++++++- 3 files changed, 78 insertions(+), 1 deletion(-) create mode 100644 Documentation/devicetree/bindings/arm/omap/iommu.txt diff --git a/Documentation/devicetree/bindings/arm/omap/iommu.txt b/Documentation/devicetree/bindings/arm/omap/iommu.txt new file mode 100644 index 0000000..2bb780f --- /dev/null +++ b/Documentation/devicetree/bindings/arm/omap/iommu.txt @@ -0,0 +1,10 @@ +* MMU (Memory Management Unit) + +MMU present in OMAP subsystems. + +Required properties: + compatible : should be "ti,omap3-iommu" for OMAP3 MMUs + compatible : should be "ti,omap4-iommu" for OMAP4 MMUs + +Optional properties: + None diff --git a/arch/arm/mach-omap2/omap-iommu.c b/arch/arm/mach-omap2/omap-iommu.c index 82a422a..4d6145d 100644 --- a/arch/arm/mach-omap2/omap-iommu.c +++ b/arch/arm/mach-omap2/omap-iommu.c @@ -11,6 +11,7 @@ */ #include +#include #include #include #include @@ -29,6 +30,9 @@ static int __init omap_iommu_dev_init(struct omap_hwmod *oh, void *unused) struct omap_mmu_dev_attr *a = (struct omap_mmu_dev_attr *)oh->dev_attr; static int i; + if (of_have_populated_dt()) + return 0; + pdata = kzalloc(sizeof(*pdata), GFP_KERNEL); if (!pdata) return -ENOMEM; diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c index e266ad7..946366f 100644 --- a/drivers/iommu/omap-iommu.c +++ b/drivers/iommu/omap-iommu.c @@ -21,12 +21,15 @@ #include #include #include +#include #include #include #include +#include +#include #define for_each_iotlb_cr(obj, n, __i, cr) \ for (__i = 0; \ @@ -916,13 +919,63 @@ static void omap_iommu_detach(struct omap_iommu *obj) /* * OMAP Device MMU(IOMMU) detection */ +static int __devinit +iommu_add_platform_data_from_dt(struct platform_device *pdev) +{ + struct iommu_platform_data *pdata; + struct device_node *node = pdev->dev.of_node; + struct omap_hwmod *oh; + struct omap_mmu_dev_attr *a; + int ret = 0; + + pdata = kzalloc(sizeof(*pdata), GFP_KERNEL); + if (!pdata) + return -ENOMEM; + + of_property_read_string(node, "ti,hwmods", &pdata->name); + oh = omap_hwmod_lookup(pdata->name); + if (!oh) { + dev_err(&pdev->dev, "Cannot lookup hwmod '%s'\n", pdata->name); + ret = -ENODEV; + goto out; + } + + a = (struct omap_mmu_dev_attr *)oh->dev_attr; + pdata->nr_tlb_entries = a->nr_tlb_entries; + pdata->da_start = a->da_start; + pdata->da_end = a->da_end; + + if (oh->rst_lines_cnt == 1) { + pdata->reset_name = oh->rst_lines->name; + pdata->assert_reset = omap_device_assert_hardreset; + pdata->deassert_reset = omap_device_deassert_hardreset; + } + + ret = platform_device_add_data(pdev, pdata, sizeof(*pdata)); + if (ret) + dev_err(&pdev->dev, "Cannot add pdata for %s\n", pdata->name); + +out: + kfree(pdata); + + return ret; +} + static int __devinit omap_iommu_probe(struct platform_device *pdev) { int err = -ENODEV; int irq; struct omap_iommu *obj; struct resource *res; - struct iommu_platform_data *pdata = pdev->dev.platform_data; + struct iommu_platform_data *pdata; + + if (of_have_populated_dt()) { + err = iommu_add_platform_data_from_dt(pdev); + if (err) + return err; + } + + pdata = pdev->dev.platform_data; obj = kzalloc(sizeof(*obj), GFP_KERNEL); if (!obj) @@ -1031,12 +1084,22 @@ static const struct dev_pm_ops iommu_pm_ops = { NULL) }; +#if defined(CONFIG_OF) +static const struct of_device_id omap_iommu_of_match[] = { + { .compatible = "ti,omap3-iommu" }, + { .compatible = "ti,omap4-iommu" }, + { }, +}; +MODULE_DEVICE_TABLE(of, omap_iommu_of_match); +#endif + static struct platform_driver omap_iommu_driver = { .probe = omap_iommu_probe, .remove = __devexit_p(omap_iommu_remove), .driver = { .name = "omap-iommu", .pm = &iommu_pm_ops, + .of_match_table = of_match_ptr(omap_iommu_of_match), }, };