google/gru: Ensure correct pull resistors for special-function pins
Several of the special function pins we're using in firmware have a
pre-assigned pull-up or pull-down on power-on reset. We don't want those
to interfere with any of the signaling we're trying to do on those pins,
so this patch disables them.
Also do some house-cleaning to group the bootblock code better, and
change the setup code for all SPI and I2C buses to first initialize the
controller and then mux the pins... I assume this might be a little
safer (in case the controller peripheral has some pins in a weird state
before it gets fully initialized, we don't want to mux it through too
early).
BRANCH=None
BUG=chrome-os-partner:52526
TEST=Booted Kevin.
Change-Id: I4d5bd3f7657b8113d90b65d9571583142ba10a27
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: f8f7fd56e945987eb0b1124b699f676bc68d0560
Original-Change-Id: I6bcf2b9a5dc686f2b6f82bd80fc9a1a245661c47
Original-Signed-off-by: Julius Werner <jwerner@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/382532
Reviewed-on: https://review.coreboot.org/16711
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth@google.com>
diff --git a/src/mainboard/google/gru/mainboard.c b/src/mainboard/google/gru/mainboard.c
index a2b74ba..8359ca4 100644
--- a/src/mainboard/google/gru/mainboard.c
+++ b/src/mainboard/google/gru/mainboard.c
@@ -94,19 +94,13 @@
gpio_output(GPIO(2, D, 4), 0); /* Keep the max voltage */
- /*
- * The SD card on this board is connected to port SDMMC0, which is
- * multiplexed with GPIO4B pins 0..5.
- *
- * Disable all pullups on these pins. For pullup configuration
- * register layout stacks banks 2 through 4 together, hence [2] means
- * group 4, [1] means bank B. This register is described on page 342
- * of section 1 of the TRM.
- *
- * Each GPIO pin's pull config takes two bits, writing zero to the
- * field disables pull ups/downs, as described on page 342 of rk3399
- * TRM Version 0.3 Part 1.
- */
+ gpio_input(GPIO(4, B, 0)); /* SDMMC0_D0 remove pull-up */
+ gpio_input(GPIO(4, B, 1)); /* SDMMC0_D1 remove pull-up */
+ gpio_input(GPIO(4, B, 2)); /* SDMMC0_D2 remove pull-up */
+ gpio_input(GPIO(4, B, 3)); /* SDMMC0_D3 remove pull-up */
+ gpio_input(GPIO(4, B, 4)); /* SDMMC0_CLK remove pull-down */
+ gpio_input(GPIO(4, B, 5)); /* SDMMC0_CMD remove pull-up */
+
write32(&rk3399_grf->gpio2_p[2][1], RK_CLRSETBITS(0xfff, 0));
/*
@@ -132,6 +126,16 @@
static void configure_codec(void)
{
+ gpio_input(GPIO(3, D, 0)); /* I2S0_SCLK remove pull-up */
+ gpio_input(GPIO(3, D, 1)); /* I2S0_RX remove pull-up */
+ gpio_input(GPIO(3, D, 2)); /* I2S0_TX remove pull-up */
+ gpio_input(GPIO(3, D, 3)); /* I2S0_SDI0 remove pull-up */
+ gpio_input(GPIO(3, D, 4)); /* I2S0_SDI1 remove pull-up */
+ /* GPIO3_D5 (I2S0_SDI2SDO2) not connected */
+ gpio_input(GPIO(3, D, 6)); /* I2S0_SDO1 remove pull-up */
+ gpio_input(GPIO(3, D, 7)); /* I2S0_SDO0 remove pull-up */
+ gpio_input(GPIO(4, A, 0)); /* I2S0_MCLK remove pull-up */
+
write32(&rk3399_grf->iomux_i2s0, IOMUX_I2S0);
write32(&rk3399_grf->iomux_i2sclk, IOMUX_I2SCLK);
@@ -206,10 +210,13 @@
*/
udelay(1000);
- /* Select pinmux for i2c0, which is the display backlight booster. */
+ gpio_input(GPIO(1, B, 7)); /* I2C0_SDA remove pull_up */
+ gpio_input(GPIO(1, C, 0)); /* I2C0_SCL remove pull_up */
+
+ i2c_init(0, 100*KHz);
+
write32(&rk3399_pmugrf->iomux_i2c0_sda, IOMUX_I2C0_SDA);
write32(&rk3399_pmugrf->iomux_i2c0_scl, IOMUX_I2C0_SCL);
- i2c_init(0, 100*KHz);
for (i = 0; i < ARRAY_SIZE(i2c_writes); i++) {
i2c_buf[0] = i2c_writes[i].reg;