From patchwork Wed Sep 16 23:48:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suman Anna X-Patchwork-Id: 53766 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by patches.linaro.org (Postfix) with ESMTPS id CBD4522A0D for ; Wed, 16 Sep 2015 23:49:10 +0000 (UTC) Received: by wisv5 with SMTP id v5sf1526154wis.0 for ; Wed, 16 Sep 2015 16:49:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type:sender:precedence :list-id:x-original-sender:x-original-authentication-results :mailing-list:list-post:list-help:list-archive:list-unsubscribe; bh=7Cg96IPLW8Hg6ue/FQzMCmgCYnJT52SuC8yuG7uon/U=; b=XY2Y94izY/J37rZPTWVD75M3AfPjukcqdNdsyX/JV/oZsW/yVt4D0XKyfM8KZzH+pe GNEMAshWdqifbJzSMH/YHh4YpEwu3xyKB1FoqG4JPTkvOJraVurBmGjG9wwqFj4i+ujB X642OP3ayeIA5I0N8kw+gTm+B0UtKu1MpbtJV1MSgdjkN7tSu217xFKsVlXTySYdSLdX Wg6NrvXN6VyEJb4ndCGu5ky3K40DG7LXzV02XVZwyss2uEjJuYL4SuGOzH5699XNJLZ+ 0oWm0vf2NYZEAPiz3olYYKUo3I6VV0VkFjL20VIbRiHtjoSlwFYy+PIvB5kxEjm5XAFl 3CeQ== X-Gm-Message-State: ALoCoQnNBL9jlTGAg9uLyu+AFtvR17oJj6uCkbXsRApP4dppTMsFcfHAR0wbFYZ1XsxGe5sPNtgh X-Received: by 10.180.79.66 with SMTP id h2mr148616wix.3.1442447350152; Wed, 16 Sep 2015 16:49:10 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.5.202 with SMTP id u10ls12675lau.23.gmail; Wed, 16 Sep 2015 16:49:10 -0700 (PDT) X-Received: by 10.152.45.10 with SMTP id i10mr6078957lam.109.1442447349975; Wed, 16 Sep 2015 16:49:09 -0700 (PDT) Received: from mail-la0-f52.google.com (mail-la0-f52.google.com. [209.85.215.52]) by mx.google.com with ESMTPS id rd4si286481lac.177.2015.09.16.16.49.09 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Sep 2015 16:49:09 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.52 as permitted sender) client-ip=209.85.215.52; Received: by lagj9 with SMTP id j9so1089141lag.2 for ; Wed, 16 Sep 2015 16:49:09 -0700 (PDT) X-Received: by 10.112.151.106 with SMTP id up10mr32872808lbb.106.1442447349700; Wed, 16 Sep 2015 16:49:09 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.59.35 with SMTP id w3csp2752632lbq; Wed, 16 Sep 2015 16:49:08 -0700 (PDT) X-Received: by 10.66.175.7 with SMTP id bw7mr67106068pac.155.1442447348563; Wed, 16 Sep 2015 16:49:08 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id rm13si708823pab.133.2015.09.16.16.49.08; Wed, 16 Sep 2015 16:49:08 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753029AbbIPXtG (ORCPT + 5 others); Wed, 16 Sep 2015 19:49:06 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:40938 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753139AbbIPXtD (ORCPT ); Wed, 16 Sep 2015 19:49:03 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id t8GNmecq001308; Wed, 16 Sep 2015 18:48:40 -0500 Received: from DLEE70.ent.ti.com (dlee70.ent.ti.com [157.170.170.113]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id t8GNmelS008625; Wed, 16 Sep 2015 18:48:40 -0500 Received: from dlep32.itg.ti.com (157.170.170.100) by DLEE70.ent.ti.com (157.170.170.113) with Microsoft SMTP Server id 14.3.224.2; Wed, 16 Sep 2015 18:48:41 -0500 Received: from legion.dal.design.ti.com (legion.dal.design.ti.com [128.247.22.53]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id t8GNmexC018447; Wed, 16 Sep 2015 18:48:40 -0500 Received: from localhost (irmo.am.dhcp.ti.com [128.247.9.166]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id t8GNme922306; Wed, 16 Sep 2015 18:48:40 -0500 (CDT) From: Suman Anna To: Tony Lindgren CC: Paul Walmsley , , , , Suman Anna Subject: [PATCH 1/4] ARM: OMAP2+: Remove legacy device instantiation of IOMMUs Date: Wed, 16 Sep 2015 18:48:19 -0500 Message-ID: <1442447302-5246-2-git-send-email-s-anna@ti.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1442447302-5246-1-git-send-email-s-anna@ti.com> References: <1442447302-5246-1-git-send-email-s-anna@ti.com> MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: s-anna@ti.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.52 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , The legacy-style IOMMU device creation is maintained currently only for OMAP3 SoC, as all other SoCs are DT-boot only, and also to ensure functionality of the OMAP3 ISP driver, the only in-kernel client user on OMAP3 that supported both modes. Commit 78c66fbcec71 ("[media] v4l: omap3isp: Drop platform data support") removed the legacy device support from the OMAP3 ISP driver, so the legacy device instantiation of OMAP IOMMU devices is no longer needed, and is cleaned up. Signed-off-by: Suman Anna --- arch/arm/mach-omap2/omap-iommu.c | 66 ---------------------------------------- 1 file changed, 66 deletions(-) delete mode 100644 arch/arm/mach-omap2/omap-iommu.c diff --git a/arch/arm/mach-omap2/omap-iommu.c b/arch/arm/mach-omap2/omap-iommu.c deleted file mode 100644 index 8867eb4025bf..000000000000 --- a/arch/arm/mach-omap2/omap-iommu.c +++ /dev/null @@ -1,66 +0,0 @@ -/* - * omap iommu: omap device registration - * - * Copyright (C) 2008-2009 Nokia Corporation - * - * Written by Hiroshi DOYU - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - */ - -#include -#include -#include -#include - -#include -#include "soc.h" -#include "omap_hwmod.h" -#include "omap_device.h" - -static int __init omap_iommu_dev_init(struct omap_hwmod *oh, void *unused) -{ - struct platform_device *pdev; - struct iommu_platform_data *pdata; - struct omap_mmu_dev_attr *a = (struct omap_mmu_dev_attr *)oh->dev_attr; - static int i; - - pdata = kzalloc(sizeof(*pdata), GFP_KERNEL); - if (!pdata) - return -ENOMEM; - - pdata->name = oh->name; - pdata->nr_tlb_entries = a->nr_tlb_entries; - - 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; - } - - pdev = omap_device_build("omap-iommu", i, oh, pdata, sizeof(*pdata)); - - kfree(pdata); - - if (IS_ERR(pdev)) { - pr_err("%s: device build err: %ld\n", __func__, PTR_ERR(pdev)); - return PTR_ERR(pdev); - } - - i++; - - return 0; -} - -static int __init omap_iommu_init(void) -{ - /* If dtb is there, the devices will be created dynamically */ - if (of_have_populated_dt()) - return -ENODEV; - - return omap_hwmod_for_each_by_class("mmu", omap_iommu_dev_init, NULL); -} -omap_subsys_initcall(omap_iommu_init); -/* must be ready before omap3isp is probed */