Martin Roth has uploaded this change for review.

View Change

mb/google/zork: Use Kconfig SPI speed & read mode in devicetree

We have Kconfig controls for the Fast SPI speed and SPI read mode, so
tie those to the devicetree controls for those values.

BUG=None
TEST=Boot & Verify speeds & Mode are correct.
BRANCH=Zork

Signed-off-by: Martin Roth <martinroth@chromium.org>
Change-Id: I116adf4fe0de5a2790894618ccff8ebf629fab34
---
M src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb
M src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb
2 files changed, 4 insertions(+), 4 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/85/50285/1
diff --git a/src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb b/src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb
index e014ce3..a24699c 100644
--- a/src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb
+++ b/src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb
@@ -145,10 +145,10 @@
# SPI Configuration
register "common_config.spi_config" = "{
.normal_speed = SPI_SPEED_33M, /* MHz */
- .fast_speed = SPI_SPEED_66M, /* MHz */
+ .fast_speed = CONFIG_EFS_SPI_SPEED,
.altio_speed = SPI_SPEED_66M, /* MHz */
.tpm_speed = SPI_SPEED_66M, /* MHz */
- .read_mode = SPI_READ_MODE_DUAL122,
+ .read_mode = CONFIG_EFS_SPI_READ_MODE,
}"

# eSPI Configuration
diff --git a/src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb b/src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb
index 5ec9010..8bcf003 100644
--- a/src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb
+++ b/src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb
@@ -137,10 +137,10 @@
# SPI Configuration
register "common_config.spi_config" = "{
.normal_speed = SPI_SPEED_33M, /* MHz */
- .fast_speed = SPI_SPEED_66M, /* MHz */
+ .fast_speed = CONFIG_EFS_SPI_SPEED,
.altio_speed = SPI_SPEED_66M, /* MHz */
.tpm_speed = SPI_SPEED_66M, /* MHz */
- .read_mode = SPI_READ_MODE_DUAL122,
+ .read_mode = CONFIG_EFS_SPI_READ_MODE,
}"

# USB OC pin mapping

To view, visit change 50285. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I116adf4fe0de5a2790894618ccff8ebf629fab34
Gerrit-Change-Number: 50285
Gerrit-PatchSet: 1
Gerrit-Owner: Martin Roth <martinroth@google.com>
Gerrit-MessageType: newchange