From 2be64048c1cc775c49d9179501e9c51dd307ba72 Mon Sep 17 00:00:00 2001 From: Julius Werner Date: Fri, 1 Sep 2017 14:27:46 -0700 Subject: google/gru: Re-enable 3V rail GPIO on Scarlet We've decided to move control for the 3.0V rail (technically 3.3V on Scarlet, but who cares about millivolts) back to a GPIO on the AP for Scarlet rev2. This patch adds the necessary code to enable it and make ARM TF aware of its existence. Since the pin had previously not been connected to anything, we shouldn't really need to guard this by board ID... older Scarlets will just be twiddling an empty pin. Change-Id: I6037aa486b50119f2c7b859b966cadc3686e3459 Signed-off-by: Julius Werner Reviewed-on: https://review.coreboot.org/21328 Tested-by: build bot (Jenkins) Reviewed-by: David Schneider --- src/mainboard/google/gru/bootblock.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/mainboard/google/gru/bootblock.c') diff --git a/src/mainboard/google/gru/bootblock.c b/src/mainboard/google/gru/bootblock.c index 01aa4bf47a..a3d31212c2 100644 --- a/src/mainboard/google/gru/bootblock.c +++ b/src/mainboard/google/gru/bootblock.c @@ -48,12 +48,10 @@ void bootblock_mainboard_early_init(void) if (IS_ENABLED(CONFIG_BOARD_GOOGLE_SCARLET)) write32(&rk3399_grf->io_vsel, RK_SETBITS(1 << 3)); - if (!IS_ENABLED(CONFIG_BOARD_GOOGLE_SCARLET)) { - /* Enable rails powering GPIO blocks, among other things. - These are EC-controlled on Scarlet and already on. */ - gpio_output(GPIO_P15V_EN, 1); - gpio_output(GPIO_P30V_EN, 1); - } + /* Enable rails powering GPIO blocks, among other things. */ + gpio_output(GPIO_P30V_EN, 1); + if (!IS_ENABLED(CONFIG_BOARD_GOOGLE_SCARLET)) + gpio_output(GPIO_P15V_EN, 1); /* Scarlet: EC-controlled */ #if IS_ENABLED(CONFIG_DRIVERS_UART) _Static_assert(CONFIG_CONSOLE_SERIAL_UART_ADDRESS == UART2_BASE, -- cgit v1.2.3