From patchwork Thu Dec 12 13:31:36 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 22289 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vb0-f71.google.com (mail-vb0-f71.google.com [209.85.212.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6346E23FC9 for ; Thu, 12 Dec 2013 13:31:49 +0000 (UTC) Received: by mail-vb0-f71.google.com with SMTP id p6sf707883vbe.2 for ; Thu, 12 Dec 2013 05:31:49 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=njcECnK5GnKzW4yyYHQBXvXjq7s4qqwskeB1ik0uyZ0=; b=ELHPJTk32qc/bk2N4VXx8m6NRPsOcN0IoshhdTTmcR0AUzqncoCWr/6hsGkjXVB2Fc sgtoEg1SE+Thx3QvPdLw/VqZPN5yxoW2Vjcz7omsftZxcCwwVAu8MO70+lJWXDlsOo28 kscphJbaYjgfaCjGocunHabno6KsBAEvA88XSR1Gt/CdN5FGvmyZ3xnVFP3j6UC25mh2 gtjSmapJf0WzKjAzHTyKupuWkMbyPHDrrMrPA5igz5S6ggF9pGzdma+U/2SQ9wmhgUZ4 hz2QHkwqoQIJSwO83jkGA5hbe5yQhMNnUGnODn0MMX1UxKkH5lbWP+ZhQr/hdjrfOlhC LHmg== X-Gm-Message-State: ALoCoQn1hmuwh43Plbp/yuROTw1Scw07OznpuOGIQFHZLrUXVmeYkqcz5biYkuowg8ue2PIcukoQ X-Received: by 10.224.70.66 with SMTP id c2mr1229576qaj.4.1386855109225; Thu, 12 Dec 2013 05:31:49 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.71.237 with SMTP id y13ls538424qeu.2.gmail; Thu, 12 Dec 2013 05:31:49 -0800 (PST) X-Received: by 10.221.19.5 with SMTP id qi5mr3798977vcb.15.1386855109102; Thu, 12 Dec 2013 05:31:49 -0800 (PST) Received: from mail-ve0-f173.google.com (mail-ve0-f173.google.com [209.85.128.173]) by mx.google.com with ESMTPS id pu5si7701741veb.135.2013.12.12.05.31.49 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 12 Dec 2013 05:31:49 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.173 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.173; Received: by mail-ve0-f173.google.com with SMTP id oz11so283723veb.4 for ; Thu, 12 Dec 2013 05:31:49 -0800 (PST) X-Received: by 10.52.111.200 with SMTP id ik8mr3196455vdb.2.1386855109019; Thu, 12 Dec 2013 05:31:49 -0800 (PST) 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.220.174.196 with SMTP id u4csp354608vcz; Thu, 12 Dec 2013 05:31:48 -0800 (PST) X-Received: by 10.152.120.102 with SMTP id lb6mr3680082lab.37.1386855108186; Thu, 12 Dec 2013 05:31:48 -0800 (PST) Received: from mail-la0-f45.google.com (mail-la0-f45.google.com [209.85.215.45]) by mx.google.com with ESMTPS id d10si9017312lae.112.2013.12.12.05.31.47 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 12 Dec 2013 05:31:48 -0800 (PST) Received-SPF: neutral (google.com: 209.85.215.45 is neither permitted nor denied by best guess record for domain of ulf.hansson@linaro.org) client-ip=209.85.215.45; Received: by mail-la0-f45.google.com with SMTP id eh20so317417lab.4 for ; Thu, 12 Dec 2013 05:31:47 -0800 (PST) X-Received: by 10.152.115.230 with SMTP id jr6mr3674181lab.45.1386855107310; Thu, 12 Dec 2013 05:31:47 -0800 (PST) Received: from linaro-ulf.lan (90-231-160-185-no158.tbcn.telia.com. [90.231.160.185]) by mx.google.com with ESMTPSA id di11sm34838833lac.0.2013.12.12.05.31.45 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 12 Dec 2013 05:31:46 -0800 (PST) From: Ulf Hansson To: linux-arm-kernel@lists.infradead.org, Linus Walleij Cc: Lee Jones , Ulf Hansson , devicetree@vger.kernel.org Subject: [PATCH 1/3] ARM: ux500: Refactor common DT configs for sdi[n] devices Date: Thu, 12 Dec 2013 14:31:36 +0100 Message-Id: <1386855098-14272-2-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1386855098-14272-1-git-send-email-ulf.hansson@linaro.org> References: <1386855098-14272-1-git-send-email-ulf.hansson@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ulf.hansson@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.173 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: , Remove duplicated configurations and move specific details into each corresponding dtsi file for the href versions. Cc: Lee Jones Cc: devicetree@vger.kernel.org Signed-off-by: Ulf Hansson --- arch/arm/boot/dts/ste-href.dtsi | 2 -- arch/arm/boot/dts/ste-hrefprev60.dtsi | 5 ++++ arch/arm/boot/dts/ste-hrefv60plus.dtsi | 39 -------------------------------- 3 files changed, 5 insertions(+), 41 deletions(-) diff --git a/arch/arm/boot/dts/ste-href.dtsi b/arch/arm/boot/dts/ste-href.dtsi index e282421..0c1e8d8 100644 --- a/arch/arm/boot/dts/ste-href.dtsi +++ b/arch/arm/boot/dts/ste-href.dtsi @@ -124,8 +124,6 @@ pinctrl-0 = <&sdi0_default_mode>; pinctrl-1 = <&sdi0_sleep_mode>; - cd-gpios = <&tc3589x_gpio 3 0x4>; - status = "okay"; }; diff --git a/arch/arm/boot/dts/ste-hrefprev60.dtsi b/arch/arm/boot/dts/ste-hrefprev60.dtsi index b0f5def..af9914e 100644 --- a/arch/arm/boot/dts/ste-hrefprev60.dtsi +++ b/arch/arm/boot/dts/ste-hrefprev60.dtsi @@ -60,6 +60,11 @@ pinctrl-0 = <&ssp0_hrefprev60_mode>; }; + // External Micro SD slot + sdi0_per1@80126000 { + cd-gpios = <&tc3589x_gpio 3 0x4>; + }; + vmmci: regulator-gpio { gpios = <&tc3589x_gpio 18 0x4>; enable-gpio = <&tc3589x_gpio 17 0x4>; diff --git a/arch/arm/boot/dts/ste-hrefv60plus.dtsi b/arch/arm/boot/dts/ste-hrefv60plus.dtsi index 941bf9a..1f7b46b 100644 --- a/arch/arm/boot/dts/ste-hrefv60plus.dtsi +++ b/arch/arm/boot/dts/ste-hrefv60plus.dtsi @@ -19,46 +19,7 @@ soc { // 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 = <&gpio2 31 0x4>; // 95 - - status = "okay"; - }; - - // WLAN SDIO channel - sdi1_per2@80118000 { - arm,primecell-periphid = <0x10480180>; - max-frequency = <100000000>; - bus-width = <4>; - - status = "okay"; - }; - - // PoP:ed eMMC - sdi2_per3@80005000 { - arm,primecell-periphid = <0x10480180>; - max-frequency = <100000000>; - bus-width = <8>; - mmc-cap-mmc-highspeed; - - 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"; }; pinctrl {