summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mainboard/google/nyan/mainboard.c9
-rw-r--r--src/mainboard/google/nyan_big/mainboard.c9
-rw-r--r--src/mainboard/google/nyan_blaze/mainboard.c9
3 files changed, 15 insertions, 12 deletions
diff --git a/src/mainboard/google/nyan/mainboard.c b/src/mainboard/google/nyan/mainboard.c
index 15eff8ecd5..a25b5fd238 100644
--- a/src/mainboard/google/nyan/mainboard.c
+++ b/src/mainboard/google/nyan/mainboard.c
@@ -97,7 +97,7 @@ static void setup_pinmux(void)
pin_down = PINMUX_PULL_DOWN | PINMUX_INPUT_ENABLE,
pin_none = PINMUX_PULL_NONE | PINMUX_INPUT_ENABLE;
- // MMC3
+ // MMC3 (sdcard reader)
pinmux_set_config(PINMUX_SDMMC3_CLK_INDEX,
PINMUX_SDMMC3_CLK_FUNC_SDMMC3 | pin_none);
pinmux_set_config(PINMUX_SDMMC3_CMD_INDEX,
@@ -117,10 +117,11 @@ static void setup_pinmux(void)
// MMC3 Card Detect pin.
gpio_input_pullup(GPIO(V2));
- // Enable MMC power.
- gpio_output(GPIO(R0), 1);
+ // Disable SD card reader power so it can be reset even on warm boot.
+ // Payloads must enable power before accessing SD card slots.
+ gpio_output(GPIO(R0), 0);
- // MMC4
+ // MMC4 (eMMC)
pinmux_set_config(PINMUX_SDMMC4_CLK_INDEX,
PINMUX_SDMMC4_CLK_FUNC_SDMMC4 | pin_none);
pinmux_set_config(PINMUX_SDMMC4_CMD_INDEX,
diff --git a/src/mainboard/google/nyan_big/mainboard.c b/src/mainboard/google/nyan_big/mainboard.c
index 0539d849bd..7a55ad4170 100644
--- a/src/mainboard/google/nyan_big/mainboard.c
+++ b/src/mainboard/google/nyan_big/mainboard.c
@@ -97,7 +97,7 @@ static void setup_pinmux(void)
pin_down = PINMUX_PULL_DOWN | PINMUX_INPUT_ENABLE,
pin_none = PINMUX_PULL_NONE | PINMUX_INPUT_ENABLE;
- // MMC3
+ // MMC3 (sdcard reader)
pinmux_set_config(PINMUX_SDMMC3_CLK_INDEX,
PINMUX_SDMMC3_CLK_FUNC_SDMMC3 | pin_none);
pinmux_set_config(PINMUX_SDMMC3_CMD_INDEX,
@@ -117,10 +117,11 @@ static void setup_pinmux(void)
// MMC3 Card Detect pin.
gpio_input_pullup(GPIO(V2));
- // Enable MMC power.
- gpio_output(GPIO(R0), 1);
+ // Disable SD card reader power so it can be reset even on warm boot.
+ // Payloads must enable power before accessing SD card slots.
+ gpio_output(GPIO(R0), 0);
- // MMC4
+ // MMC4 (eMMC)
pinmux_set_config(PINMUX_SDMMC4_CLK_INDEX,
PINMUX_SDMMC4_CLK_FUNC_SDMMC4 | pin_none);
pinmux_set_config(PINMUX_SDMMC4_CMD_INDEX,
diff --git a/src/mainboard/google/nyan_blaze/mainboard.c b/src/mainboard/google/nyan_blaze/mainboard.c
index 8717a87df5..87a17fb9ca 100644
--- a/src/mainboard/google/nyan_blaze/mainboard.c
+++ b/src/mainboard/google/nyan_blaze/mainboard.c
@@ -97,7 +97,7 @@ static void setup_pinmux(void)
pin_down = PINMUX_PULL_DOWN | PINMUX_INPUT_ENABLE,
pin_none = PINMUX_PULL_NONE | PINMUX_INPUT_ENABLE;
- // MMC3
+ // MMC3 (sdcard reader)
pinmux_set_config(PINMUX_SDMMC3_CLK_INDEX,
PINMUX_SDMMC3_CLK_FUNC_SDMMC3 | pin_none);
pinmux_set_config(PINMUX_SDMMC3_CMD_INDEX,
@@ -117,10 +117,11 @@ static void setup_pinmux(void)
// MMC3 Card Detect pin.
gpio_input_pullup(GPIO(V2));
- // Enable MMC power.
- gpio_output(GPIO(R0), 1);
+ // Disable SD card reader power so it can be reset even on warm boot.
+ // Payloads must enable power before accessing SD card slots.
+ gpio_output(GPIO(R0), 0);
- // MMC4
+ // MMC4 (eMMC)
pinmux_set_config(PINMUX_SDMMC4_CLK_INDEX,
PINMUX_SDMMC4_CLK_FUNC_SDMMC4 | pin_none);
pinmux_set_config(PINMUX_SDMMC4_CMD_INDEX,