Commit d1cef7af authored by Jonas Jelonek's avatar Jonas Jelonek Committed by Andi Shyti
Browse files

i2c: rtl9300: move setting SCL frequency to config_io 



Move the register operation to set the SCL frequency to the
rtl9300_i2c_config_io function instead of the rtl9300_i2c_config_xfer
function. This rather belongs there next to selecting the current SDA
output line.

Signed-off-by: default avatarJonas Jelonek <jelonek.jonas@gmail.com>
Tested-by: default avatarSven Eckelmann <sven@narfation.org>
Reviewed-by: default avatarChris Packham <chris.packham@alliedtelesis.co.nz>
Tested-by: Chris Packham <chris.packham@alliedtelesis.co.nz> # On RTL9302C based board
Tested-by: default avatarMarkus Stockhausen <markus.stockhausen@gmx.de>
Signed-off-by: default avatarAndi Shyti <andi.shyti@kernel.org>
Link: https://lore.kernel.org/r/20250927101931.71575-5-jelonek.jonas@gmail.com
parent c840492a

drivers/i2c/busses/i2c-rtl9300.c

+9 −8
Original line number Diff line number Diff line
@@ -95,18 +95,23 @@ static int rtl9300_i2c_select_scl(struct rtl9300_i2c *i2c, u8 scl) 
	return regmap_field_write(i2c->fields[F_SCL_SEL], 1);

}



static int rtl9300_i2c_config_io(struct rtl9300_i2c *i2c, u8 sda_pin)

static int rtl9300_i2c_config_io(struct rtl9300_i2c *i2c, struct rtl9300_i2c_chan *chan)

{

	struct rtl9300_i2c_drv_data *drv_data;

	int ret;



	drv_data = (struct rtl9300_i2c_drv_data *)device_get_match_data(i2c->dev);



	ret = regmap_field_update_bits(i2c->fields[F_SDA_SEL], BIT(sda_num), BIT(sda_num));

	ret = regmap_field_update_bits(i2c->fields[F_SDA_SEL], BIT(chan->sda_num),

				       BIT(chan->sda_num));

	if (ret)

		return ret;



	ret = regmap_field_write(i2c->fields[F_SDA_OUT_SEL], sda_num);

	ret = regmap_field_write(i2c->fields[F_SDA_OUT_SEL], chan->sda_num);

	if (ret)

		return ret;



	ret = regmap_field_write(i2c->fields[F_SCL_FREQ], chan->bus_freq);

	if (ret)

		return ret;
@@ -121,10 +126,6 @@ static int rtl9300_i2c_config_xfer(struct rtl9300_i2c *i2c, struct rtl9300_i2c_c 
	if (len < 1 || len > 16)

		return -EINVAL;



	ret = regmap_field_write(i2c->fields[F_SCL_FREQ], chan->bus_freq);

	if (ret)

		return ret;



	ret = regmap_field_write(i2c->fields[F_DEV_ADDR], addr);

	if (ret)

		return ret;
@@ -244,7 +245,7 @@ static int rtl9300_i2c_smbus_xfer(struct i2c_adapter *adap, u16 addr, unsigned s 


	mutex_lock(&i2c->lock);

	if (chan->sda_num != i2c->sda_num) {

		ret = rtl9300_i2c_config_io(i2c, chan->sda_pin);

		ret = rtl9300_i2c_config_io(i2c, chan);

		if (ret)

			goto out_unlock;

		i2c->sda_num = chan->sda_num;