From: Marek Vasut <marex@denx.de>
Date: Tue, 2 May 2017 18:27:45 +0000 (+0200)
Subject: ARM: at91: ma5d4: Swap SD/MMC controller order
X-Git-Tag: v2017.07-rc3~13
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4425be39eb40dbf02149b458d7c9b6190cc261bb;p=u-boot

ARM: at91: ma5d4: Swap SD/MMC controller order

The SDHCI1 is the primary boot controller on rev. 2.1 SoM, which
is the version available on the market. Swap the controller order
to match this and future versions of the SoM.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Andreas Bießmann <andreas.devel@googlemail.com>
---

diff --git a/board/aries/ma5d4evk/ma5d4evk.c b/board/aries/ma5d4evk/ma5d4evk.c
index 9c1ba58166..0293b29d0e 100644
--- a/board/aries/ma5d4evk/ma5d4evk.c
+++ b/board/aries/ma5d4evk/ma5d4evk.c
@@ -205,14 +205,13 @@ int board_mmc_init(bd_t *bis)
 	at91_set_pio_output(AT91_PIO_PORTE, 15, 1);
 	at91_pio3_set_pio_pulldown(AT91_PIO_PORTE, 15, 0);
 
-	ret = atmel_mci_init((void *)ATMEL_BASE_MCI0);
+	ret = atmel_mci_init((void *)ATMEL_BASE_MCI1);
 	if (ret)	/* eMMC init failed, skip it. */
 		at91_set_pio_output(AT91_PIO_PORTE, 15, 0);
 
 	/* Enable the power supply to On-board MicroSD */
 	at91_set_pio_output(AT91_PIO_PORTE, 17, 0);
-
-	ret = atmel_mci_init((void *)ATMEL_BASE_MCI1);
+	ret = atmel_mci_init((void *)ATMEL_BASE_MCI0);
 	if (ret)	/* uSD init failed, power it down. */
 		at91_set_pio_output(AT91_PIO_PORTE, 17, 1);
 
diff --git a/include/configs/ma5d4evk.h b/include/configs/ma5d4evk.h
index 4bcbf2cb13..0bb1ebb2f9 100644
--- a/include/configs/ma5d4evk.h
+++ b/include/configs/ma5d4evk.h
@@ -130,9 +130,9 @@
 	"consdev=ttyS3\0"						\
 	"baudrate=115200\0"						\
 	"bootscript=boot.scr\0"						\
-	"bootdev=/dev/mmcblk1p1\0"					\
-	"bootpart=1:1\0"						\
-	"rootdev=/dev/mmcblk1p2\0"					\
+	"bootdev=/dev/mmcblk0p1\0"					\
+	"bootpart=0:1\0"						\
+	"rootdev=/dev/mmcblk0p2\0"					\
 	"netdev=eth0\0"							\
 	"dfu_alt_info=mmc raw 0 3867148288\0"				\
 	"kernel_addr_r=0x22000000\0"					\
@@ -189,8 +189,8 @@
 		"bootm ${kernel_addr_r}\0"				\
 	"try_bootscript="						\
 		"mmc rescan;"						\
-		"if test -e mmc ${bootpart} ${bootscript} ; then "	\
-		"if load mmc ${bootpart} ${kernel_addr_r} ${bootscript};"\
+		"if test -e mmc 1:1 ${bootscript} ; then "		\
+		"if load mmc 1:1 ${kernel_addr_r} ${bootscript};"	\
 		"then ; "						\
 			"echo Running bootscript... ; "			\
 			"source ${kernel_addr_r} ; "			\