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: 3331891 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id CE1ADC0D4A for ; Thu, 12 Dec 2013 13:33:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 30CED203AB for ; Thu, 12 Dec 2013 13:33:09 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5A18420640 for ; Thu, 12 Dec 2013 13:33:04 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vr6NQ-0006sR-2x; Thu, 12 Dec 2013 13:32:28 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vr6NK-0004Jf-78; Thu, 12 Dec 2013 13:32:22 +0000 Received: from mail-la0-f53.google.com ([209.85.215.53]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vr6N7-0004Gy-Ei for linux-arm-kernel@lists.infradead.org; Thu, 12 Dec 2013 13:32:10 +0000 Received: by mail-la0-f53.google.com with SMTP id mc6so299798lab.26 for ; Thu, 12 Dec 2013 05:31:47 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=njcECnK5GnKzW4yyYHQBXvXjq7s4qqwskeB1ik0uyZ0=; b=MUctyFNNAUhD4h+XH5MehotmPdCjlt/bEDuU55TyreKCwO1qbsbE2h9HYgGXfEoTb4 hGJgfQii6di+aNFJirEpJ+mvu3FZfzkThuxn8fd22Yyo1HydcuNCZdi2MQh87sSAX6Pv 8XI7SDXWp/y/CPwi/7zVoi/rqhrJdTvB6rvqQkdO5oMxFXh0nKGBi3xfgWClaJN7r9dA nVyAPHd6j+RasZ8StArrPS+w2N31BYv7+GVAZ1nf/DeW0BT3xTdboSna/gmcRHrRaSoh v2EJWDbJQJ6bus0+yFpp4aABgmwqp6X1L7BHtOfM0gye8MPUqsiT7av2b2vtVciUfdGr h4Dw== X-Gm-Message-State: ALoCoQnV8r89Ueu8BvGAKi3566NUNh49yPQNnyJaBTlB1bVJ0252fnXPzOKpk1oRRCuTjiO+ZIur 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 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131212_083209_634378_632EBC30 X-CRM114-Status: UNSURE ( 9.83 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.6 (--) Cc: devicetree@vger.kernel.org, Ulf Hansson , Lee Jones X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 {