From patchwork Tue Dec 17 01:12:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Troy Kisky X-Patchwork-Id: 3358071 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 00ECAC0D4A for ; Tue, 17 Dec 2013 01:15:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 409B1202B4 for ; Tue, 17 Dec 2013 01:15:29 +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 53020202AE for ; Tue, 17 Dec 2013 01:15:28 +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 1VsjEJ-0001jd-Od; Tue, 17 Dec 2013 01:13:48 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VsjDs-0003il-Pm; Tue, 17 Dec 2013 01:13:20 +0000 Received: from mail-pb0-f52.google.com ([209.85.160.52]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VsjD7-0003d3-Ax for linux-arm-kernel@lists.infradead.org; Tue, 17 Dec 2013 01:12:36 +0000 Received: by mail-pb0-f52.google.com with SMTP id uo5so6266858pbc.11 for ; Mon, 16 Dec 2013 17:12:12 -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=+GPurPRAxg1iaui7dQ4i+X2aOuHSzGFaEBJwF8ujxMU=; b=LjKcF117EZv5Dr/hnkvzziMMFXr1C6P51yyfbRQC5ybGYuoXIaNa3jzkWY6zpS3J7j EFu28zV7osdwQWo07GGPmhMVdILU6+XHR9qXTf8JWsP0lEijzw6EwXGN3AzVNxx2XCd0 ZrwRSn5JPa1AXZr4UNFBYbFMIWmbcwp0SkLELPtM9unp2ELd5j7FddyJEKNPSyWDohRx V3Os40tcBfug5heIsXH7dKNVkojaKJOMcvNbjFjoMJ47G2n760jkxzP77+fp2GcU9O7M OGbDKkUfJGz9HQxnlzHUtbd08UQj2Bl/Xg0G+LsYITLp2CD00A4ailuQ7XvbmbyFppX3 lbqw== X-Gm-Message-State: ALoCoQk/EVlWERPlEGNX0G54W/q3FULqJ/1/cxiJyby0XhMYD0aRzp7vSidAG+tDRW4H0X4KsTyU X-Received: by 10.68.8.136 with SMTP id r8mr23704670pba.36.1387242729816; Mon, 16 Dec 2013 17:12:09 -0800 (PST) Received: from officeserver-2 ([63.226.49.26]) by mx.google.com with ESMTPSA id ki1sm29540160pbd.1.2013.12.16.17.12.07 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 16 Dec 2013 17:12:08 -0800 (PST) Received: from tkisky by officeserver-2 with local (Exim 4.80) (envelope-from ) id 1VsjDd-0000OU-Vg; Mon, 16 Dec 2013 18:13:06 -0700 From: Troy Kisky To: shawn.guo@linaro.org Subject: [PATCH V2 02/13] ARM: dts: imx6qdl-sabrelite: move USDHC4 CD to pinctrl_usdhc4 Date: Mon, 16 Dec 2013 18:12:52 -0700 Message-Id: <1387242783-1462-3-git-send-email-troy.kisky@boundarydevices.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1387242783-1462-1-git-send-email-troy.kisky@boundarydevices.com> References: <1387242783-1462-1-git-send-email-troy.kisky@boundarydevices.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131216_201233_553322_F84F803B X-CRM114-Status: UNSURE ( 9.99 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.6 (--) Cc: marex@denx.de, eric.nelson@boundarydevices.com, festevam@gmail.com, linux-arm-kernel@lists.infradead.org, Troy Kisky 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.7 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 This patch moves pin NANDF_D6 (CD) from pinctrl_hog to pinctrl_usdhc4. It also explicitly sets the pad to 0x1b0b0, which is also the value that it has before this patch if using mainline u-boot. Signed-off-by: Troy Kisky --- v2: New patch.. V1 patch to add comments was broken up into multiple patches --- arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi b/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi index 5394e02..8bb910b 100644 --- a/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi +++ b/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi @@ -114,7 +114,6 @@ imx6q-sabrelite { pinctrl_hog: hoggrp { fsl,pins = < - MX6QDL_PAD_NANDF_D6__GPIO2_IO06 0x80000000 MX6QDL_PAD_EIM_D19__GPIO3_IO19 0x80000000 MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x80000000 MX6QDL_PAD_EIM_D23__GPIO3_IO23 0x80000000 @@ -157,7 +156,10 @@ }; pinctrl_usdhc4: usdhc4grp { - fsl,pins = ; + fsl,pins = < + MX6QDL_USDHC4_PINGRP_D4 + MX6QDL_PAD_NANDF_D6__GPIO2_IO06 0x1b0b0 /* CD */ + >; }; }; };