[coreboot-gerrit] Patch set updated for coreboot: 0738388 rk3288: move reboot_from_watchdog() before rk808 setting

[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/9752

-gerrit

commit 0738388f03697a7ea9525739dec8fc240d5f5fe3
Author: huang lin <hl at rock-chips.com>
Date:   Thu Jan 29 19:50:59 2015 +0800

    rk3288: move reboot_from_watchdog() before rk808 setting
    
    we will use dvs to adjust the voltage in kernel, if device reset
    by watchdog in kernel, the dvs gpio may not reset, and we use the
    i2c to adjust rk808 voltage in coreboot, so it may failure. so we
    move the reboot_from_watchdog() before the rk808 setting.
    
    BUG=None
    TEST=Boot from speedy
    BRANCH=None
    
    Change-Id: I809c63153d49680d9c84462aafd7bae09106fa6e
    Signed-off-by: Patrick Georgi <pgeorgi at chromium.org>
    Original-Commit-Id: 76efb4b0196eecc84664a4c5dce2221152a39c0a
    Original-Change-Id: I92b5c6413bbffe30566178de89df1f9683790982
    Original-Signed-off-by: huang lin <hl at rock-chips.com>
    Original-Reviewed-on: https://chromium-review.googlesource.com/244289
    Original-Reviewed-by: Julius Werner <jwerner at chromium.org>
    Original-Commit-Queue: Julius Werner <jwerner at chromium.org>
    Original-Tested-by: Julius Werner <jwerner at chromium.org>
---
 src/mainboard/google/veyron_jerry/bootblock.c  | 6 +++---
 src/mainboard/google/veyron_mighty/bootblock.c | 6 +++---
 src/mainboard/google/veyron_pinky/bootblock.c  | 6 +++---
 src/mainboard/google/veyron_speedy/bootblock.c | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/mainboard/google/veyron_jerry/bootblock.c b/src/mainboard/google/veyron_jerry/bootblock.c
index acf81bc..2f012ec 100644
--- a/src/mainboard/google/veyron_jerry/bootblock.c
+++ b/src/mainboard/google/veyron_jerry/bootblock.c
@@ -45,6 +45,9 @@ void bootblock_mainboard_early_init()
 
 void bootblock_mainboard_init(void)
 {
+	if (rkclk_was_watchdog_reset())
+		reboot_from_watchdog();
+
 	/* Up VDD_CPU (BUCK1) to 1.4V to support max CPU frequency (1.8GHz). */
 	setbits_le32(&rk3288_pmu->iomux_i2c0scl, IOMUX_I2C0SCL);
 	setbits_le32(&rk3288_pmu->iomux_i2c0sda, IOMUX_I2C0SDA);
@@ -58,9 +61,6 @@ void bootblock_mainboard_init(void)
 	udelay(100);/* Must wait for voltage to stabilize,2mV/us */
 	rkclk_configure_cpu();
 
-	if (rkclk_was_watchdog_reset())
-		reboot_from_watchdog();
-
 	/* i2c1 for tpm */
 	writel(IOMUX_I2C1, &rk3288_grf->iomux_i2c1);
 	i2c_init(1, 400*KHz);
diff --git a/src/mainboard/google/veyron_mighty/bootblock.c b/src/mainboard/google/veyron_mighty/bootblock.c
index acf81bc..2f012ec 100644
--- a/src/mainboard/google/veyron_mighty/bootblock.c
+++ b/src/mainboard/google/veyron_mighty/bootblock.c
@@ -45,6 +45,9 @@ void bootblock_mainboard_early_init()
 
 void bootblock_mainboard_init(void)
 {
+	if (rkclk_was_watchdog_reset())
+		reboot_from_watchdog();
+
 	/* Up VDD_CPU (BUCK1) to 1.4V to support max CPU frequency (1.8GHz). */
 	setbits_le32(&rk3288_pmu->iomux_i2c0scl, IOMUX_I2C0SCL);
 	setbits_le32(&rk3288_pmu->iomux_i2c0sda, IOMUX_I2C0SDA);
@@ -58,9 +61,6 @@ void bootblock_mainboard_init(void)
 	udelay(100);/* Must wait for voltage to stabilize,2mV/us */
 	rkclk_configure_cpu();
 
-	if (rkclk_was_watchdog_reset())
-		reboot_from_watchdog();
-
 	/* i2c1 for tpm */
 	writel(IOMUX_I2C1, &rk3288_grf->iomux_i2c1);
 	i2c_init(1, 400*KHz);
diff --git a/src/mainboard/google/veyron_pinky/bootblock.c b/src/mainboard/google/veyron_pinky/bootblock.c
index acf81bc..2f012ec 100644
--- a/src/mainboard/google/veyron_pinky/bootblock.c
+++ b/src/mainboard/google/veyron_pinky/bootblock.c
@@ -45,6 +45,9 @@ void bootblock_mainboard_early_init()
 
 void bootblock_mainboard_init(void)
 {
+	if (rkclk_was_watchdog_reset())
+		reboot_from_watchdog();
+
 	/* Up VDD_CPU (BUCK1) to 1.4V to support max CPU frequency (1.8GHz). */
 	setbits_le32(&rk3288_pmu->iomux_i2c0scl, IOMUX_I2C0SCL);
 	setbits_le32(&rk3288_pmu->iomux_i2c0sda, IOMUX_I2C0SDA);
@@ -58,9 +61,6 @@ void bootblock_mainboard_init(void)
 	udelay(100);/* Must wait for voltage to stabilize,2mV/us */
 	rkclk_configure_cpu();
 
-	if (rkclk_was_watchdog_reset())
-		reboot_from_watchdog();
-
 	/* i2c1 for tpm */
 	writel(IOMUX_I2C1, &rk3288_grf->iomux_i2c1);
 	i2c_init(1, 400*KHz);
diff --git a/src/mainboard/google/veyron_speedy/bootblock.c b/src/mainboard/google/veyron_speedy/bootblock.c
index acf81bc..2f012ec 100644
--- a/src/mainboard/google/veyron_speedy/bootblock.c
+++ b/src/mainboard/google/veyron_speedy/bootblock.c
@@ -45,6 +45,9 @@ void bootblock_mainboard_early_init()
 
 void bootblock_mainboard_init(void)
 {
+	if (rkclk_was_watchdog_reset())
+		reboot_from_watchdog();
+
 	/* Up VDD_CPU (BUCK1) to 1.4V to support max CPU frequency (1.8GHz). */
 	setbits_le32(&rk3288_pmu->iomux_i2c0scl, IOMUX_I2C0SCL);
 	setbits_le32(&rk3288_pmu->iomux_i2c0sda, IOMUX_I2C0SDA);
@@ -58,9 +61,6 @@ void bootblock_mainboard_init(void)
 	udelay(100);/* Must wait for voltage to stabilize,2mV/us */
 	rkclk_configure_cpu();
 
-	if (rkclk_was_watchdog_reset())
-		reboot_from_watchdog();
-
 	/* i2c1 for tpm */
 	writel(IOMUX_I2C1, &rk3288_grf->iomux_i2c1);
 	i2c_init(1, 400*KHz);