From patchwork Thu Sep 13 15:41:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Hesselbarth X-Patchwork-Id: 1453391 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (unknown [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 674D63FE79 for ; Thu, 13 Sep 2012 16:00:15 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TCBa7-0002PQ-Ce; Thu, 13 Sep 2012 15:43:55 +0000 Received: from mail-bk0-f49.google.com ([209.85.214.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TCBYk-00027B-8t for linux-arm-kernel@lists.infradead.org; Thu, 13 Sep 2012 15:42:37 +0000 Received: by mail-bk0-f49.google.com with SMTP id ji2so642161bkc.36 for ; Thu, 13 Sep 2012 08:42:29 -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=f75s9tpej3ljJQzSAraN0FSl9cTJ+yuUL2o5rc6NStRUSR/srrS6515Q84BQkD8Bo4 nUpxounVqTw94IBeKuRBwuBVGJXewW/fuEkvCQCa1Ny5m5p7aMxtOZA6O6hF8vWPH3a3 0GzYsVDPVlZ+zzqHVNVQvxQ6wVhI2zGrEi+B0oqtaQhak03thLhJhkCUfYXjChYONkIY UXOB9nONXqjdRGALHSrqqYhGBbXdJZixhMm1zACJafFhE8LTSUQ/xDGW32sMLY2Rjrrw WNadYNBspUIU955xyO9zSkZ756AyoVCO/CIce6/EfIuRSBoSEF7d9dEhtnG0NfQHgI8h SLGg== Received: by 10.205.136.194 with SMTP id il2mr1429313bkc.81.1347550949830; Thu, 13 Sep 2012 08:42:29 -0700 (PDT) Received: from edge.mip.uni-hannover.de (ip118.246.mip.uni-hannover.de. [130.75.246.118]) by mx.google.com with ESMTPS id 25sm14767959bkx.9.2012.09.13.08.42.27 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 13 Sep 2012 08:42:29 -0700 (PDT) From: Sebastian Hesselbarth To: Sebastian Hesselbarth Subject: [PATCH v4 08/10] ARM: mvebu: adjust Armada XP evaluation board DTS Date: Thu, 13 Sep 2012 17:41:50 +0200 Message-Id: <1347550912-18021-9-git-send-email-sebastian.hesselbarth@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1347550912-18021-1-git-send-email-sebastian.hesselbarth@gmail.com> References: <1344689809-6223-1-git-send-email-sebastian.hesselbarth@gmail.com> <1347550912-18021-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.214.49 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";