From patchwork Wed Sep 16 23:48:21 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suman Anna X-Patchwork-Id: 53769 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f71.google.com (mail-la0-f71.google.com [209.85.215.71]) by patches.linaro.org (Postfix) with ESMTPS id DCE8722A0D for ; Wed, 16 Sep 2015 23:49:22 +0000 (UTC) Received: by lamf6 with SMTP id f6sf547375lam.1 for ; Wed, 16 Sep 2015 16:49:21 -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=rS9tJ/K8zjlggW/w29OJVH1G8w5eT/JF9ASBaUyTdIU=; b=Cds/+9XjcX0m50mKctjTSucNbY7P2RUa7gxAtiZt3KiRAHBZLb5TNMxeHo09j8UbOn 7RWtBVYtQfhrAu/44XqlcjJW3tbbnNx1GcNh/RJwUOzCH0iUWnss5EMbKK8glCORDDAP q+MDCXGYXMBCg/WiTn6H4cvJTYbB3ts+v3GCWZ62rgNEkkD9EDZsWUbb5JOEKb1uhafg hZA+mR+4vhn7CNvLJk7592uOzw2YnPoUBtICe51YFDjCGJdeT9PRUQU+bZGB204xW17F poGB9THiLnc9aYthdKyx3MimC6xPJK4xCTk/2EUdMONkVQ+ZDAVjr5N01Cw7dxSw3pyg EOcg== X-Gm-Message-State: ALoCoQmAfeo2ksPezy0i47t8IUv7WP6URW0iZtJweV/UVMZObpiQUsi+WUzLJoGtshvvbIH7o2WE X-Received: by 10.112.16.4 with SMTP id b4mr3104lbd.14.1442447361962; Wed, 16 Sep 2015 16:49:21 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.178.163 with SMTP id cz3ls11512lac.45.gmail; Wed, 16 Sep 2015 16:49:21 -0700 (PDT) X-Received: by 10.152.180.171 with SMTP id dp11mr32084610lac.39.1442447361684; Wed, 16 Sep 2015 16:49:21 -0700 (PDT) Received: from mail-la0-f50.google.com (mail-la0-f50.google.com. [209.85.215.50]) by mx.google.com with ESMTPS id dc7si323808lad.11.2015.09.16.16.49.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Sep 2015 16:49:21 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.50 as permitted sender) client-ip=209.85.215.50; Received: by lagj9 with SMTP id j9so1091095lag.2 for ; Wed, 16 Sep 2015 16:49:21 -0700 (PDT) X-Received: by 10.152.43.137 with SMTP id w9mr33375833lal.56.1442447361603; Wed, 16 Sep 2015 16:49:21 -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 w3csp2752704lbq; Wed, 16 Sep 2015 16:49:20 -0700 (PDT) X-Received: by 10.66.65.234 with SMTP id a10mr65473144pat.2.1442447360503; Wed, 16 Sep 2015 16:49:20 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id nv1si722563pbc.145.2015.09.16.16.49.20; Wed, 16 Sep 2015 16:49:20 -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 S1753186AbbIPXtS (ORCPT + 5 others); Wed, 16 Sep 2015 19:49:18 -0400 Received: from bear.ext.ti.com ([192.94.94.41]:52177 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753046AbbIPXtN (ORCPT ); Wed, 16 Sep 2015 19:49:13 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id t8GNmj1k024948; Wed, 16 Sep 2015 18:48:45 -0500 Received: from DLEE70.ent.ti.com (dlee70.ent.ti.com [157.170.170.113]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id t8GNmjl1010196; Wed, 16 Sep 2015 18:48:45 -0500 Received: from dflp32.itg.ti.com (10.64.6.15) by DLEE70.ent.ti.com (157.170.170.113) with Microsoft SMTP Server id 14.3.224.2; Wed, 16 Sep 2015 18:48:45 -0500 Received: from legion.dal.design.ti.com (legion.dal.design.ti.com [128.247.22.53]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id t8GNmjKQ031084; Wed, 16 Sep 2015 18:48:45 -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 t8GNmi922321; Wed, 16 Sep 2015 18:48:45 -0500 (CDT) From: Suman Anna To: Tony Lindgren CC: Paul Walmsley , , , , Suman Anna Subject: [PATCH 3/4] ARM: OMAP4: hwmod data: Remove legacy IOMMU attr and addrs Date: Wed, 16 Sep 2015 18:48:21 -0500 Message-ID: <1442447302-5246-4-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.50 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: , OMAP4 has been DT-boot only for some time, and the legacy-mode device creation logic for IOMMU devices has also been cleaned up, so the dev_attr and address data is no longer required. So, remove these attribute data and hwmod addr space for the IPU & DSP IOMMU devices. Signed-off-by: Suman Anna --- arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 31 ------------------------------ 1 file changed, 31 deletions(-) diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c index 43eebf2c59e2..56586b5d6051 100644 --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c @@ -30,7 +30,6 @@ #include #include -#include #include #include "omap_hwmod.h" @@ -2088,30 +2087,16 @@ static struct omap_hwmod_class omap44xx_mmu_hwmod_class = { /* mmu ipu */ -static struct omap_mmu_dev_attr mmu_ipu_dev_attr = { - .nr_tlb_entries = 32, -}; - static struct omap_hwmod omap44xx_mmu_ipu_hwmod; static struct omap_hwmod_rst_info omap44xx_mmu_ipu_resets[] = { { .name = "mmu_cache", .rst_shift = 2 }, }; -static struct omap_hwmod_addr_space omap44xx_mmu_ipu_addrs[] = { - { - .pa_start = 0x55082000, - .pa_end = 0x550820ff, - .flags = ADDR_TYPE_RT, - }, - { } -}; - /* l3_main_2 -> mmu_ipu */ static struct omap_hwmod_ocp_if omap44xx_l3_main_2__mmu_ipu = { .master = &omap44xx_l3_main_2_hwmod, .slave = &omap44xx_mmu_ipu_hwmod, .clk = "l3_div_ck", - .addr = omap44xx_mmu_ipu_addrs, .user = OCP_USER_MPU | OCP_USER_SDMA, }; @@ -2130,35 +2115,20 @@ static struct omap_hwmod omap44xx_mmu_ipu_hwmod = { .modulemode = MODULEMODE_HWCTRL, }, }, - .dev_attr = &mmu_ipu_dev_attr, }; /* mmu dsp */ -static struct omap_mmu_dev_attr mmu_dsp_dev_attr = { - .nr_tlb_entries = 32, -}; - static struct omap_hwmod omap44xx_mmu_dsp_hwmod; static struct omap_hwmod_rst_info omap44xx_mmu_dsp_resets[] = { { .name = "mmu_cache", .rst_shift = 1 }, }; -static struct omap_hwmod_addr_space omap44xx_mmu_dsp_addrs[] = { - { - .pa_start = 0x4a066000, - .pa_end = 0x4a0660ff, - .flags = ADDR_TYPE_RT, - }, - { } -}; - /* l4_cfg -> dsp */ static struct omap_hwmod_ocp_if omap44xx_l4_cfg__mmu_dsp = { .master = &omap44xx_l4_cfg_hwmod, .slave = &omap44xx_mmu_dsp_hwmod, .clk = "l4_div_ck", - .addr = omap44xx_mmu_dsp_addrs, .user = OCP_USER_MPU | OCP_USER_SDMA, }; @@ -2177,7 +2147,6 @@ static struct omap_hwmod omap44xx_mmu_dsp_hwmod = { .modulemode = MODULEMODE_HWCTRL, }, }, - .dev_attr = &mmu_dsp_dev_attr, }; /*