From patchwork Tue Sep 25 00:02:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Hesselbarth X-Patchwork-Id: 1501581 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 26F0FDF280 for ; Tue, 25 Sep 2012 00:05:13 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TGIcR-0005Fi-Mm; Tue, 25 Sep 2012 00:03:20 +0000 Received: from mail-wi0-f171.google.com ([209.85.212.171]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TGIc2-0005AR-ML for linux-arm-kernel@lists.infradead.org; Tue, 25 Sep 2012 00:02:56 +0000 Received: by wibhq4 with SMTP id hq4so4126472wib.0 for ; Mon, 24 Sep 2012 17:02:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=zw6Gi0BzjbYJRXUgRmekEStUfjCtrm2wCYuszuGQ4iY=; b=oJ3VTF9h55kY0lguhwEcoYCDfNMFeF8G/BWa3VJuc6SOAqCwhdVYjm+iA9zfgoejp0 yvWlgU4VZD/m4V7S/Wo3CqB+OY0IOV/uKFOTJiKVQ3J0NSnwB9ebZ0qarkZFcKcUxjNJ ta5OOyUaBW2JcF+06oWnZhQrE7GkvPeu5kfzwxezJYb7a+r4dee3NzT3CjCkIUcOWnm/ xCh24g8m56F04vzZteiaEcOon5WcqxNqQ/eeD2baXmS/Ps2l27WTuz8iufGjviG8gZnd 4bSCbaLWfKrY9AqNAFZjjRZT1v2S+sIK9plSW8UVN0Bd0TxhC9Cpr3JKqTu58qEWWWjO AuSA== Received: by 10.216.214.92 with SMTP id b70mr8811907wep.86.1348531371770; Mon, 24 Sep 2012 17:02:51 -0700 (PDT) Received: from localhost.localdomain (dslc-082-083-232-154.pools.arcor-ip.net. [82.83.232.154]) by mx.google.com with ESMTPS id hv8sm23854876wib.0.2012.09.24.17.02.47 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 24 Sep 2012 17:02:49 -0700 (PDT) From: Sebastian Hesselbarth To: Sebastian Hesselbarth Subject: [PATCH 2/6] ARM: dove: Fix tauros2 device tree init Date: Tue, 25 Sep 2012 02:02:14 +0200 Message-Id: <1348531338-16624-3-git-send-email-sebastian.hesselbarth@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1348531338-16624-1-git-send-email-sebastian.hesselbarth@gmail.com> References: <1348531338-16624-1-git-send-email-sebastian.hesselbarth@gmail.com> X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.212.171 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (sebastian.hesselbarth[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Andrew Lunn , Russell King , Jason Cooper , Arnd Bergmann , linux-kernel@vger.kernel.org, Olof Johansson , 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: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org During the review process of dove DT patches, Tauros2 cache init call was changed and DT support added. This patch fixes the call to Tauros2 init and adds a DT node. Moreover, plat/irq.h include was missing from mach-dove/common.c. Signed-off-by: Sebastian Hesselbarth --- Cc: Russell King Cc: Jason Cooper Cc: Andrew Lunn Cc: Olof Johansson Cc: Arnd Bergmann Cc: Sebastian Hesselbarth Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org --- arch/arm/boot/dts/dove.dtsi | 5 +++++ arch/arm/mach-dove/common.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi index 96fb824..3f41f50 100644 --- a/arch/arm/boot/dts/dove.dtsi +++ b/arch/arm/boot/dts/dove.dtsi @@ -20,6 +20,11 @@ #address-cells = <1>; #size-cells = <1>; + l2: l2-cache { + compatible = "marvell,tauros2-cache"; + marvell,tauros2-cache-features = <0>; + }; + uart0: serial@12000 { compatible = "ns16550a"; reg = <0x12000 0x100>; diff --git a/arch/arm/mach-dove/common.c b/arch/arm/mach-dove/common.c index b37bef1..343a4bc 100644 --- a/arch/arm/mach-dove/common.c +++ b/arch/arm/mach-dove/common.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include "common.h" @@ -399,7 +400,7 @@ static void __init dove_dt_init(void) (dove_tclk + 499999) / 1000000); #ifdef CONFIG_CACHE_TAUROS2 - tauros2_init(); + tauros2_init(0); #endif dove_setup_cpu_mbus();