From patchwork Sat Aug 11 12:56:47 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Hesselbarth X-Patchwork-Id: 1308491 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id AB7463FC33 for ; Sat, 11 Aug 2012 13:02: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 1T0BHc-0006IJ-LA; Sat, 11 Aug 2012 12:59:12 +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 1T0BG0-0005fO-Hq for linux-arm-kernel@lists.infradead.org; Sat, 11 Aug 2012 12:57:35 +0000 Received: by bkcji2 with SMTP id ji2so974260bkc.36 for ; Sat, 11 Aug 2012 05:57:31 -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=WVzOtin1Oby0h7YSGoLUM8lFxRaRJCuKLTtOijE2vPA=; b=E4I/ycQwOgsQ9LR+eIw01wMnNKeaAwkGjsBiBf3jmBFeoW3Nix/qA1/ie7jZf55buC Piry9S1+yE203RxEoAqaFZHaN5wlOoNZ5uqxxhTIdcoQ5ZurUEPmJWTntOomyAkuJJth NbrRxQ4zQdqMMkmyjuFz/PBVTf4grabOrW6waIZnVmpHtHmKgtfE2D8lZy50FFtwo0Zo D4jLlnZvYhxtNK7Q9MKL4dpRmhWIEVbe74uppy0Aesie1BoZCxcGYefFAy8MxmfjSRDU nBZnPinFkBNtL0Y/FqB2vz9vjdMlx2ML4ZKFJSMqq0B0XEX7mVap5nOfRkLJekplxRqc Q2mg== Received: by 10.204.154.85 with SMTP id n21mr705545bkw.48.1344689851209; Sat, 11 Aug 2012 05:57:31 -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 hg13sm548931bkc.7.2012.08.11.05.57.29 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 11 Aug 2012 05:57:30 -0700 (PDT) From: Sebastian Hesselbarth To: Sebastian Hesselbarth Subject: [PATCH 09/11] ARM: mvebu: adjust Armada XP evaluation board DTS Date: Sat, 11 Aug 2012 14:56:47 +0200 Message-Id: <1344689809-6223-10-git-send-email-sebastian.hesselbarth@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1344689809-6223-1-git-send-email-sebastian.hesselbarth@gmail.com> References: <1344689809-6223-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 , Andrew Lunn , Linus Walleij , 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: Grant Likely Cc: Rob Herring Cc: Rob Landley Cc: Russell King Cc: Linus Walleij Cc: Lior Amsalem Cc: Andrew Lunn Cc: Gregory CLEMENT Cc: Ben Dooks Cc: Sebastian Hesselbarth Cc: Thomas Petazzoni 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";