From patchwork Thu Sep 27 15:12:00 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 11765 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 CF9ED23E54 for ; Thu, 27 Sep 2012 15:12:23 +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 7BFD2A18852 for ; Thu, 27 Sep 2012 15:12:23 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so4450868iej.11 for ; Thu, 27 Sep 2012 08:12:23 -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=YdGEleuffsQRP42y93FD3+RzHLgfv8KSRjxm175Xv4LIkl+H4aWeD8APNTSwHIQU1r CZjTD+8uZuvdwyBFeKeOKqPr0/SfNEWTFiG1wSSYKAsg69pDc2JPLeNWCwGxLLrL+aRS ehDqPZRm0nCvg7sgVLPqO/uqhGGdeZ6CsZKBkfKG7Z0iGEit+e01GZgd0snN2aRiOqgL rXXNsV93jehGlEL9Y/RY6L+l1s2Ng74HpK5Xs25eGe+rgUTz0cGLsRS7IwT7OG9SbvJw KDq5wR4C1nVp71+eTQ6VKNn0bAcyk2G1622z2yxH32+or43gsfGwCsc9Jy30TrGh7sjP wTsg== Received: by 10.50.160.165 with SMTP id xl5mr5063029igb.0.1348758743285; Thu, 27 Sep 2012 08:12:23 -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 ex8csp420828igc; Thu, 27 Sep 2012 08:12:22 -0700 (PDT) Received: by 10.180.94.226 with SMTP id df2mr37350511wib.11.1348758741199; Thu, 27 Sep 2012 08:12:21 -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 m46si7057232wea.138.2012.09.27.08.12.20 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 27 Sep 2012 08:12:21 -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 weyr6 with SMTP id r6so811595wey.37 for ; Thu, 27 Sep 2012 08:12:20 -0700 (PDT) Received: by 10.216.255.148 with SMTP id j20mr1548337wes.106.1348758740592; Thu, 27 Sep 2012 08:12:20 -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 t7sm13643780wix.6.2012.09.27.08.12.19 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 27 Sep 2012 08:12:19 -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: Thu, 27 Sep 2012 16:12:00 +0100 Message-Id: <1348758726-25336-2-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1348758726-25336-1-git-send-email-lee.jones@linaro.org> References: <1348758726-25336-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQnNZDuocTvosX8p/U0MoEcA4+qR2tC/yclJCSxTBFvPJRkssvXvSY/ier1FtMASiLLzf2i2 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>;