From patchwork Wed Sep 19 18:57:57 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 1479521 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 349C3DF280 for ; Wed, 19 Sep 2012 18:59:43 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TEPTO-0005AM-7e; Wed, 19 Sep 2012 18:58:10 +0000 Received: from moutng.kundenserver.de ([212.227.126.187]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TEPTK-00059p-Ur for linux-arm-kernel@lists.infradead.org; Wed, 19 Sep 2012 18:58:07 +0000 Received: from klappe2.localnet (HSI-KBW-149-172-5-253.hsi13.kabel-badenwuerttemberg.de [149.172.5.253]) by mrelayeu.kundenserver.de (node=mrbap4) with ESMTP (Nemesis) id 0MPoiw-1T9ReX0f5u-004TRs; Wed, 19 Sep 2012 20:57:59 +0200 From: Arnd Bergmann To: Tony Lindgren Subject: Re: [PATCH 1/1] drivers: bus: Move the OMAP interconnect driver to drivers/bus/ Date: Wed, 19 Sep 2012 18:57:57 +0000 User-Agent: KMail/1.12.2 (Linux/3.5.0; KDE/4.3.2; x86_64; ; ) References: <1347614434-15938-1-git-send-email-santosh.shilimkar@ti.com> <20120917215128.GF11762@atomide.com> In-Reply-To: <20120917215128.GF11762@atomide.com> MIME-Version: 1.0 Message-Id: <201209191857.57862.arnd@arndb.de> X-Provags-ID: V02:K0:SbxGeCZowgOLxzVulrPDI55jzeSZqTma2euxTmrQmJz LWMDd409cCJShW2FVDZpdfRtvVQKfuzr2eQiByW407FSsjhcpv 4FNYp1mYjCgOpmR/pwqPheV6dK6vIYt5dLRKwcRdJUqGPOPIOo Nj4Govjj/GuvaV7tpBZtDGFTsGBXlevbZH00fk8Msz7/eFjE5Q vGAfOBc1IftW6S3Jr2ePuQMbRLoz7Y2/sDwx+f2+CTLA5seqss rwkYNrrExDRuXA9pPYBzYDZ5mWA+ydyO9o6okvVd7O7h9VMyd5 0LfiX1gZ+L++O/ygavfq8M8Q6BRUmHujOpIyfLTmKjwLIrstlB vgpUaU+9APNU8027ptww= X-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.126.187 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linux-omap@vger.kernel.org, Santosh Shilimkar , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org On Monday 17 September 2012, Tony Lindgren wrote: > * Santosh Shilimkar [120914 02:21]: > > OMAP interconnect drivers are used for the interconnect error handling. > > Since they are bus driver, lets move it to newly created drivers/bus. > > > > Cc: Arnd Bergmann > > Cc: Tony Lindgren > > Tested-by: Lokesh Vutla > > Signed-off-by: Santosh Shilimkar > > --- > > Patch just moves OMAP interconnect drivers as is to the newly created > > driver/bus/* directory. Patch is generated against "arm-soc/drivers/ocp2scp" > > tree and test on all OMAP boards. > > Great, looks like this should not conflict with other > omap patches queued, so Arnd should probably take this into > the bus branch: > > Acked-by: Tony Lindgren It turns out that the patch actually did conflict and we now have a broken omap2plus_defconfig. The patch below seems to fix it, but please verify that this makes sense. Signed-off-by: Arnd Bergmann Acked-by: Tony Lindgren Acked-by: Santosh Shilimkar diff --git a/drivers/bus/omap_l3_noc.c b/drivers/bus/omap_l3_noc.c index f447e02..ab911a3 100644 --- a/drivers/bus/omap_l3_noc.c +++ b/drivers/bus/omap_l3_noc.c @@ -28,7 +28,6 @@ #include #include -#include "soc.h" #include "omap_l3_noc.h" /* @@ -191,7 +190,7 @@ static int __devinit omap4_l3_probe(struct platform_device *pdev) IRQF_DISABLED, "l3-dbg-irq", l3); if (ret) { pr_crit("L3: request_irq failed to register for 0x%x\n", - 9 + OMAP44XX_IRQ_GIC_START); + l3->debug_irq); goto err3; } @@ -201,7 +200,7 @@ static int __devinit omap4_l3_probe(struct platform_device *pdev) IRQF_DISABLED, "l3-app-irq", l3); if (ret) { pr_crit("L3: request_irq failed to register for 0x%x\n", - 10 + OMAP44XX_IRQ_GIC_START); + l3->app_irq); goto err4; }