From patchwork Tue Dec 17 01:12:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Troy Kisky X-Patchwork-Id: 3358101 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 853E79F314 for ; Tue, 17 Dec 2013 01:16:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C5E2B202AE for ; Tue, 17 Dec 2013 01:16:25 +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 D95892022A for ; Tue, 17 Dec 2013 01:16:24 +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 1VsjEk-0001z4-7D; Tue, 17 Dec 2013 01:14:15 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VsjEB-0003k6-Vu; Tue, 17 Dec 2013 01:13:39 +0000 Received: from mail-pd0-f176.google.com ([209.85.192.176]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VsjD8-0003d6-FB for linux-arm-kernel@lists.infradead.org; Tue, 17 Dec 2013 01:12:40 +0000 Received: by mail-pd0-f176.google.com with SMTP id w10so6078323pde.35 for ; Mon, 16 Dec 2013 17:12:13 -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=c/UGtFrldhdjORcdBZXo3J9syyWs1KPg1aShuo8pkPI=; b=TI/8wpYjzjKmzG5CXSmXD4AIMZvZRvN+AATU84Jz1dsbWz1H/jg2uSKyVmv7uNwCT9 akhKTxSPJiFZ3vSTXx6YNqXsNPS/K8poTZCJa6I15skNm1teTqJJk9lhdLVfl3DmvkU7 C4cSVw6bNxdPS+qjtITaxvYMXzHSgv54rmUXM1VxhnkieJslWZp3tvY7Ky/jtnILheFJ hfyQL9XojjoqYWHi2IiwhGOWoU4T9Fp4B5Afa6D0H+OCoeZ5V8r3mXF+OdYrIwM1UBxK ZeYw4C39DuPIW0xtekBsbqGC8+qqrhRCr6IOVgIB76Lf3B/+lJ0lgQle7nrky57KipIp 9VNw== X-Gm-Message-State: ALoCoQnHjlKKboysJlcdIQPMd/kKEOXd2ysTLV0EjBdLM+76gg2oddqcNKrl3Z5ZenvU52gsyOed X-Received: by 10.68.185.68 with SMTP id fa4mr23656319pbc.136.1387242730211; Mon, 16 Dec 2013 17:12:10 -0800 (PST) Received: from officeserver-2 ([63.226.49.26]) by mx.google.com with ESMTPSA id q7sm12964843pbc.20.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 1VsjDe-0000OY-2j; Mon, 16 Dec 2013 18:13:06 -0700 From: Troy Kisky To: shawn.guo@linaro.org Subject: [PATCH V2 03/13] ARM: dts: imx6qdl-sabrelite: move USDHC3 CD/WP to pinctrl_usdhc3 Date: Mon, 16 Dec 2013 18:12:53 -0700 Message-Id: <1387242783-1462-4-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_201234_718678_A6E5CB59 X-CRM114-Status: UNSURE ( 9.39 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) 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 SD3_DAT5/4 (CD/WP) from pinctrl_hog to pinctrl_usdhc3. It also explicitly sets the pad SD3_DAT5 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 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi b/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi index 8bb910b..96c3902 100644 --- a/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi +++ b/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi @@ -117,8 +117,6 @@ MX6QDL_PAD_EIM_D19__GPIO3_IO19 0x80000000 MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x80000000 MX6QDL_PAD_EIM_D23__GPIO3_IO23 0x80000000 - MX6QDL_PAD_SD3_DAT5__GPIO7_IO00 0x80000000 - MX6QDL_PAD_SD3_DAT4__GPIO7_IO01 0x1f0b0 MX6QDL_PAD_GPIO_0__CCM_CLKO1 0x80000000 >; }; @@ -152,7 +150,11 @@ }; pinctrl_usdhc3: usdhc3grp { - fsl,pins = ; + fsl,pins = < + MX6QDL_USDHC3_PINGRP_D4 + MX6QDL_PAD_SD3_DAT5__GPIO7_IO00 0x1b0b0 /* CD */ + MX6QDL_PAD_SD3_DAT4__GPIO7_IO01 0x1f0b0 /* WP */ + >; }; pinctrl_usdhc4: usdhc4grp {