From patchwork Fri Jul 19 14:13:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 18457 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qe0-f70.google.com (mail-qe0-f70.google.com [209.85.128.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id F0F8F25E49 for ; Fri, 19 Jul 2013 14:14:17 +0000 (UTC) Received: by mail-qe0-f70.google.com with SMTP id 2sf5746428qea.5 for ; Fri, 19 Jul 2013 07:14:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-beenthere:x-forwarded-to:x-forwarded-for :delivered-to:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=oiWqSLUL/ycEwd4K5PPmDhzNtRlyjAoOwuaTbh6rxOE=; b=HrH5StXJmtL5/Ask2SNIS/xxcjQDtyh+8Y3UMVBm6Etp8CDILXcxXpJCNo04QqeqWM w9TxTQSxWPYiQG99yUn9aMZLIdBe8UNzy+u/KGBsu9uwnQHzEYk+apTENJ+0Ft9bdFb7 KUjRszvAa2cXD2A4u9WL/s17mrEKpp+Ztts0hC/ghapLeorLd4ybjU0IGaCIYylF0h8B 0AU/ecNvtoqYup/J3nj1XQlifcqhcR2xlbWSWApQ84lJXkecXSMN4SGH+zcjTYklv0Wd vIakGDXdycVnq1g8hNN8xoxpOylaIiSYhaJegfd1eMi+Kj6OOAm82pUU0oeWc5Cz1gf5 zOsA== X-Received: by 10.52.70.34 with SMTP id j2mr164668vdu.4.1374243257762; Fri, 19 Jul 2013 07:14:17 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.49.135 with SMTP id u7ls1663742qen.3.gmail; Fri, 19 Jul 2013 07:14:17 -0700 (PDT) X-Received: by 10.58.118.70 with SMTP id kk6mr5764269veb.1.1374243257634; Fri, 19 Jul 2013 07:14:17 -0700 (PDT) Received: from mail-ve0-f174.google.com (mail-ve0-f174.google.com [209.85.128.174]) by mx.google.com with ESMTPS id u1si3037686vcx.58.2013.07.19.07.14.17 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 19 Jul 2013 07:14:17 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.174 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.174; Received: by mail-ve0-f174.google.com with SMTP id oz10so3442834veb.19 for ; Fri, 19 Jul 2013 07:14:17 -0700 (PDT) X-Received: by 10.58.251.144 with SMTP id zk16mr5603684vec.37.1374243257507; Fri, 19 Jul 2013 07:14:17 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.58.165.8 with SMTP id yu8csp27451veb; Fri, 19 Jul 2013 07:14:16 -0700 (PDT) X-Received: by 10.15.22.199 with SMTP id f47mr16306881eeu.47.1374243256478; Fri, 19 Jul 2013 07:14:16 -0700 (PDT) Received: from mail-ea0-f179.google.com (mail-ea0-f179.google.com [209.85.215.179]) by mx.google.com with ESMTPS id z8si14177881eee.179.2013.07.19.07.14.16 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 19 Jul 2013 07:14:16 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.215.179 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=209.85.215.179; Received: by mail-ea0-f179.google.com with SMTP id b15so2414140eae.24 for ; Fri, 19 Jul 2013 07:14:16 -0700 (PDT) X-Received: by 10.14.87.133 with SMTP id y5mr16190356eee.50.1374243255915; Fri, 19 Jul 2013 07:14:15 -0700 (PDT) Received: from localhost.localdomain (cpc34-aztw25-2-0-cust250.18-1.cable.virginmedia.com. [86.16.136.251]) by mx.google.com with ESMTPSA id n45sm27826039eew.1.2013.07.19.07.14.14 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 19 Jul 2013 07:14:15 -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 13/13] ARM: ux500: Remove u9540.dts as it's been replaced Date: Fri, 19 Jul 2013 15:13:49 +0100 Message-Id: <1374243229-8585-14-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1374243229-8585-1-git-send-email-lee.jones@linaro.org> References: <1374243229-8585-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQmi/8aWNctj7eqk6D3954VZdrFvvbnp5cCiEYdcTqkK3HxydFGvu/MPgiPcfduTLay0QF0r X-Original-Sender: lee.jones@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.174 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This must have been a merge error. There was a patch which renamed the u9540.dts to ccu9540.dts, however the u9540.dts was reincarnate with the same patches which created it in the first place. Let's kill it once and for all. Signed-off-by: Lee Jones --- arch/arm/boot/dts/u9540.dts | 72 --------------------------------------------- 1 file changed, 72 deletions(-) delete mode 100644 arch/arm/boot/dts/u9540.dts diff --git a/arch/arm/boot/dts/u9540.dts b/arch/arm/boot/dts/u9540.dts deleted file mode 100644 index 95892ec..0000000 --- a/arch/arm/boot/dts/u9540.dts +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright 2012 ST-Ericsson AB - * - * 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 - */ - -/dts-v1/; -/include/ "dbx5x0.dtsi" - -/ { - model = "ST-Ericsson U9540 platform with Device Tree"; - compatible = "st-ericsson,u9540"; - - memory { - reg = <0x00000000 0x20000000>; - }; - - soc-u9500 { - uart@80120000 { - status = "okay"; - }; - - uart@80121000 { - status = "okay"; - }; - - uart@80007000 { - status = "okay"; - }; - - // External Micro SD slot - sdi0_per1@80126000 { - arm,primecell-periphid = <0x10480180>; - max-frequency = <100000000>; - bus-width = <4>; - mmc-cap-sd-highspeed; - mmc-cap-mmc-highspeed; - vmmc-supply = <&ab8500_ldo_aux3_reg>; - - cd-gpios = <&gpio7 6 0x4>; // 230 - cd-inverted; - - status = "okay"; - }; - - - // WLAN SDIO channel - sdi1_per2@80118000 { - arm,primecell-periphid = <0x10480180>; - max-frequency = <50000000>; - bus-width = <4>; - - status = "okay"; - }; - - // On-board eMMC - sdi4_per2@80114000 { - arm,primecell-periphid = <0x10480180>; - max-frequency = <100000000>; - bus-width = <8>; - mmc-cap-mmc-highspeed; - vmmc-supply = <&ab8500_ldo_aux2_reg>; - - status = "okay"; - }; - }; -};