Tim Crawford has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/81126?usp=email )
Change subject: drivers/i2c/tas5825m: Allow using I2C bus ......................................................................
drivers/i2c/tas5825m: Allow using I2C bus
The latest Clevo boards connect the TAS5825M to one of the I2C connections instead of the SMBus connection. The I2C ops are compatible with SMBus, so always use them.
Tested on system76/oryp6 (uses SMBus) and in-development system76/oryp12 (uses I2C3). TAS5825M init is successful and speaker output works.
Change-Id: I2233d6977fd460b53e27260cdfabe42e30b98041 Signed-off-by: Tim Crawford tcrawford@system76.com --- M src/drivers/i2c/tas5825m/tas5825m.c 1 file changed, 7 insertions(+), 7 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/26/81126/1
diff --git a/src/drivers/i2c/tas5825m/tas5825m.c b/src/drivers/i2c/tas5825m/tas5825m.c index 9f14059..ead1b16 100644 --- a/src/drivers/i2c/tas5825m/tas5825m.c +++ b/src/drivers/i2c/tas5825m/tas5825m.c @@ -1,23 +1,24 @@ /* SPDX-License-Identifier: GPL-2.0-only */
#include <console/console.h> -#include <device/smbus.h> -#include <device/pci.h> +#include <device/i2c_bus.h> #include "chip.h" #include "tas5825m.h"
int tas5825m_write_at(struct device *dev, uint8_t addr, uint8_t value) { - return smbus_write_byte(dev, addr, value); + return i2c_dev_writeb_at(dev, addr, value); }
-//TODO: use I2C block write for better performance int tas5825m_write_block_at(struct device *dev, uint8_t addr, const uint8_t *values, uint8_t length) { + // TODO: use I2C block write for better performance; SMBus does not + // have `transfer` op for it. + int res = 0; for (uint8_t i = 0; i < length; i++) { - res = smbus_write_byte(dev, addr + i, values[i]); + res = i2c_dev_writeb_at(dev, addr + i, values[i]); if (res < 0) return res; } @@ -45,8 +46,7 @@
static void tas5825m_init(struct device *dev) { - if (dev->enabled && dev->path.type == DEVICE_PATH_I2C && - ops_smbus_bus(get_pbus_smbus(dev))) { + if (dev->enabled && dev->path.type == DEVICE_PATH_I2C && i2c_link(dev)) { printk(BIOS_DEBUG, "tas5825m at %s\n", dev_path(dev));
struct drivers_i2c_tas5825m_config *config = dev->chip_info;