public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [U-Boot] [PATCH 01/12] imx: iomux-mx51: Fix MX51_PAD_EIM_CS2__GPIO2_27
@ 2013-05-02 20:52 Benoît Thébaudeau
  2013-05-02 20:52 ` [U-Boot] [PATCH 02/12] imx: iomux-v3: Add missing definitions to iomux-mx51.h Benoît Thébaudeau
                   ` (10 more replies)
  0 siblings, 11 replies; 27+ messages in thread
From: Benoît Thébaudeau @ 2013-05-02 20:52 UTC (permalink / raw)
  To: u-boot

In ALT1 mode, EIM_CS2 is GPIO2[27], not ESDHC1.CD. Hence, rename
MX51_PAD_EIM_CS2__SD1_CD to MX51_PAD_EIM_CS2__GPIO2_27.

Signed-off-by: Beno?t Th?baudeau <benoit.thebaudeau@advansee.com>
---
 arch/arm/include/asm/arch-mx5/iomux-mx51.h |    2 +-
 board/genesi/mx51_efikamx/efikamx.c        |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/include/asm/arch-mx5/iomux-mx51.h b/arch/arm/include/asm/arch-mx5/iomux-mx51.h
index 328c188..323e118 100644
--- a/arch/arm/include/asm/arch-mx5/iomux-mx51.h
+++ b/arch/arm/include/asm/arch-mx5/iomux-mx51.h
@@ -61,7 +61,7 @@ enum {
 	MX51_PAD_EIM_A26__USBH2_STP		= IOMUX_PAD(0x458, 0x0c4, 2, __NA_, 0, NO_PAD_CTRL),
 	MX51_PAD_EIM_A27__USBH2_NXT		= IOMUX_PAD(0x45c, 0x0c8, 2, __NA_, 0, NO_PAD_CTRL),
 	MX51_PAD_EIM_CS0__GPIO2_25		= IOMUX_PAD(0x474, 0x0e0, 1, __NA_, 0, MX51_GPIO_PAD_CTRL),
-	MX51_PAD_EIM_CS2__SD1_CD		= IOMUX_PAD(0x47c, 0x0e8, 1, __NA_, 0, MX51_ESDHC_PAD_CTRL),
+	MX51_PAD_EIM_CS2__GPIO2_27		= IOMUX_PAD(0x47c, 0x0e8, 1, __NA_, 0, MX51_GPIO_PAD_CTRL),
 	MX51_PAD_EIM_CS3__GPIO2_28		= IOMUX_PAD(0x480, 0x0ec, 1, __NA_, 0, MX51_GPIO_PAD_CTRL),
 	MX51_PAD_EIM_CS4__GPIO2_29		= IOMUX_PAD(0x484, 0x0f0, 1, __NA_, 0, MX51_GPIO_PAD_CTRL),
 	MX51_PAD_NANDF_WE_B__PATA_DIOW		= IOMUX_PAD(0x4e4, 0x108, 1, __NA_, 0, NO_PAD_CTRL),
diff --git a/board/genesi/mx51_efikamx/efikamx.c b/board/genesi/mx51_efikamx/efikamx.c
index 69d41db..13582a2 100644
--- a/board/genesi/mx51_efikamx/efikamx.c
+++ b/board/genesi/mx51_efikamx/efikamx.c
@@ -293,7 +293,7 @@ static iomux_v3_cfg_t const efikamx_sdhc1_pads[] = {
 
 static iomux_v3_cfg_t const efikamx_sdhc1_cd_pads[] = {
 	MX51_PAD_GPIO1_0__SD1_CD,
-	MX51_PAD_EIM_CS2__SD1_CD,
+	NEW_PAD_CTRL(MX51_PAD_EIM_CS2__GPIO2_27, MX51_ESDHC_PAD_CTRL),
 };
 
 #define EFIKAMX_SDHC1_CD	IMX_GPIO_NR(1, 0)
-- 
1.7.10.4

^ permalink raw reply related	[flat|nested] 27+ messages in thread

end of thread, other threads:[~2013-05-16 18:51 UTC | newest]

Thread overview: 27+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-02 20:52 [U-Boot] [PATCH 01/12] imx: iomux-mx51: Fix MX51_PAD_EIM_CS2__GPIO2_27 Benoît Thébaudeau
2013-05-02 20:52 ` [U-Boot] [PATCH 02/12] imx: iomux-v3: Add missing definitions to iomux-mx51.h Benoît Thébaudeau
2013-05-02 20:52 ` [U-Boot] [PATCH 03/12] imx: mx51evk: Convert to iomux-v3 Benoît Thébaudeau
2013-05-02 20:52 ` [U-Boot] [PATCH 04/12] imx: mx51_efikamx/sb: " Benoît Thébaudeau
2013-05-03 15:58   ` Matt Sealey
2013-05-03 16:01     ` Benoît Thébaudeau
2013-05-16 18:05       ` Matt Sealey
2013-05-16 18:51         ` Benoît Thébaudeau
2013-05-02 20:52 ` [U-Boot] [PATCH 05/12] imx: vision2: " Benoît Thébaudeau
2013-05-02 20:52 ` [U-Boot] [PATCH 06/12] imx: iomux-v3: Add iomux-mx53.h Benoît Thébaudeau
2013-05-02 20:52 ` [U-Boot] [PATCH 07/12] imx: ima3-mx53: Convert to iomux-v3 Benoît Thébaudeau
2013-05-02 20:52 ` [U-Boot] [PATCH 08/12] imx: mx53ard: " Benoît Thébaudeau
2013-05-02 20:52 ` [U-Boot] [PATCH 09/12] imx: mx53evk: " Benoît Thébaudeau
2013-05-02 20:52 ` [U-Boot] [PATCH 10/12] imx: mx53loco: " Benoît Thébaudeau
2013-05-02 20:52 ` [U-Boot] [PATCH 11/12] imx: mx53smd: " Benoît Thébaudeau
2013-05-02 20:52 ` [U-Boot] [PATCH 12/12] imx: mx5: Remove legacy iomux support Benoît Thébaudeau
2013-05-03  2:38   ` Marek Vasut
2013-05-03 12:09     ` Benoît Thébaudeau
2013-05-03 12:42       ` Marek Vasut
2013-05-03 13:06         ` Benoît Thébaudeau
2013-05-03 13:18           ` Marek Vasut
2013-05-03 13:17             ` Benoît Thébaudeau
2013-05-03 13:39               ` Marek Vasut
2013-05-03 13:38                 ` Benoît Thébaudeau
2013-05-03 13:50                   ` Marek Vasut
2013-05-05 14:58             ` Stefano Babic
2013-05-05 14:56         ` Stefano Babic

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox