linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: troy.kisky@boundarydevices.com (Troy Kisky)
To: linux-arm-kernel@lists.infradead.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	[thread overview]
Message-ID: <1387242783-1462-3-git-send-email-troy.kisky@boundarydevices.com> (raw)
In-Reply-To: <1387242783-1462-1-git-send-email-troy.kisky@boundarydevices.com>

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 <troy.kisky@boundarydevices.com>

---
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 = <MX6QDL_USDHC4_PINGRP_D4>;
+			fsl,pins = <
+				MX6QDL_USDHC4_PINGRP_D4
+				MX6QDL_PAD_NANDF_D6__GPIO2_IO06 0x1b0b0	/* CD */
+			>;
 		};
 	};
 };
-- 
1.8.1.2

  parent reply	other threads:[~2013-12-17  1:12 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-17  1:12 [PATCH V2 00/13] Update Sabre Lite Troy Kisky
2013-12-17  1:12 ` [PATCH V2 01/13] ARM: dts: imx6qdl-sabrelite: move pcie to imx6qdl-sabrelite.dtsi Troy Kisky
2013-12-17  1:12 ` Troy Kisky [this message]
2013-12-17  1:12 ` [PATCH V2 03/13] ARM: dts: imx6qdl-sabrelite: move USDHC3 CD/WP to pinctrl_usdhc3 Troy Kisky
2013-12-17  1:12 ` [PATCH V2 04/13] ARM: dts: imx6qdl-sabrelite: move spi-nor CS to pinctrl_ecspi1 Troy Kisky
2013-12-17  1:12 ` [PATCH V2 05/13] ARM: dts: imx6qdl-sabrelite: move usbotg power enable to pinctrl_usbotg Troy Kisky
2013-12-17  1:12 ` [PATCH V2 06/13] ARM: dts: imx6qdl-sabrelite: move phy reset to pinctrl_enet Troy Kisky
2013-12-17  1:12 ` [PATCH V2 07/13] ARM: dts: imx6qdl-sabrelite: explicitly set pad for SGTL5000 sys_mclk Troy Kisky
2013-12-17  1:12 ` [PATCH V2 08/13] ARM: dts: imx6qdl-sabrelite: add gpio-keys Troy Kisky
2013-12-17 13:46   ` Shawn Guo
2013-12-17  1:12 ` [PATCH V2 09/13] ARM: dts: imx6qdl-sabrelite: add pwms for backlights Troy Kisky
2013-12-17  1:13 ` [PATCH V2 10/13] ARM: dts: imx6qdl-sabrelite: add skews for Micrel phy Troy Kisky
2013-12-17  1:13 ` [PATCH V2 11/13] ARM: dts: imx6qdl-sabrelite: fix ENET group Troy Kisky
2013-12-17  1:13 ` [PATCH V2 12/13] ARM: dts: imx6qdl-sabrelite: Add over-current pin to usbotg Troy Kisky
2013-12-17  1:13 ` [PATCH V2 13/13] ARM: dts: imx: add nitrogen6x board Troy Kisky
2013-12-17 13:48   ` Shawn Guo
2013-12-17 18:49     ` Troy Kisky

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1387242783-1462-3-git-send-email-troy.kisky@boundarydevices.com \
    --to=troy.kisky@boundarydevices.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).