From patchwork Wed Mar 14 13:05: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: 7285 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 B435523DEE for ; Wed, 14 Mar 2012 13:05:19 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 7853EA18743 for ; Wed, 14 Mar 2012 13:05:19 +0000 (UTC) Received: by mail-iy0-f180.google.com with SMTP id e36so3119093iag.11 for ; Wed, 14 Mar 2012 06:05:19 -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=2UGtZfQn8vV/oPpyOTkykckLX69fp3v8R0t9a7ABFPk=; b=eVLTsAD5fdL0lzb4TjfPg7mAwXpahZleHUUuQRNVnQVKBmHnbyMMEoWhBYZiTCV8Xd glliimmT7RogXZOrfMFQDli641GagPnio9UDXK6hvsKxcErwvahAeJuuRaGiTiJjwTVL 6kJNlegjm6V/gaBqzKjDO+xcHKtMi9nbYeY8eNUUGPEuUqpg9rMa/aUYxYy0SdsyK6Js RCFnNUNJnifPNpSniIfu5F+bPZWrigfBdiqudonHavvlLc0fbiOG6HXZ3iZzHn1Xownd 2ur6/u3QzVFrK4FbdykcuvsVJV2onFZY69p5dfQjWqAgAx8q/kFyTmRR0FubcAwQtlUp WHwg== Received: by 10.42.147.199 with SMTP id o7mr3491321icv.50.1331730319264; Wed, 14 Mar 2012 06:05:19 -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.231.53.18 with SMTP id k18csp9543ibg; Wed, 14 Mar 2012 06:05:18 -0700 (PDT) Received: by 10.180.106.9 with SMTP id gq9mr6177020wib.17.1331730317717; Wed, 14 Mar 2012 06:05:17 -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 v6si4831623weq.146.2012.03.14.06.05.17 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 14 Mar 2012 06:05:17 -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 a13so2184022wer.37 for ; Wed, 14 Mar 2012 06:05:17 -0700 (PDT) Received: by 10.180.80.9 with SMTP id n9mr2168499wix.4.1331730317174; Wed, 14 Mar 2012 06:05:17 -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 fi4sm11477024wib.4.2012.03.14.06.05.15 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 14 Mar 2012 06:05:16 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org Cc: linus.walleij@linaro.org, arnd@arndb.de, niklas.hernaeus@stericsson.com, Lee Jones Subject: [PATCH 04/10] ARM: ux500: split dts file for snowball into generic part Date: Wed, 14 Mar 2012 13:05:00 +0000 Message-Id: <1331730306-11461-5-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1331730306-11461-1-git-send-email-lee.jones@linaro.org> References: <1331730306-11461-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQlKDkBvh9S0ZKS6sE3nFAx6MbdvQkASbgOskMjw4LkYcfsufLg6muerv/FuzVPN6BYsFSIU From: Arnd Bergmann db8500.dtsi can be used by all systems with a db8500 or db9500 SoC, while snowball.dts is board specific. Signed-off-by: Arnd Bergmann Signed-off-by: Lee Jones --- arch/arm/boot/dts/db8500.dtsi | 21 +++++++++++++++++++++ arch/arm/boot/dts/snowball.dts | 8 +------- 2 files changed, 22 insertions(+), 7 deletions(-) create mode 100644 arch/arm/boot/dts/db8500.dtsi diff --git a/arch/arm/boot/dts/db8500.dtsi b/arch/arm/boot/dts/db8500.dtsi new file mode 100644 index 0000000..50c84b2 --- /dev/null +++ b/arch/arm/boot/dts/db8500.dtsi @@ -0,0 +1,21 @@ +/* + * Copyright 2012 Linaro Ltd + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 or later at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + */ + +/include/ "skeleton.dtsi" + +/ { + soc-u9500 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "simple-bus"; + ranges; + }; +}; diff --git a/arch/arm/boot/dts/snowball.dts b/arch/arm/boot/dts/snowball.dts index ebcff9a..0ea9470 100644 --- a/arch/arm/boot/dts/snowball.dts +++ b/arch/arm/boot/dts/snowball.dts @@ -10,22 +10,16 @@ */ /dts-v1/; +/include/ "db8500.dtsi" / { model = "Calao Systems Snowball platform with device tree"; compatible = "calaosystems,snowball-a9500"; - #address-cells = <1>; - #size-cells = <1>; - memory { reg = <0x00000000 0x20000000>; }; soc-u9500 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "simple-bus"; - ranges; }; };