From patchwork Wed Oct 24 14:45:25 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 12481 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 45B3023F58 for ; Wed, 24 Oct 2012 14:45:57 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id DDE24A187E0 for ; Wed, 24 Oct 2012 14:45:56 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so731028iej.11 for ; Wed, 24 Oct 2012 07:45:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=kxBiTe0WmPeJie6mvr15Cu02+TArRgUkIHwGAYuWU7k=; b=TRx9LOtNGUQH5EksED16zIwOZnRzbTBsFkCAR5z1ple4RJdL5HygO9u+qa6fLCFaKk 0v67IKFw75ZROnzcYHjT3u2C4n8kXSAlvMw4YGmvhVSkHFKSpf4Xnu8J+q8gj0F3Bsd+ db+IYB3cyZDupw9pa831pBmwhDk3oNswQh+WbDP2+tRMzl+KGnMG9O/fFiNixzovExg3 ABZ7sZDngWGTgdvMHzFUgcormjFTvx5/QFOomUUGMSzbIWmMvWPJtz5CDcwzDKHjadVT Cm49NmTiCq9F5dEW0TfIbW6QfVySn3gzmOKCW8WRgOwuGISImOQp2/D6f9KrpXvjzxet ToSA== Received: by 10.50.168.37 with SMTP id zt5mr2623455igb.57.1351089956668; Wed, 24 Oct 2012 07:45:56 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.67.148 with SMTP id n20csp625510igt; Wed, 24 Oct 2012 07:45:55 -0700 (PDT) Received: by 10.216.141.38 with SMTP id f38mr10088116wej.196.1351089954979; Wed, 24 Oct 2012 07:45:54 -0700 (PDT) Received: from mail-we0-f178.google.com (mail-we0-f178.google.com [74.125.82.178]) by mx.google.com with ESMTPS id d9si15983457weq.156.2012.10.24.07.45.54 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 24 Oct 2012 07:45:54 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.178 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=74.125.82.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.178 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) smtp.mail=lee.jones@linaro.org Received: by mail-we0-f178.google.com with SMTP id r6so385536wey.37 for ; Wed, 24 Oct 2012 07:45:54 -0700 (PDT) Received: by 10.216.132.215 with SMTP id o65mr10157102wei.100.1351089954433; Wed, 24 Oct 2012 07:45:54 -0700 (PDT) Received: from localhost.localdomain (cpc1-aztw13-0-0-cust473.18-1.cable.virginmedia.com. [77.102.241.218]) by mx.google.com with ESMTPS id bn7sm5295273wib.8.2012.10.24.07.45.52 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 24 Oct 2012 07:45:53 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: arnd@arndb.de, linus.walleij@stericsson.com, Lee Jones Subject: [PATCH 5/6] ARM: ux500: Correct SDI5 address and add some format changes Date: Wed, 24 Oct 2012 15:45:25 +0100 Message-Id: <1351089926-32161-6-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1351089926-32161-1-git-send-email-lee.jones@linaro.org> References: <1351089926-32161-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQnkoKWHwC9ov8bPaGz7eHusLuTxUBcHXtFQeIbqBrTNpCZ5GLvfV0fNX38SWnr5OqkhdmSV Here we fix a simple copy and paste error and bring some node spaces back into line with the remainder of the tree. Signed-off-by: Lee Jones --- arch/arm/boot/dts/dbx5x0.dtsi | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/dbx5x0.dtsi b/arch/arm/boot/dts/dbx5x0.dtsi index 4ed1b4b..7ce45fc 100644 --- a/arch/arm/boot/dts/dbx5x0.dtsi +++ b/arch/arm/boot/dts/dbx5x0.dtsi @@ -552,33 +552,38 @@ interrupts = <0 60 0x4>; status = "disabled"; }; + sdi1_per2@80118000 { compatible = "arm,pl18x", "arm,primecell"; reg = <0x80118000 0x1000>; interrupts = <0 50 0x4>; status = "disabled"; }; + sdi2_per3@80005000 { compatible = "arm,pl18x", "arm,primecell"; reg = <0x80005000 0x1000>; interrupts = <0 41 0x4>; status = "disabled"; }; + sdi3_per2@80119000 { compatible = "arm,pl18x", "arm,primecell"; reg = <0x80119000 0x1000>; interrupts = <0 59 0x4>; status = "disabled"; }; + sdi4_per2@80114000 { compatible = "arm,pl18x", "arm,primecell"; reg = <0x80114000 0x1000>; interrupts = <0 99 0x4>; status = "disabled"; }; + sdi5_per3@80008000 { compatible = "arm,pl18x", "arm,primecell"; - reg = <0x80114000 0x1000>; + reg = <0x80008000 0x1000>; interrupts = <0 100 0x4>; status = "disabled"; };