soc/amd/stoneyridge: initialize i2c buses marked as early init
Initialize the i2c buses that are marked as early init in the device tree. BUG=b:70232394,b:69250772 Change-Id: Iced1797f3bb4765646736c423b081cdc33c12a48 Signed-off-by: Aaron Durbin <adurbin@chromium.org> Reviewed-on: https://review.coreboot.org/23497 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Furquan Shaikh <furquan@google.com> Reviewed-by: Justin TerAvest <teravest@chromium.org>
This commit is contained in:
parent
7ad0ce7b40
commit
de3e84c925
|
@ -130,4 +130,7 @@ void bootblock_soc_init(void)
|
||||||
post_code(0x38);
|
post_code(0x38);
|
||||||
/* APs will not exit amdinitearly */
|
/* APs will not exit amdinitearly */
|
||||||
do_agesawrapper(agesawrapper_amdinitearly, "amdinitearly");
|
do_agesawrapper(agesawrapper_amdinitearly, "amdinitearly");
|
||||||
|
|
||||||
|
/* Initialize any early i2c buses. */
|
||||||
|
i2c_soc_early_init();
|
||||||
}
|
}
|
||||||
|
|
|
@ -19,6 +19,7 @@
|
||||||
#include <drivers/i2c/designware/dw_i2c.h>
|
#include <drivers/i2c/designware/dw_i2c.h>
|
||||||
#include <soc/iomap.h>
|
#include <soc/iomap.h>
|
||||||
#include <soc/pci_devs.h>
|
#include <soc/pci_devs.h>
|
||||||
|
#include <soc/southbridge.h>
|
||||||
#include "chip.h"
|
#include "chip.h"
|
||||||
|
|
||||||
#define I2C_BUS_ADDRESS(x) (I2C_BASE_ADDRESS + I2C_DEVICE_SIZE * (x))
|
#define I2C_BUS_ADDRESS(x) (I2C_BASE_ADDRESS + I2C_DEVICE_SIZE * (x))
|
||||||
|
@ -42,9 +43,8 @@ uintptr_t dw_i2c_base_address(unsigned int bus)
|
||||||
return bus < I2C_DEVICE_COUNT ? i2c_bus_address[bus] : 0;
|
return bus < I2C_DEVICE_COUNT ? i2c_bus_address[bus] : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
const struct dw_i2c_bus_config *dw_i2c_get_soc_cfg(unsigned int bus)
|
static const struct soc_amd_stoneyridge_config *get_soc_config(void)
|
||||||
{
|
{
|
||||||
const struct soc_amd_stoneyridge_config *config;
|
|
||||||
const struct device *dev = dev_find_slot(0, GNB_DEVFN);
|
const struct device *dev = dev_find_slot(0, GNB_DEVFN);
|
||||||
|
|
||||||
if (!dev || !dev->chip_info) {
|
if (!dev || !dev->chip_info) {
|
||||||
|
@ -52,10 +52,21 @@ const struct dw_i2c_bus_config *dw_i2c_get_soc_cfg(unsigned int bus)
|
||||||
__func__);
|
__func__);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return dev->chip_info;
|
||||||
|
}
|
||||||
|
|
||||||
|
const struct dw_i2c_bus_config *dw_i2c_get_soc_cfg(unsigned int bus)
|
||||||
|
{
|
||||||
|
const struct soc_amd_stoneyridge_config *config;
|
||||||
|
|
||||||
if (bus >= ARRAY_SIZE(i2c_bus_address))
|
if (bus >= ARRAY_SIZE(i2c_bus_address))
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
config = dev->chip_info;
|
config = get_soc_config();
|
||||||
|
if (config == NULL)
|
||||||
|
return NULL;
|
||||||
|
|
||||||
return &config->i2c[bus];
|
return &config->i2c[bus];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -90,6 +101,27 @@ int dw_i2c_soc_dev_to_bus(struct device *dev)
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void i2c_soc_early_init(void)
|
||||||
|
{
|
||||||
|
size_t i;
|
||||||
|
const struct soc_amd_stoneyridge_config *config;
|
||||||
|
|
||||||
|
config = get_soc_config();
|
||||||
|
|
||||||
|
if (config == NULL)
|
||||||
|
return;
|
||||||
|
|
||||||
|
for (i = 0; i < ARRAY_SIZE(config->i2c); i++) {
|
||||||
|
const struct dw_i2c_bus_config *cfg = &config->i2c[i];
|
||||||
|
|
||||||
|
if (!cfg->early_init)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
if (dw_i2c_init(i, cfg))
|
||||||
|
printk(BIOS_ERR, "Failed to init i2c bus %zd\n", i);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
struct device_operations stoneyridge_i2c_mmio_ops = {
|
struct device_operations stoneyridge_i2c_mmio_ops = {
|
||||||
/* TODO(teravest): Move I2C resource info here. */
|
/* TODO(teravest): Move I2C resource info here. */
|
||||||
.read_resources = DEVICE_NOOP,
|
.read_resources = DEVICE_NOOP,
|
||||||
|
|
|
@ -389,4 +389,7 @@ int sb_set_wideio_range(uint16_t start, uint16_t size);
|
||||||
int mainboard_get_xhci_oc_map(uint16_t *usb_oc_map);
|
int mainboard_get_xhci_oc_map(uint16_t *usb_oc_map);
|
||||||
int mainboard_get_ehci_oc_map(uint16_t *usb_oc_map);
|
int mainboard_get_ehci_oc_map(uint16_t *usb_oc_map);
|
||||||
|
|
||||||
|
/* Initialize all the i2c buses that are marked with early init. */
|
||||||
|
void i2c_soc_early_init(void);
|
||||||
|
|
||||||
#endif /* __STONEYRIDGE_H__ */
|
#endif /* __STONEYRIDGE_H__ */
|
||||||
|
|
Loading…
Reference in New Issue