diff options
Diffstat (limited to 'src/mainboard/google/veyron_jerry')
| -rw-r--r-- | src/mainboard/google/veyron_jerry/bootblock.c | 1 | ||||
| -rw-r--r-- | src/mainboard/google/veyron_jerry/mainboard.c | 6 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/mainboard/google/veyron_jerry/bootblock.c b/src/mainboard/google/veyron_jerry/bootblock.c index 4536f31069..5571d456f8 100644 --- a/src/mainboard/google/veyron_jerry/bootblock.c +++ b/src/mainboard/google/veyron_jerry/bootblock.c @@ -64,6 +64,7 @@ void bootblock_mainboard_init(void) /* i2c1 for tpm */ writel(IOMUX_I2C1, &rk3288_grf->iomux_i2c1); + i2c_init(1, 400*KHz); /* spi2 for firmware ROM */ writel(IOMUX_SPI2_CSCLK, &rk3288_grf->iomux_spi2csclk); diff --git a/src/mainboard/google/veyron_jerry/mainboard.c b/src/mainboard/google/veyron_jerry/mainboard.c index 9d8bb5d6dd..d9952605dc 100644 --- a/src/mainboard/google/veyron_jerry/mainboard.c +++ b/src/mainboard/google/veyron_jerry/mainboard.c @@ -72,7 +72,7 @@ static void configure_emmc(void) static void configure_codec(void) { writel(IOMUX_I2C2, &rk3288_grf->iomux_i2c2); /* CODEC I2C */ - i2c_init(2, 400000); /* CODEC I2C */ + i2c_init(2, 400*KHz); /* CODEC I2C */ writel(IOMUX_I2S, &rk3288_grf->iomux_i2s); writel(IOMUX_I2SCLK, &rk3288_grf->iomux_i2sclk); @@ -108,10 +108,6 @@ static void configure_vop(void) static void mainboard_init(device_t dev) { - setbits_le32(&rk3288_pmu->iomux_i2c0scl, IOMUX_I2C0SCL); /* PMIC I2C */ - setbits_le32(&rk3288_pmu->iomux_i2c0sda, IOMUX_I2C0SDA); /* PMIC I2C */ - i2c_init(0, 400000); /* PMIC I2C */ - gpio_output(GPIO_RESET, 0); configure_usb(); |