diff mbox

[U-Boot,18/31] powerpc/t4qds: Add SW7[4] in the DIP switch display

Message ID 1363973369-26110-18-git-send-email-yorksun@freescale.com
State Superseded
Headers show

Commit Message

York Sun March 22, 2013, 5:29 p.m. UTC
SW7[4] is the new bit which controls the mapping of eMMC vs SDHC.

Signed-off-by: York Sun <yorksun@freescale.com>
---
 board/freescale/t4qds/t4qds.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Wolfgang Denk March 22, 2013, 9:02 p.m. UTC | #1
Dear York Sun,

In message <1363973369-26110-18-git-send-email-yorksun@freescale.com> you wrote:
> SW7[4] is the new bit which controls the mapping of eMMC vs SDHC.
> 
> Signed-off-by: York Sun <yorksun@freescale.com>
> ---
>  board/freescale/t4qds/t4qds.c |    5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)

WARNING: Avoid unnecessary line continuations
#131: FILE: board/freescale/t4qds/t4qds.c:838:
+       sw[6] = (brdcfg[11] & 0x20)             | \


Best regards,

Wolfgang Denk
diff mbox

Patch

diff --git a/board/freescale/t4qds/t4qds.c b/board/freescale/t4qds/t4qds.c
index 5571a00..a9c3173 100644
--- a/board/freescale/t4qds/t4qds.c
+++ b/board/freescale/t4qds/t4qds.c
@@ -804,7 +804,7 @@  void qixis_dump_switch(void)
 	 * Any bit with 1 means that bit cannot be reverse engineered.
 	 * It will be displayed as _ in binary format.
 	 */
-	static const u8 mask[] = {0, 0, 0, 0, 0, 0x1, 0xdf, 0x3f, 0x1f};
+	static const u8 mask[] = {0, 0, 0, 0, 0, 0x1, 0xcf, 0x3f, 0x1f};
 	char buf[10];
 	u8 brdcfg[16], dutcfg[16];
 
@@ -835,7 +835,8 @@  void qixis_dump_switch(void)
 	sw[5] = ((brdcfg[0] & 0x0f) << 4)	| \
 		((QIXIS_READ(rst_ctl) & 0x30) >> 2) | \
 		((brdcfg[0] & 0x40) >> 5);
-	sw[6] = (brdcfg[11] & 0x20);
+	sw[6] = (brdcfg[11] & 0x20)		| \
+		((brdcfg[5] & 0x02) << 3);
 	sw[7] = (((~QIXIS_READ(rst_ctl)) & 0x40) << 1) | \
 		((brdcfg[5] & 0x10) << 2);
 	sw[8] = ((brdcfg[12] & 0x08) << 4)	| \