From patchwork Mon Oct 1 10:43:42 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 11882 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 D910A23E57 for ; Mon, 1 Oct 2012 10:44:08 +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 3836DA18AE8 for ; Mon, 1 Oct 2012 10:44:07 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so11252231iej.11 for ; Mon, 01 Oct 2012 03:44:07 -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=ao7czTIycnSQ0N+AKhExtsYmlzsYbL5fJxCVzwgzU0c=; b=R6LaFm05giqBrD0/yVckGCHSx/9yNAmKxAeoHIo3XyrBs91BChDbkkJcKVRJSnbwJV o087W79inlVuJm87RqEyg5CtAGJiHaQxbyHskDNtHKmp4PzYI8+XTOvOSX/8dIT9KCTE RDjmdPY4WGboitJu8wE6B6MslQe730MHCt9IjTzE5wJ3+e3PxbHwj2i9uMNRN5QQHy8x sdJdZHasa4ozpPOZOGRf8ZKA9tN3Ryc48t125LxfsZbD0rwz/iOlUKDTp19Ey/0ARlxf Q+wt/ZBQGJkYHOsdnO2r8lX3cmYsnkKKNypPfTD0GmjCKXTemZkpxgU9MK7s5J/3YTFH mjRQ== Received: by 10.50.154.227 with SMTP id vr3mr5213589igb.43.1349088247684; Mon, 01 Oct 2012 03:44:07 -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.184.232 with SMTP id ex8csp17885igc; Mon, 1 Oct 2012 03:44:06 -0700 (PDT) Received: by 10.180.90.201 with SMTP id by9mr13759376wib.5.1349088245152; Mon, 01 Oct 2012 03:44:05 -0700 (PDT) Received: from mail-wg0-f50.google.com (mail-wg0-f50.google.com [74.125.82.50]) by mx.google.com with ESMTPS id l58si7484929wep.112.2012.10.01.03.44.04 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 01 Oct 2012 03:44:05 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.50 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=74.125.82.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.50 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) smtp.mail=lee.jones@linaro.org Received: by wgi16 with SMTP id 16so1699759wgi.31 for ; Mon, 01 Oct 2012 03:44:04 -0700 (PDT) Received: by 10.216.45.144 with SMTP id p16mr7806932web.170.1349088244375; Mon, 01 Oct 2012 03:44:04 -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 v3sm15856944wiw.7.2012.10.01.03.44.02 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 01 Oct 2012 03:44:03 -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 1/7] ARM: ux500: Elaborate on SDI device node names in Device Tree Date: Mon, 1 Oct 2012 11:43:42 +0100 Message-Id: <1349088228-8582-2-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1349088228-8582-1-git-send-email-lee.jones@linaro.org> References: <1349088228-8582-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQmgAILtY4lMY1mAbtLIBtSe2jQ0FPARdVvNVMqApsKCE9ewBbVFWWizTbOFNZ74ab37tbr2 In the DB8500 Reference Manual SDI devices are described as being part of peripheral blocks. This is more in line with how these devices are actually represented in hardware, so here we detail which peripheral block each of the SDI devices belong in the node name. Requested-by: Linus Walleij Acked-by: Linus Walleij Signed-off-by: Lee Jones --- arch/arm/boot/dts/dbx5x0.dtsi | 12 ++++++------ arch/arm/boot/dts/snowball.dts | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm/boot/dts/dbx5x0.dtsi b/arch/arm/boot/dts/dbx5x0.dtsi index c8c39dd..07a085b 100644 --- a/arch/arm/boot/dts/dbx5x0.dtsi +++ b/arch/arm/boot/dts/dbx5x0.dtsi @@ -536,37 +536,37 @@ status = "disabled"; }; - sdi@80126000 { + sdi0_per1@80126000 { compatible = "arm,pl18x", "arm,primecell"; reg = <0x80126000 0x1000>; interrupts = <0 60 0x4>; status = "disabled"; }; - sdi@80118000 { + sdi1_per2@80118000 { compatible = "arm,pl18x", "arm,primecell"; reg = <0x80118000 0x1000>; interrupts = <0 50 0x4>; status = "disabled"; }; - sdi@80005000 { + sdi2_per3@80005000 { compatible = "arm,pl18x", "arm,primecell"; reg = <0x80005000 0x1000>; interrupts = <0 41 0x4>; status = "disabled"; }; - sdi@80119000 { + sdi3_per2@80119000 { compatible = "arm,pl18x", "arm,primecell"; reg = <0x80119000 0x1000>; interrupts = <0 59 0x4>; status = "disabled"; }; - sdi@80114000 { + sdi4_per2@80114000 { compatible = "arm,pl18x", "arm,primecell"; reg = <0x80114000 0x1000>; interrupts = <0 99 0x4>; status = "disabled"; }; - sdi@80008000 { + sdi5_per3@80008000 { compatible = "arm,pl18x", "arm,primecell"; reg = <0x80114000 0x1000>; interrupts = <0 100 0x4>; diff --git a/arch/arm/boot/dts/snowball.dts b/arch/arm/boot/dts/snowball.dts index 639b8e9..9a37244 100644 --- a/arch/arm/boot/dts/snowball.dts +++ b/arch/arm/boot/dts/snowball.dts @@ -120,7 +120,7 @@ }; // External Micro SD slot - sdi@80126000 { + sdi0_per1@80126000 { arm,primecell-periphid = <0x10480180>; max-frequency = <50000000>; bus-width = <8>; @@ -134,7 +134,7 @@ }; // On-board eMMC - sdi@80114000 { + sdi4_per2@80114000 { arm,primecell-periphid = <0x10480180>; max-frequency = <50000000>; bus-width = <8>;