From patchwork Mon Sep 10 08:39:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Hesselbarth X-Patchwork-Id: 1430401 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 3DDABDF28C for ; Mon, 10 Sep 2012 08:46:07 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TAzZP-0002VC-6v; Mon, 10 Sep 2012 08:42:15 +0000 Received: from mail-ey0-f177.google.com ([209.85.215.177]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TAzXd-0001dW-L0 for linux-arm-kernel@lists.infradead.org; Mon, 10 Sep 2012 08:40:31 +0000 Received: by mail-ey0-f177.google.com with SMTP id i12so706665eaa.36 for ; Mon, 10 Sep 2012 01:40:25 -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=jgpifPbUO/uODSyA2C7px804p/+OhzV/R4P0b4trFMg=; b=0rPxuz1vh5Bk0lGhgDw1fe2AI+DXU8Xc72tuzYxnw/JixpLrRRNsFEBJtWlqLf/UdO 94Ien49xS2a9+TdBbCc8z2Q85Epc9DA3tntPshVffAT5xZ9CROfsDxtmgcE0BFCVSy9S wj8ZdgWBPWNs6sD6PQvuZ6WqTilPpNoa8SEw8X0UXzCbA0m+R40exDf69BPW+IMcUGks UXyr2e0yd/XNNd4bs+LWs8Af6gQdV0/P1I8kwAWbnk1TJxCBTdBEcUOTvoolrcRgJTmg /EWl3CJjQgN6b5QjuXzjwLyNtHqkHOLFLzfxNCcD4WjHqh7F3DZYixQYwW3aaybNoI6R ssKg== Received: by 10.204.157.135 with SMTP id b7mr3449066bkx.61.1347266425200; Mon, 10 Sep 2012 01:40:25 -0700 (PDT) Received: from edge.mip.uni-hannover.de (ip164.241.mip.uni-hannover.de. [130.75.241.164]) by mx.google.com with ESMTPS id ht18sm6221835bkc.16.2012.09.10.01.40.22 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 10 Sep 2012 01:40:24 -0700 (PDT) From: Sebastian Hesselbarth To: Sebastian Hesselbarth Subject: [PATCH v3 9/9] ARM: mvebu: adjust Armada XP evaluation board DTS Date: Mon, 10 Sep 2012 10:39:46 +0200 Message-Id: <1347266386-16229-10-git-send-email-sebastian.hesselbarth@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1347266386-16229-1-git-send-email-sebastian.hesselbarth@gmail.com> References: <1345623750-10645-1-git-send-email-sebastian.hesselbarth@gmail.com> <1347266386-16229-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.215.177 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: Thomas Petazzoni , Lior Amsalem , Russell King , Jason Cooper , Andrew Lunn , Linus Walleij , Stephen Warren , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Rob Herring , Grant Likely , Ben Dooks , Rob Landley , Gregory CLEMENT , devicetree-discuss@lists.ozlabs.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: , 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 From: Thomas Petazzoni The Armada XP evaluation board is based on the MV78460 Armava XP SoC. Now that we have separate .dtsi files for the three different SoCs of the Armada XP family, use the appropriate one as include for the Armada XP evaluation board .dts file. Signed-off-by: Thomas Petazzoni Acked-by: Linus Walleij --- Cc: Sebastian Hesselbarth Cc: Thomas Petazzoni Cc: Grant Likely Cc: Rob Herring Cc: Rob Landley Cc: Russell King Cc: Lior Amsalem Cc: Andrew Lunn Cc: Jason Cooper Cc: Gregory CLEMENT Cc: Ben Dooks Cc: Linus Walleij Cc: Stephen Warren Cc: devicetree-discuss@lists.ozlabs.org Cc: linux-doc@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org --- arch/arm/boot/dts/armada-xp-db.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/armada-xp-db.dts b/arch/arm/boot/dts/armada-xp-db.dts index f97040d..b1fc728 100644 --- a/arch/arm/boot/dts/armada-xp-db.dts +++ b/arch/arm/boot/dts/armada-xp-db.dts @@ -14,11 +14,11 @@ */ /dts-v1/; -/include/ "armada-xp.dtsi" +/include/ "armada-xp-mv78460.dtsi" / { model = "Marvell Armada XP Evaluation Board"; - compatible = "marvell,axp-db", "marvell,armadaxp", "marvell,armada-370-xp"; + compatible = "marvell,axp-db", "marvell,armadaxp-mv78460", "marvell,armadaxp", "marvell,armada-370-xp"; chosen { bootargs = "console=ttyS0,115200 earlyprintk";