Skip to content

Commit d1cef7a

Browse files
jonasjelonekAndi Shyti
authored andcommitted
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: Jonas Jelonek <jelonek.jonas@gmail.com> Tested-by: Sven Eckelmann <sven@narfation.org> Reviewed-by: Chris Packham <chris.packham@alliedtelesis.co.nz> Tested-by: Chris Packham <chris.packham@alliedtelesis.co.nz> # On RTL9302C based board Tested-by: Markus Stockhausen <markus.stockhausen@gmx.de> Signed-off-by: Andi Shyti <andi.shyti@kernel.org> Link: https://lore.kernel.org/r/20250927101931.71575-5-jelonek.jonas@gmail.com
1 parent c840492 commit d1cef7a

1 file changed

Lines changed: 9 additions & 8 deletions

File tree

drivers/i2c/busses/i2c-rtl9300.c

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -95,18 +95,23 @@ static int rtl9300_i2c_select_scl(struct rtl9300_i2c *i2c, u8 scl)
9595
return regmap_field_write(i2c->fields[F_SCL_SEL], 1);
9696
}
9797

98-
static int rtl9300_i2c_config_io(struct rtl9300_i2c *i2c, u8 sda_pin)
98+
static int rtl9300_i2c_config_io(struct rtl9300_i2c *i2c, struct rtl9300_i2c_chan *chan)
9999
{
100100
struct rtl9300_i2c_drv_data *drv_data;
101101
int ret;
102102

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

105-
ret = regmap_field_update_bits(i2c->fields[F_SDA_SEL], BIT(sda_num), BIT(sda_num));
105+
ret = regmap_field_update_bits(i2c->fields[F_SDA_SEL], BIT(chan->sda_num),
106+
BIT(chan->sda_num));
106107
if (ret)
107108
return ret;
108109

109-
ret = regmap_field_write(i2c->fields[F_SDA_OUT_SEL], sda_num);
110+
ret = regmap_field_write(i2c->fields[F_SDA_OUT_SEL], chan->sda_num);
111+
if (ret)
112+
return ret;
113+
114+
ret = regmap_field_write(i2c->fields[F_SCL_FREQ], chan->bus_freq);
110115
if (ret)
111116
return ret;
112117

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

124-
ret = regmap_field_write(i2c->fields[F_SCL_FREQ], chan->bus_freq);
125-
if (ret)
126-
return ret;
127-
128129
ret = regmap_field_write(i2c->fields[F_DEV_ADDR], addr);
129130
if (ret)
130131
return ret;
@@ -244,7 +245,7 @@ static int rtl9300_i2c_smbus_xfer(struct i2c_adapter *adap, u16 addr, unsigned s
244245

245246
mutex_lock(&i2c->lock);
246247
if (chan->sda_num != i2c->sda_num) {
247-
ret = rtl9300_i2c_config_io(i2c, chan->sda_pin);
248+
ret = rtl9300_i2c_config_io(i2c, chan);
248249
if (ret)
249250
goto out_unlock;
250251
i2c->sda_num = chan->sda_num;

0 commit comments

Comments
 (0)