diff --git a/src/mainboard/google/veyron_pinky/bootblock.c b/src/mainboard/google/veyron_pinky/bootblock.c
index b34199dfe5..99719c4024 100644
--- a/src/mainboard/google/veyron_pinky/bootblock.c
+++ b/src/mainboard/google/veyron_pinky/bootblock.c
@@ -27,16 +27,25 @@
 #include <soc/rk808.h>
 #include <soc/spi.h>
 #include <vendorcode/google/chromeos/chromeos.h>
+#include <delay.h>
 
 #include "board.h"
 
 void bootblock_mainboard_init(void)
 {
-	/* cpu frequency will up to 1.8GHz, so the buck1 must up to 1.3v */
+	/* cpu frequency will up to 1.8GHz,
+	 * in our experience the buck1
+	 * must up to 1.4v
+	 */
 	setbits_le32(&rk3288_pmu->iomux_i2c0scl, IOMUX_I2C0SCL);
 	setbits_le32(&rk3288_pmu->iomux_i2c0sda, IOMUX_I2C0SDA);
 	i2c_init(PMIC_BUS, 400*KHz);
-	rk808_configure_buck(PMIC_BUS, 1, 1300);
+
+	/* Slowly raise to max CPU voltage to prevent overshoot */
+	rk808_configure_buck(PMIC_BUS, 1, 1200);
+	udelay(175);/* Must wait for voltage to stabilize,2mV/us */
+	rk808_configure_buck(PMIC_BUS, 1, 1400);
+	udelay(100);/* Must wait for voltage to stabilize,2mV/us */
 	rkclk_configure_cpu();
 
 	/* i2c1 for tpm */
diff --git a/src/soc/rockchip/rk3288/rk808.c b/src/soc/rockchip/rk3288/rk808.c
index aa39b8d5ee..fea64e5ebe 100644
--- a/src/soc/rockchip/rk3288/rk808.c
+++ b/src/soc/rockchip/rk3288/rk808.c
@@ -98,5 +98,4 @@ void rk808_configure_buck(uint8_t bus, int buck, int millivolts)
 	}
 	rk808_clrsetbits(bus, buck_reg, 0x3f, vsel);
 	rk808_clrsetbits(bus, DCDC_EN, 0, 1 << (buck - 1));
-	udelay(225);/* Must wait for voltage to stabilize */
 }