diff mbox series

[PULL,20/32] sdcard: clean the SCR register and add few comments

Message ID 20180222152307.7499-21-peter.maydell@linaro.org
State Accepted
Commit 9b7ec55c5c66ca466a8e34f7780f13a8e77b8a99
Headers show
Series target-arm queue | expand

Commit Message

Peter Maydell Feb. 22, 2018, 3:22 p.m. UTC 
From: Philippe Mathieu-Daudé <f4bug@amsat.org>


Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Reviewed-by: Alistair Francis <alistair.francis@xilinx.com>

Message-id: 20180215221325.7611-5-f4bug@amsat.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

---
 hw/sd/sd.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

-- 
2.16.1
diff mbox series

Patch

diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 3526269dbe..c87142d648 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -298,10 +298,13 @@  static void sd_ocr_powerup(void *opaque)
 
 static void sd_set_scr(SDState *sd)
 {
-    sd->scr[0] = 0x00;		/* SCR Structure */
-    sd->scr[1] = 0x2f;		/* SD Security Support */
-    sd->scr[2] = 0x00;
+    sd->scr[0] = (0 << 4)       /* SCR version 1.0 */
+                 | 0;           /* Spec Versions 1.0 and 1.01 */
+    sd->scr[1] = (2 << 4)       /* SDSC Card (Security Version 1.01) */
+                 | 0b0101;      /* 1-bit or 4-bit width bus modes */
+    sd->scr[2] = 0x00;          /* Extended Security is not supported. */
     sd->scr[3] = 0x00;
+    /* reserved for manufacturer usage */
     sd->scr[4] = 0x00;
     sd->scr[5] = 0x00;
     sd->scr[6] = 0x00;