From patchwork Wed Aug 22 08:22:30 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Hesselbarth X-Patchwork-Id: 1360341 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 2C346DF280 for ; Wed, 22 Aug 2012 08:29:24 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T46G6-0000QT-HU; Wed, 22 Aug 2012 08:25:50 +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 1T46DM-0007hV-9P for linux-arm-kernel@lists.infradead.org; Wed, 22 Aug 2012 08:23:11 +0000 Received: by bkcji2 with SMTP id ji2so189232bkc.36 for ; Wed, 22 Aug 2012 01:22:59 -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=ZqlezrOXbHofnrnC+mUJYw3LDidfPtI1Igrj0SctRvo=; b=jvdvryursMPPiDhIFbA90W2en3Hko3/gKu14whXpWnNLJZCiJhUmKD0vREUK1V1Zbg 2FiauVzbCVEmpvmiENTGgpyy+gqtsSFjRhd/M4BPbzy0Sik6CaoAov1K/YCxvpyOAbKP Qn6DMmUSkGv8QMyU9kD44mwo7TSs9USK8G/K9YHZnghgQ6aZaGjTRSqpy83ATO5Hg8m0 2opJ1n2zk6gdu2tpVIY+sSPlX57Bwvv/hqsqEVmx1+r1iEVkj12yfOHwV9Y5Tq/J+9E7 T4TT/5r3hWxo2HrJ++6f+GINQcy3dAuQpRCYkjEpqLQ6NLURf/bR6McPAs54eHzs22uF MooA== Received: by 10.204.151.81 with SMTP id b17mr6260736bkw.95.1345623778960; Wed, 22 Aug 2012 01:22:58 -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 14sm2047890bkw.15.2012.08.22.01.22.56 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 22 Aug 2012 01:22:58 -0700 (PDT) From: Sebastian Hesselbarth To: Sebastian Hesselbarth Subject: [PATCH v2 9/9] ARM: mvebu: adjust Armada XP evaluation board DTS Date: Wed, 22 Aug 2012 10:22:30 +0200 Message-Id: <1345623750-10645-10-git-send-email-sebastian.hesselbarth@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1345623750-10645-1-git-send-email-sebastian.hesselbarth@gmail.com> References: <1344689809-6223-1-git-send-email-sebastian.hesselbarth@gmail.com> <1345623750-10645-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 , 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: Thomas Petazzoni Cc: Grant Likely Cc: Rob Herring Cc: Rob Landley Cc: Russell King Cc: Lior Amsalem Cc: Andrew Lunn 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";