From patchwork Fri Apr 13 21:53:23 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Gutierrez, Juan" X-Patchwork-Id: 152403 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 99C63B7007 for ; Sat, 14 Apr 2012 07:56:02 +1000 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SIoRC-0005rY-DY; Fri, 13 Apr 2012 21:53:50 +0000 Received: from na3sys009aog137.obsmtp.com ([74.125.149.18]) by merlin.infradead.org with smtps (Exim 4.76 #1 (Red Hat Linux)) id 1SIoR7-0005q8-1K for linux-arm-kernel@lists.infradead.org; Fri, 13 Apr 2012 21:53:46 +0000 Received: from mail-iy0-f180.google.com ([209.85.210.180]) (using TLSv1) by na3sys009aob137.postini.com ([74.125.148.12]) with SMTP ID DSNKT4igZ7tZUT1i5n+R5CEcNHbzL3fZAlFU@postini.com; Fri, 13 Apr 2012 14:53:44 PDT Received: by iage36 with SMTP id e36so6572611iag.11 for ; Fri, 13 Apr 2012 14:53:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type:content-transfer-encoding:x-gm-message-state; bh=dxXwzMCx0xnNovqR7i0C3J4uRmViWZeZc4d8eE8d1XE=; b=SubLKEtGxJSWLcC5iJ77iludB4JQeHzP3CXpDO0f5VLe5zWau1wmWZ3z/t7QprCB5y kvHqQEYkaSIWTkkN9UjJZF0dCBW28+pbB416ebREwow/vPFWNyjBz5uRsD6iJpUC2pKt SBbRojCrv+nZmR4a2Of9dlEqzaac8/56ActpYrW2inNpRuYSjlSphrDZ/POy35vECOD2 bGeQkqo9/Rff6a3Z/YuN6ebGYMFhBu2cuJvxNkG6Fg7+b0xN2XlB6+O8bsUBGcmBBEVN lIHq3CC45V6nRgBm6oD43n9NHAgJKFXv8l6NqjbbijR89lPhWHq5XqdB7ys8R++Bswj0 l8hA== Received: by 10.50.212.97 with SMTP id nj1mr2932046igc.65.1334354023260; Fri, 13 Apr 2012 14:53:43 -0700 (PDT) MIME-Version: 1.0 Received: by 10.43.132.74 with HTTP; Fri, 13 Apr 2012 14:53:23 -0700 (PDT) In-Reply-To: <1334352255-48584-3-git-send-email-jgutierrez@ti.com> References: <1334352255-48584-1-git-send-email-jgutierrez@ti.com> <1334352255-48584-3-git-send-email-jgutierrez@ti.com> From: "Gutierrez, Juan" Date: Fri, 13 Apr 2012 16:53:23 -0500 Message-ID: Subject: [PATCH 2/3] OMAP4: iommu: fix irq and clock name for dsp-iommu To: ohad@wizery.com, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-Gm-Message-State: ALoCoQkea960sWabhAfG2ElnHFlVsak0cLLdZYc3MyuwSTMuX3O/mSVmrrIF5ekYE0XmKNLqKLVw X-Spam-Note: CRM114 invocation failed X-Spam-Score: -4.2 (----) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-4.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [74.125.149.18 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: s-anna@ti.com, jgutierrez@ti.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Irq and clock names were wrong for dsp iommu configuration for omap4. Renamed tesla_ick to dsp_fck. Renamed INT_44XX_DSP_MMU to OMAP44XX_IRQ_TESLA_MMU. dsp-iommu is enabled by default. Signed-off-by: Juan Gutierrez ---  arch/arm/mach-omap2/omap-iommu.c |    6 ++----  1 files changed, 2 insertions(+), 4 deletions(-) -- 1.7.5.4 diff --git a/arch/arm/mach-omap2/omap-iommu.c b/arch/arm/mach-omap2/omap-iommu.c index ac49384..1be8bcb 100644 --- a/arch/arm/mach-omap2/omap-iommu.c +++ b/arch/arm/mach-omap2/omap-iommu.c @@ -73,19 +73,17 @@ static struct iommu_device omap4_devices[] = {                        .da_end = 0xFFFFF000,                },        }, -#if defined(CONFIG_MPU_TESLA_IOMMU)        {                .base = OMAP4_MMU2_BASE, -               .irq = INT_44XX_DSP_MMU, +               .irq = OMAP44XX_IRQ_TESLA_MMU,                .pdata = {                        .name = "tesla",                        .nr_tlb_entries = 32, -                       .clk_name = "tesla_ick", +                       .clk_name = "dsp_fck",                        .da_start = 0x0,                        .da_end = 0xFFFFF000,                },        }, -#endif  };  #define NR_OMAP4_IOMMU_DEVICES ARRAY_SIZE(omap4_devices)  static struct platform_device *omap4_iommu_pdev[NR_OMAP4_IOMMU_DEVICES];