[coreboot-gerrit] Patch set updated for coreboot: 6e2649e veyron_jerry: Remove board ID based assumptions

[Patrick Georgi (pgeorgi@google.com)]

Patrick Georgi (pgeorgi at google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9546

-gerrit

commit 6e2649efcc10c0d1bc84d574ab9141ff3835a34c
Author: Julius Werner <jwerner at chromium.org>
Date:   Thu Nov 6 12:51:24 2014 -0800

    veyron_jerry: Remove board ID based assumptions
    
    The veyron_jerry board code was just copied over from veyron_pinky
    1-to-1. The Jerry board IDs start at 1, but there has never been a Jerry
    rev0 so we can remove the code for board ID 0 from it.
    
    BRANCH=none
    BUG=None
    TEST=Booted Jerry image on a Pinky rev2, worked fine.
    
    Change-Id: I0f2ffdc577934c1695e8d2dcf71512696ac1d5a5
    Signed-off-by: Patrick Georgi <pgeorgi at chromium.org>
    Original-Commit-Id: aa36da69ac584b845e15282dae100eec27fc7f12
    Original-Change-Id: I45a18b288c8d8b1399ceedf582addcce1c7e857d
    Original-Signed-off-by: Julius Werner <jwerner at chromium.org>
    Original-Reviewed-on: https://chromium-review.googlesource.com/228254
    Original-Reviewed-by: David Hendricks <dhendrix at chromium.org>
---
 src/mainboard/google/veyron_jerry/board.h     |  2 +-
 src/mainboard/google/veyron_jerry/chromeos.c  |  4 +--
 src/mainboard/google/veyron_jerry/mainboard.c | 44 ++++-----------------------
 3 files changed, 8 insertions(+), 42 deletions(-)

diff --git a/src/mainboard/google/veyron_jerry/board.h b/src/mainboard/google/veyron_jerry/board.h
index 6162b03..2b1643d 100644
--- a/src/mainboard/google/veyron_jerry/board.h
+++ b/src/mainboard/google/veyron_jerry/board.h
@@ -25,7 +25,7 @@
 
 #define PMIC_BUS 0
 
-#define GPIO_RESET	(board_id() > 0 ? GPIO(0, B, 5) : GPIO(0, B, 2))
+#define GPIO_RESET	GPIO(0, B, 5)
 
 /* TODO: move setup_chromeos_gpios() here once bootblock code is in mainboard */
 
diff --git a/src/mainboard/google/veyron_jerry/chromeos.c b/src/mainboard/google/veyron_jerry/chromeos.c
index dc224a5..68f72a0 100644
--- a/src/mainboard/google/veyron_jerry/chromeos.c
+++ b/src/mainboard/google/veyron_jerry/chromeos.c
@@ -25,10 +25,8 @@
 #include <string.h>
 #include <vendorcode/google/chromeos/chromeos.h>
 
-#include "board.h"
-
 #define GPIO_WP		GPIO(7, A, 6)
-#define GPIO_LID	(board_id() > 0 ? GPIO(0, A, 6) : GPIO(7, B, 5))
+#define GPIO_LID	GPIO(0, A, 6)
 #define GPIO_POWER	GPIO(0, A, 5)
 #define GPIO_RECOVERY	GPIO(0, B, 1)
 
diff --git a/src/mainboard/google/veyron_jerry/mainboard.c b/src/mainboard/google/veyron_jerry/mainboard.c
index 0166796..b641fad 100644
--- a/src/mainboard/google/veyron_jerry/mainboard.c
+++ b/src/mainboard/google/veyron_jerry/mainboard.c
@@ -42,14 +42,6 @@ static void configure_usb(void)
 {
 	gpio_output(GPIO(0, B, 3), 1);			/* HOST1_PWR_EN */
 	gpio_output(GPIO(0, B, 4), 1);			/* USBOTG_PWREN_H */
-
-	switch (board_id()) {
-	case 0:
-		gpio_output(GPIO(7, B, 3), 1);		/* 5V_DRV */
-		break;
-	default:
-		break;	/* 5V_DRV moved to EC after rev1 */
-	}
 }
 
 static void configure_sdmmc(void)
@@ -59,16 +51,8 @@ static void configure_sdmmc(void)
 	/* use sdmmc0 io, disable JTAG function */
 	writel(RK_CLRBITS(1 << 12), &rk3288_grf->soc_con0);
 
-	switch (board_id()) {
-	case 0:
-		rk808_configure_ldo(PMIC_BUS, 8, 3300);	/* VCCIO_SD */
-		gpio_output(GPIO(7, C, 5), 1);		/* SD_EN */
-		break;
-	default:
-		rk808_configure_ldo(PMIC_BUS, 4, 3300); /* VCCIO_SD */
-		rk808_configure_ldo(PMIC_BUS, 5, 3300); /* VCC33_SD */
-		break;
-	}
+	rk808_configure_ldo(PMIC_BUS, 4, 3300); /* VCCIO_SD */
+	rk808_configure_ldo(PMIC_BUS, 5, 3300); /* VCC33_SD */
 
 	gpio_input(GPIO(7, A, 5));		/* SD_DET */
 }
@@ -95,14 +79,7 @@ static void configure_codec(void)
 	writel(IOMUX_I2S, &rk3288_grf->iomux_i2s);
 	writel(IOMUX_I2SCLK, &rk3288_grf->iomux_i2sclk);
 
-	switch (board_id()) {
-	case 0:
-		rk808_configure_ldo(PMIC_BUS, 5, 1800);	/* VCC18_CODEC */
-		break;
-	default:
-		rk808_configure_ldo(PMIC_BUS, 6, 1800);	/* VCC18_CODEC */
-		break;
-	}
+	rk808_configure_ldo(PMIC_BUS, 6, 1800);	/* VCC18_CODEC */
 
 	/* AUDIO IO domain 1.8V voltage selection */
 	writel(RK_SETBITS(1 << 6), &rk3288_grf->io_vsel);
@@ -113,18 +90,9 @@ static void configure_lcd(void)
 {
 	writel(IOMUX_LCDC, &rk3288_grf->iomux_lcdc);
 
-	switch (board_id()) {
-	case 0:
-		rk808_configure_ldo(PMIC_BUS, 4, 1800);	/* VCC18_LCD */
-		rk808_configure_ldo(PMIC_BUS, 6, 1000);	/* VCC10_LCD */
-		gpio_output(GPIO(7, B, 7), 1);		/* LCD_EN */
-		break;
-	default:
-		rk808_configure_switch(PMIC_BUS, 2, 1);	/* VCC18_LCD */
-		rk808_configure_ldo(PMIC_BUS, 7, 3300); /* VCC10_LCD_PWREN_H */
-		rk808_configure_switch(PMIC_BUS, 1, 1);	/* VCC33_LCD */
-		break;
-	}
+	rk808_configure_switch(PMIC_BUS, 2, 1);	/* VCC18_LCD */
+	rk808_configure_ldo(PMIC_BUS, 7, 3300); /* VCC10_LCD_PWREN_H */
+	rk808_configure_switch(PMIC_BUS, 1, 1);	/* VCC33_LCD */
 
 	gpio_output(GPIO(7, A, 0), 0);			/* LCDC_BL */
 	gpio_output(GPIO(7, A, 2), 1);			/* BL_EN */