UPSTREAM: mb/google/skyrim/var/markarth: Change to read the eMMC clkreq instead Because WD SSD drive isn't holding the clock low for some reason. So we change to read eMMC clkreq signal instead. BRANCH=none BUG=b:278495684 TEST=emerge-skyrim coreboot chromeos-bootimage and verify ok. (cherry picked from commit fa7e6b8c031702a2ad31018fb00dfa75e427cbb7) Original-Signed-off-by: John Su <john_su@compal.corp-partner.google.com> Original-Change-Id: I3a9225473a6ae1ba01dc8e5d982c4999f073267e Original-Reviewed-on: https://review.coreboot.org/c/coreboot/+/74583 Original-Reviewed-by: Chao Gui <chaogui@google.com> Original-Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Original-Reviewed-by: Martin Roth <martin.roth@amd.corp-partner.google.com> Original-Reviewed-by: Tim Van Patten <timvp@google.com> Original-Reviewed-by: Frank Wu <frank_wu@compal.corp-partner.google.com> GitOrigin-RevId: fa7e6b8c031702a2ad31018fb00dfa75e427cbb7 Change-Id: I1d00c590ad7ae35755937de5772e405d3de49cec Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/coreboot/+/4462636 Tested-by: CopyBot Service Account <copybot.service@gmail.com> Tested-by: John Su <john_su@compal.corp-partner.google.com> Reviewed-by: Jonathon Murphy <jpmurphy@google.com> Commit-Queue: Jonathon Murphy <jpmurphy@google.com>
diff --git a/src/mainboard/google/skyrim/variants/markarth/port_descriptors.c b/src/mainboard/google/skyrim/variants/markarth/port_descriptors.c index 330fc46..94eb465 100644 --- a/src/mainboard/google/skyrim/variants/markarth/port_descriptors.c +++ b/src/mainboard/google/skyrim/variants/markarth/port_descriptors.c
@@ -74,7 +74,7 @@ }, }; -#define NVME_CLKREQ_GPIO 92 +#define EMMC_CLKREQ_GPIO 115 void variant_get_dxio_descriptor(const fsp_dxio_descriptor **dxio_descs, size_t *dxio_num) { /* @@ -85,13 +85,13 @@ * This allows checking the state of the NVMe device clkreq signal and enabling * either eMMC or NVMe based on that. */ - if (gpio_get(NVME_CLKREQ_GPIO)) { - printk(BIOS_DEBUG, "Enabling eMMC.\n"); - *dxio_num = ARRAY_SIZE(emmc_dxio_descriptors); - *dxio_descs = emmc_dxio_descriptors; - } else { + if (gpio_get(EMMC_CLKREQ_GPIO)) { printk(BIOS_DEBUG, "Enabling NVMe.\n"); *dxio_num = ARRAY_SIZE(nvme_dxio_descriptors); *dxio_descs = nvme_dxio_descriptors; + } else { + printk(BIOS_DEBUG, "Enabling eMMC.\n"); + *dxio_num = ARRAY_SIZE(emmc_dxio_descriptors); + *dxio_descs = emmc_dxio_descriptors; } }