exynos5250: un-comment a lot of code which was left out earlier

Turns out initializing power rails is necessary, even for getting
serial output.

Change-Id: I3042c1001ae43b1e793ee6cb90bb79b8db0f8fd1
Signed-off-by: David Hendricks <dhendrix@chromium.org>
Reviewed-on: http://review.coreboot.org/2126
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
This commit is contained in:
David Hendricks 2013-01-09 17:42:02 -08:00 committed by Ronald G. Minnich
parent 1d5390ecc8
commit 27094b0afe
1 changed files with 13 additions and 14 deletions

View File

@ -31,6 +31,9 @@
#include <cpu/samsung/exynos5-common/spl.h> #include <cpu/samsung/exynos5-common/spl.h>
#include <drivers/maxim/max77686/max77686.h> #include <drivers/maxim/max77686/max77686.h>
#include "device/i2c.h"
#include "cpu/samsung/s5p-common/s3c24x0_i2c.h"
static void ps_hold_setup(void) static void ps_hold_setup(void)
{ {
struct exynos5_power *power = struct exynos5_power *power =
@ -138,21 +141,16 @@ int power_init(void)
{ {
int error = 0; int error = 0;
/* FIXME(dhendrix): not necessary for initial bringup... */ /*
#if 0 * FIXME(dhendrix): We will re-factor the caller of power_init()
#ifdef CONFIG_SPL_BUILD * to start from a board-specific romstage file and do the i2c
struct spl_machine_param *param = spl_get_machine_params(); * early setup. There is no reason CPU power init code should
* mess with board-specific i2c parameters.
*/
/* Set the i2c register address base so i2c works before FDT */ /* Set the i2c register address base so i2c works before FDT */
i2c_set_early_reg(param->i2c_base); i2c_set_early_reg(0x12c60000);
#endif
#endif
ps_hold_setup(); ps_hold_setup();
/* FIXME(dhendrix): not necessary for initial bringup... */
#if 0
/* init the i2c so that we can program pmic chip */
i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE); i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
/* /*
@ -183,9 +181,10 @@ int power_init(void)
REG_ENABLE, MAX77686_MV); REG_ENABLE, MAX77686_MV);
error |= max77686_volsetting(PMIC_LDO10, CONFIG_VDD_LDO10_MV, error |= max77686_volsetting(PMIC_LDO10, CONFIG_VDD_LDO10_MV,
REG_ENABLE, MAX77686_MV); REG_ENABLE, MAX77686_MV);
#endif if (error != 0) {
if (error != 0) power_shutdown();
printk(BIOS_ERR, "power init failed\n"); printk(BIOS_ERR, "power init failed\n");
}
return error; return error;
} }