From nobody Tue Oct 7 06:50:53 2025 Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 672AA19CD01; Sat, 12 Jul 2025 19:43:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752349405; cv=none; b=J6Id8us9jY6mHQQ5UstMVdcHPC8IY76dmqa/1mGxH3CuPXgH5vp5dGH70BGfSpvtW7+lzd0zVXpPfHuzzOi5jrYzPxO1/TRGYR7V9Z+IjghwMRnA55AqNJfif2zmBhTNKnzyYFGHutR7lkj1u5S2/R9co9IcFOjJH37gff12SQE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752349405; c=relaxed/simple; bh=z37mv2X2bUS0Tz2w3iKUJu/SwFC4Kyls31sqrdSniGc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AGnxJakMk5SGjwwFehfFJfS5b9ZxjUJaB5a15aI9AdSh0NejtIqzBV4loT+t0YKQWLLmso0tdLZpjDTL0id6W0DS9qf0SquQG+O0c+KccVbqGvnYhcEwHFjiXvfR8vEJlbANlWEKU0R2NYIEY4dxunFq4AMUbutlTRLLeMJZOB4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=jh/zDfmi; arc=none smtp.client-ip=209.85.128.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="jh/zDfmi" Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-4530921461aso20115215e9.0; Sat, 12 Jul 2025 12:43:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752349402; x=1752954202; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=d2vzXymIy4Lof81UiknjsyL3LH+faW/x4IFso4f7g3w=; b=jh/zDfmiJrKYHZcmJy52lX0aNbrJUTkVhmu5ocK2mPCRz5220mREvnrjVyl2zmxZM8 MkKDDUQlKzuaRNfmJgCHEArKPx5cXtlC0sIm+CEwLXwhINqGZMjCYb5OwE6Kje6eVeSi ra3Go1Tmu5jvX6/cNfTOeEqekl/qGLQ7F67FomKkpC0h5ZGxjNG7w87et+Xd4OXE6VnB w1g6xO4uhG4U4MMjNiLYq7mDwkmUqtKEKgGr16iXvrNnNqOyjRZHir9bWDaYtz+HUUMP 85sYcQxCmgZnvI0Y9ddJTUXjSXKdubBsnqFHI5v9IExgyRGhjSxL8OB7MV/Vdn6FYmDN jkbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752349402; x=1752954202; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=d2vzXymIy4Lof81UiknjsyL3LH+faW/x4IFso4f7g3w=; b=TcrwL8rsb2hRrQBcbWMHICyi0kdiDyncEt1Bf3TQkIbrK4R46Ysp57G3JERZnzih0s ezxD6d7vjaPaQzwBoD+uN+Plufpr14ShAj8/SH4XqUTwKEazr5fBEZy5SKNkg54HC3Vo MughtNc73iEbCMLTiRZu2CFC5EtPZnwrb5aeht6yxc6KIApzsYhHRg16shDw7iY4Ung1 WZ67jsYufhl+sAeQfbm7JsrsNBULE8DALoI0/sNxIf59bB3nj1/fCzxT72F8ph/+GtWH rp0Olh/Yl6pYWfA0PkhDWkHrPxICcp9TV67nfvvgiTvs9d7+Rv6B5la7ukrGzKf8ELWg 5OxA== X-Forwarded-Encrypted: i=1; AJvYcCUnPOjnzOZlEgQr06PqNClSFKV6dZcG9iQcitd4a5BUShvjZ6OmF+O06vl+fZxYciTEmID7DJw6wnlSY28n@vger.kernel.org, AJvYcCXyi5kAyN46Vl3V0Ctpvzyh+XN0JDt8o59YyignqE80Vs+C572yRlAYjchf+IphZ7igq2/Vq6EJEc/8@vger.kernel.org X-Gm-Message-State: AOJu0Yy372V45ylB2NQuhHYtkz90sAji3Z9UiQrO5fekiOk4RKR5cWaB LMGgJoJ29WGnmnsRfr15sXZ9DsfAiFMpxdX6EljlJVBuClFMuCHizcOXlx5LXA== X-Gm-Gg: ASbGncv7cQrdhuimzsFs9K8/86M+hhQ/V8elqwwBgYoZvHc94t6UQnyaXJ5cZKAkVB2 TeMkpfCNy/Dee3Iv0UxkgZSHGwmDvE2fVk/WR2B0Mo8HEhU+zXf01nJIgewtYMx5PsEHbch6jXq djE5cceHSWRe+mdItSCNDNVD3LJarcR9K5fe8C0RzvlPo+jthGdi9zHNumYeotaBi9llfqZKuj6 UgdGkBNgQKadgFSn4hY1SMXBc8mh9gMVqkMcnrLaAApntGlmoPdNxZCh6gZnmB6qD9X5DVpzgZ3 hl3k1jnkAI03xW4rfNLNug5AbAvIYRBGNLNLTN7qhinHLR+TzG4LOJGTae6/hz5BwR3iKzaJll1 b2oMQDJS35B6cbzLYyfkmEF08lq4rmmZN9ASQFVRNwHpC6AGZw4kk X-Google-Smtp-Source: AGHT+IE5qXOBWSWNqyzCkjzpE8V70US/ND8x/7GUnPhxXSM1tDrnAvyCxOSiDrC0Vaka+0nhUB01Dg== X-Received: by 2002:a05:600c:444b:b0:456:fc1:c26d with SMTP id 5b1f17b1804b1-4560fc1c572mr12253465e9.2.1752349401289; Sat, 12 Jul 2025 12:43:21 -0700 (PDT) Received: from builder.. (246-9-142-46.pool.kielnet.net. [46.142.9.246]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-454d5032e9esm123422335e9.3.2025.07.12.12.43.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Jul 2025 12:43:21 -0700 (PDT) From: Jonas Jelonek To: linux-i2c@vger.kernel.org, Chris Packham , Andi Shyti , Rob Herring , Krzysztof Kozlowski , Conor Dooley , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Markus Stockhausen , Jonas Jelonek Subject: [PATCH v2 1/3] i2c: rework RTL9300 I2C controller driver Date: Sat, 12 Jul 2025 19:42:53 +0000 Message-ID: <20250712194255.7022-2-jelonek.jonas@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250712194255.7022-1-jelonek.jonas@gmail.com> References: <20250712194255.7022-1-jelonek.jonas@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Rework the RTL9300 I2C controller driver to use more of the regmap API, especially make use of reg_field and regmap_field to represent registers instead of macros. Most register operations are performed through regmap_field_* API then. Handle SCL selection using separate chip-specific functions since this is already known to differ between the Realtek SoC families in such a way that this cannot be properly handled using just a different reg_field. These changes make it a lot easier to add support for newer generations or to handle differences between specific revisions within a series. Support can be added by defining a separate driver data structure with the corresponding register field definitions and linking it to a new compatible string. Reviewed-by: Chris Packham Tested-by: Chris Packham # On RTL9302c Signed-off-by: Jonas Jelonek --- drivers/i2c/busses/i2c-rtl9300.c | 190 ++++++++++++++++++++----------- 1 file changed, 124 insertions(+), 66 deletions(-) diff --git a/drivers/i2c/busses/i2c-rtl9300.c b/drivers/i2c/busses/i2c-rtl9= 300.c index e064e8a4a1f0..f8e81102ee74 100644 --- a/drivers/i2c/busses/i2c-rtl9300.c +++ b/drivers/i2c/busses/i2c-rtl9300.c @@ -23,94 +23,115 @@ struct rtl9300_i2c_chan { u8 sda_pin; }; =20 +enum rtl9300_i2c_reg_scope { + REG_SCOPE_GLOBAL, + REG_SCOPE_MASTER, +}; + +struct rtl9300_i2c_reg_field { + struct reg_field field; + enum rtl9300_i2c_reg_scope scope; +}; + +enum rtl9300_i2c_reg_fields { + F_DATA_WIDTH =3D 0, + F_DEV_ADDR, + F_I2C_FAIL, + F_I2C_TRIG, + F_MEM_ADDR, + F_MEM_ADDR_WIDTH, + F_RD_MODE, + F_RWOP, + F_SCL_FREQ, + F_SCL_SEL, + F_SDA_OUT_SEL, + F_SDA_SEL, + + /* keep last */ + F_NUM_FIELDS +}; + +struct rtl9300_i2c_drv_data { + struct rtl9300_i2c_reg_field field_desc[F_NUM_FIELDS]; + int (*select_scl)(struct rtl9300_i2c *i2c, u8 scl); + u32 data_reg; + u8 max_nchan; +}; + #define RTL9300_I2C_MUX_NCHAN 8 =20 struct rtl9300_i2c { struct regmap *regmap; struct device *dev; struct rtl9300_i2c_chan chans[RTL9300_I2C_MUX_NCHAN]; + struct regmap_field *fields[F_NUM_FIELDS]; u32 reg_base; + u32 data_reg; u8 sda_pin; struct mutex lock; }; =20 #define RTL9300_I2C_MST_CTRL1 0x0 -#define RTL9300_I2C_MST_CTRL1_MEM_ADDR_OFS 8 -#define RTL9300_I2C_MST_CTRL1_MEM_ADDR_MASK GENMASK(31, 8) -#define RTL9300_I2C_MST_CTRL1_SDA_OUT_SEL_OFS 4 -#define RTL9300_I2C_MST_CTRL1_SDA_OUT_SEL_MASK GENMASK(6, 4) -#define RTL9300_I2C_MST_CTRL1_GPIO_SCL_SEL BIT(3) -#define RTL9300_I2C_MST_CTRL1_RWOP BIT(2) -#define RTL9300_I2C_MST_CTRL1_I2C_FAIL BIT(1) -#define RTL9300_I2C_MST_CTRL1_I2C_TRIG BIT(0) #define RTL9300_I2C_MST_CTRL2 0x4 -#define RTL9300_I2C_MST_CTRL2_RD_MODE BIT(15) -#define RTL9300_I2C_MST_CTRL2_DEV_ADDR_OFS 8 -#define RTL9300_I2C_MST_CTRL2_DEV_ADDR_MASK GENMASK(14, 8) -#define RTL9300_I2C_MST_CTRL2_DATA_WIDTH_OFS 4 -#define RTL9300_I2C_MST_CTRL2_DATA_WIDTH_MASK GENMASK(7, 4) -#define RTL9300_I2C_MST_CTRL2_MEM_ADDR_WIDTH_OFS 2 -#define RTL9300_I2C_MST_CTRL2_MEM_ADDR_WIDTH_MASK GENMASK(3, 2) -#define RTL9300_I2C_MST_CTRL2_SCL_FREQ_OFS 0 -#define RTL9300_I2C_MST_CTRL2_SCL_FREQ_MASK GENMASK(1, 0) #define RTL9300_I2C_MST_DATA_WORD0 0x8 #define RTL9300_I2C_MST_DATA_WORD1 0xc #define RTL9300_I2C_MST_DATA_WORD2 0x10 #define RTL9300_I2C_MST_DATA_WORD3 0x14 - #define RTL9300_I2C_MST_GLB_CTRL 0x384 =20 + static int rtl9300_i2c_reg_addr_set(struct rtl9300_i2c *i2c, u32 reg, u16 = len) { - u32 val, mask; int ret; =20 - val =3D len << RTL9300_I2C_MST_CTRL2_MEM_ADDR_WIDTH_OFS; - mask =3D RTL9300_I2C_MST_CTRL2_MEM_ADDR_WIDTH_MASK; - - ret =3D regmap_update_bits(i2c->regmap, i2c->reg_base + RTL9300_I2C_MST_C= TRL2, mask, val); + ret =3D regmap_field_write(i2c->fields[F_MEM_ADDR_WIDTH], len); if (ret) return ret; =20 - val =3D reg << RTL9300_I2C_MST_CTRL1_MEM_ADDR_OFS; - mask =3D RTL9300_I2C_MST_CTRL1_MEM_ADDR_MASK; + return regmap_field_write(i2c->fields[F_MEM_ADDR], reg); +} =20 - return regmap_update_bits(i2c->regmap, i2c->reg_base + RTL9300_I2C_MST_CT= RL1, mask, val); +static int rtl9300_i2c_select_scl(struct rtl9300_i2c *i2c, u8 scl) +{ + return regmap_field_write(i2c->fields[F_SCL_SEL], 1); } =20 static int rtl9300_i2c_config_io(struct rtl9300_i2c *i2c, u8 sda_pin) { + struct rtl9300_i2c_drv_data *drv_data; int ret; - u32 val, mask; =20 - ret =3D regmap_update_bits(i2c->regmap, RTL9300_I2C_MST_GLB_CTRL, BIT(sda= _pin), BIT(sda_pin)); + drv_data =3D (struct rtl9300_i2c_drv_data *)device_get_match_data(i2c->de= v); + + ret =3D regmap_field_update_bits(i2c->fields[F_SDA_SEL], BIT(sda_pin), BI= T(sda_pin)); if (ret) return ret; =20 - val =3D (sda_pin << RTL9300_I2C_MST_CTRL1_SDA_OUT_SEL_OFS) | - RTL9300_I2C_MST_CTRL1_GPIO_SCL_SEL; - mask =3D RTL9300_I2C_MST_CTRL1_SDA_OUT_SEL_MASK | RTL9300_I2C_MST_CTRL1_G= PIO_SCL_SEL; + ret =3D regmap_field_write(i2c->fields[F_SDA_OUT_SEL], sda_pin); + if (ret) + return ret; =20 - return regmap_update_bits(i2c->regmap, i2c->reg_base + RTL9300_I2C_MST_CT= RL1, mask, val); + return drv_data->select_scl(i2c, 0); } =20 static int rtl9300_i2c_config_xfer(struct rtl9300_i2c *i2c, struct rtl9300= _i2c_chan *chan, u16 addr, u16 len) { - u32 val, mask; - - val =3D chan->bus_freq << RTL9300_I2C_MST_CTRL2_SCL_FREQ_OFS; - mask =3D RTL9300_I2C_MST_CTRL2_SCL_FREQ_MASK; + int ret; =20 - val |=3D addr << RTL9300_I2C_MST_CTRL2_DEV_ADDR_OFS; - mask |=3D RTL9300_I2C_MST_CTRL2_DEV_ADDR_MASK; + ret =3D regmap_field_write(i2c->fields[F_SCL_FREQ], chan->bus_freq); + if (ret) + return ret; =20 - val |=3D ((len - 1) & 0xf) << RTL9300_I2C_MST_CTRL2_DATA_WIDTH_OFS; - mask |=3D RTL9300_I2C_MST_CTRL2_DATA_WIDTH_MASK; + ret =3D regmap_field_write(i2c->fields[F_DEV_ADDR], addr); + if (ret) + return ret; =20 - mask |=3D RTL9300_I2C_MST_CTRL2_RD_MODE; + ret =3D regmap_field_write(i2c->fields[F_DATA_WIDTH], (len - 1) & 0xf); + if (ret) + return ret; =20 - return regmap_update_bits(i2c->regmap, i2c->reg_base + RTL9300_I2C_MST_CT= RL2, mask, val); + return regmap_field_write(i2c->fields[F_RD_MODE], 0); } =20 static int rtl9300_i2c_read(struct rtl9300_i2c *i2c, u8 *buf, int len) @@ -121,8 +142,7 @@ static int rtl9300_i2c_read(struct rtl9300_i2c *i2c, u8= *buf, int len) if (len > 16) return -EIO; =20 - ret =3D regmap_bulk_read(i2c->regmap, i2c->reg_base + RTL9300_I2C_MST_DAT= A_WORD0, - vals, ARRAY_SIZE(vals)); + ret =3D regmap_bulk_read(i2c->regmap, i2c->data_reg, vals, ARRAY_SIZE(val= s)); if (ret) return ret; =20 @@ -149,49 +169,46 @@ static int rtl9300_i2c_write(struct rtl9300_i2c *i2c,= u8 *buf, int len) vals[i/4] |=3D buf[i]; } =20 - return regmap_bulk_write(i2c->regmap, i2c->reg_base + RTL9300_I2C_MST_DAT= A_WORD0, - vals, ARRAY_SIZE(vals)); + return regmap_bulk_write(i2c->regmap, i2c->data_reg, vals, ARRAY_SIZE(val= s)); } =20 static int rtl9300_i2c_writel(struct rtl9300_i2c *i2c, u32 data) { - return regmap_write(i2c->regmap, i2c->reg_base + RTL9300_I2C_MST_DATA_WOR= D0, data); + return regmap_write(i2c->regmap, i2c->data_reg, data); } =20 static int rtl9300_i2c_execute_xfer(struct rtl9300_i2c *i2c, char read_wri= te, int size, union i2c_smbus_data *data, int len) { - u32 val, mask; + u32 val; int ret; =20 - val =3D read_write =3D=3D I2C_SMBUS_WRITE ? RTL9300_I2C_MST_CTRL1_RWOP : = 0; - mask =3D RTL9300_I2C_MST_CTRL1_RWOP; - - val |=3D RTL9300_I2C_MST_CTRL1_I2C_TRIG; - mask |=3D RTL9300_I2C_MST_CTRL1_I2C_TRIG; + ret =3D regmap_field_write(i2c->fields[F_RWOP], read_write =3D=3D I2C_SMB= US_WRITE); + if (ret) + return ret; =20 - ret =3D regmap_update_bits(i2c->regmap, i2c->reg_base + RTL9300_I2C_MST_C= TRL1, mask, val); + ret =3D regmap_field_write(i2c->fields[F_I2C_TRIG], 1); if (ret) return ret; =20 - ret =3D regmap_read_poll_timeout(i2c->regmap, i2c->reg_base + RTL9300_I2C= _MST_CTRL1, - val, !(val & RTL9300_I2C_MST_CTRL1_I2C_TRIG), 100, 2000); + regmap_field_read_poll_timeout(i2c->fields[F_I2C_TRIG], val, !val, 100, 2= 000); if (ret) return ret; =20 - if (val & RTL9300_I2C_MST_CTRL1_I2C_FAIL) + ret =3D regmap_field_read(i2c->fields[F_I2C_FAIL], &val); + if (ret) + return ret; + if (val) return -EIO; =20 if (read_write =3D=3D I2C_SMBUS_READ) { if (size =3D=3D I2C_SMBUS_BYTE || size =3D=3D I2C_SMBUS_BYTE_DATA) { - ret =3D regmap_read(i2c->regmap, - i2c->reg_base + RTL9300_I2C_MST_DATA_WORD0, &val); + ret =3D regmap_read(i2c->regmap, i2c->data_reg, &val); if (ret) return ret; data->byte =3D val & 0xff; } else if (size =3D=3D I2C_SMBUS_WORD_DATA) { - ret =3D regmap_read(i2c->regmap, - i2c->reg_base + RTL9300_I2C_MST_DATA_WORD0, &val); + ret =3D regmap_read(i2c->regmap, i2c->data_reg, &val); if (ret) return ret; data->word =3D val & 0xffff; @@ -331,6 +348,8 @@ static int rtl9300_i2c_probe(struct platform_device *pd= ev) u32 clock_freq, sda_pin; int ret, i =3D 0; struct fwnode_handle *child; + struct rtl9300_i2c_drv_data *drv_data; + struct reg_field fields[F_NUM_FIELDS]; =20 i2c =3D devm_kzalloc(dev, sizeof(*i2c), GFP_KERNEL); if (!i2c) @@ -349,9 +368,22 @@ static int rtl9300_i2c_probe(struct platform_device *p= dev) =20 platform_set_drvdata(pdev, i2c); =20 - if (device_get_child_node_count(dev) >=3D RTL9300_I2C_MUX_NCHAN) + drv_data =3D (struct rtl9300_i2c_drv_data *)device_get_match_data(i2c->de= v); + if (device_get_child_node_count(dev) >=3D drv_data->max_nchan) return dev_err_probe(dev, -EINVAL, "Too many channels\n"); =20 + i2c->data_reg =3D i2c->reg_base + drv_data->data_reg; + for (i =3D 0; i < F_NUM_FIELDS; i++) { + fields[i] =3D drv_data->field_desc[i].field; + if (drv_data->field_desc[i].scope =3D=3D REG_SCOPE_MASTER) + fields[i].reg +=3D i2c->reg_base; + } + ret =3D devm_regmap_field_bulk_alloc(dev, i2c->regmap, i2c->fields, + fields, F_NUM_FIELDS); + if (ret) + return ret; + + i =3D 0; device_for_each_child_node(dev, child) { struct rtl9300_i2c_chan *chan =3D &i2c->chans[i]; struct i2c_adapter *adap =3D &chan->adap; @@ -400,11 +432,37 @@ static int rtl9300_i2c_probe(struct platform_device *= pdev) return 0; } =20 +#define GLB_REG_FIELD(reg, msb, lsb) \ + { .field =3D REG_FIELD(reg, msb, lsb), .scope =3D REG_SCOPE_GLOBAL } +#define MST_REG_FIELD(reg, msb, lsb) \ + { .field =3D REG_FIELD(reg, msb, lsb), .scope =3D REG_SCOPE_MASTER } + +static const struct rtl9300_i2c_drv_data rtl9300_i2c_drv_data =3D { + .field_desc =3D { + [F_MEM_ADDR] =3D MST_REG_FIELD(RTL9300_I2C_MST_CTRL1, 8, 31), + [F_SDA_OUT_SEL] =3D MST_REG_FIELD(RTL9300_I2C_MST_CTRL1, 4, 6), + [F_SCL_SEL] =3D MST_REG_FIELD(RTL9300_I2C_MST_CTRL1, 3, 3), + [F_RWOP] =3D MST_REG_FIELD(RTL9300_I2C_MST_CTRL1, 2, 2), + [F_I2C_FAIL] =3D MST_REG_FIELD(RTL9300_I2C_MST_CTRL1, 1, 1), + [F_I2C_TRIG] =3D MST_REG_FIELD(RTL9300_I2C_MST_CTRL1, 0, 0), + [F_RD_MODE] =3D MST_REG_FIELD(RTL9300_I2C_MST_CTRL2, 15, 15), + [F_DEV_ADDR] =3D MST_REG_FIELD(RTL9300_I2C_MST_CTRL2, 8, 14), + [F_DATA_WIDTH] =3D MST_REG_FIELD(RTL9300_I2C_MST_CTRL2, 4, 7), + [F_MEM_ADDR_WIDTH] =3D MST_REG_FIELD(RTL9300_I2C_MST_CTRL2, 2, 3), + [F_SCL_FREQ] =3D MST_REG_FIELD(RTL9300_I2C_MST_CTRL2, 0, 1), + [F_SDA_SEL] =3D GLB_REG_FIELD(RTL9300_I2C_MST_GLB_CTRL, 0, 7), + }, + .select_scl =3D rtl9300_i2c_select_scl, + .data_reg =3D RTL9300_I2C_MST_DATA_WORD0, + .max_nchan =3D RTL9300_I2C_MUX_NCHAN, +}; + + static const struct of_device_id i2c_rtl9300_dt_ids[] =3D { - { .compatible =3D "realtek,rtl9301-i2c" }, - { .compatible =3D "realtek,rtl9302b-i2c" }, - { .compatible =3D "realtek,rtl9302c-i2c" }, - { .compatible =3D "realtek,rtl9303-i2c" }, + { .compatible =3D "realtek,rtl9301-i2c", .data =3D (void *) &rtl9300_i2c_= drv_data }, + { .compatible =3D "realtek,rtl9302b-i2c", .data =3D (void *) &rtl9300_i2c= _drv_data }, + { .compatible =3D "realtek,rtl9302c-i2c", .data =3D (void *) &rtl9300_i2c= _drv_data }, + { .compatible =3D "realtek,rtl9303-i2c", .data =3D (void *) &rtl9300_i2c_= drv_data }, {} }; MODULE_DEVICE_TABLE(of, i2c_rtl9300_dt_ids); --=20 2.48.1 From nobody Tue Oct 7 06:50:53 2025 Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 296CC28AAFB; Sat, 12 Jul 2025 19:43:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752349405; cv=none; b=U2w62sHJ4538xnBUmwZlbzyu8NnbFbB/4EmkPo221G2e6fDwUonKxhNDCqyTNOiWieXs3V7fAbqrs5P0rc9dyCPR+oy1gzFSy5CepcTzme+bWWE+aA0RLoDd/T5q176PEFrAdDKY4S1TVGW5ahPuOIHOcyQrjuZiP7uanzihfIw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752349405; c=relaxed/simple; bh=DOAhmjsOlvN9MwQfbMO8GopRxJHyZJzc+VBE0n8W1YM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WXRHjJWcWKGpXh9u56xwJEfh3KB7aEFgCKOagSY/yxZJ0jrF6R0ivv27uglxx3ywpOPn4fOkJLM4aeTLZyy88IefACSPPehoMb7PbfYJpSaQ1943LmwYiIPaeVGB+LR2aJMO9WMrtn24u9XA4iiJNgDyMlWZMmz5EgLoEK1++Kg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=So2XQMq+; arc=none smtp.client-ip=209.85.128.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="So2XQMq+" Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-455b00339c8so11250655e9.3; Sat, 12 Jul 2025 12:43:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752349402; x=1752954202; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7JPPcxp7NaWkh5iaP2zm8RZQZs3fI/IYSYHIoSMY0FI=; b=So2XQMq+p4H++7hZvNWvKe5yrmb1TurM0wxq4K9Va4IfhAi0ipcIiP2Y43dh89D2IT /qlzIl01+fmDZs+Hj9VjwpdX5BDEdj7Bb5iVI1l326OdvcgDYi+/ozhoq50GQrTGh+9G EkSxKUBhvqNZJgJhjFmeGQ0fSjc/ydNWe3MVCQQZSIx/VBIw2BemDt2KlJEvFfB6wYZc 1XLpPFEWoOQ/DvhcPU7WPCG9tB9qkuhsdXSto4hDRP3+BAjAxjcnn3Nr+1zA40xSMJT3 izDFte2MM0PsJg3WjJhdpNHthePdfBzBs/9kjV6QpC42ohIQXoisbHzqf4KbjfzxQZAb HgCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752349402; x=1752954202; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7JPPcxp7NaWkh5iaP2zm8RZQZs3fI/IYSYHIoSMY0FI=; b=btyl5Bmr7zdr3CW3POx3v2ARz5MKb+siOM9leiNjZjnO40NuJRAdbs4YE5HuLjlZY1 3Kib746cbK53i52X4dCR9cw9T0jz07ci9wtrrE/Pub27+e9E1BFZhzWEK2WScvH4sNH2 nJCIr9nzzd3jVGaUtA56JVIRt8TmhIKdDoRN//Pgb2F6jXsHNbuE9kU6OO8Rbc/MQO/N G2QHiKmuzq7FKruefDc9p97ZnSc9SuDdXSAPv3DbckwmAwCSrVm+Ns3v89vcqMX0Bvjy az3SN0kqmZb4InTNHdyW6iQidjy6obMNoBrZHllKFcwMLQFilsGF3cwu81s3r825LenT 9k4A== X-Forwarded-Encrypted: i=1; AJvYcCXnHm4/3JwFsyot+SVsS7ufBDMei5RScijD0R0GFe8Fw0WxE2T3eibFsjNSosGspbiRMFvJjgsxNTa9PW/U@vger.kernel.org, AJvYcCXqKwgeoq3/4+BUO0iBPUhLvPY2Fh1qKPsZRSgIQaxAphOr9aXh5vtzqO+rpfFh7joAD38G8KCbnejl@vger.kernel.org X-Gm-Message-State: AOJu0YwUZmW48XE2NqEzFRDn+/bE5MKmzomXenpRI96wdQUIzfef1ROl k67V9ZJw9YC7PCBjwP+lqtKArv6ar20TV8KXGecrltYlsKCq52T9rLl2HUOTIQ== X-Gm-Gg: ASbGncuLIaFwRHWQlFCAON8w/JlFiHEJqlle6f5pvDtZcUgJTFMe6oJeBQYsFFpSjDY A8UkowkG2OqZHAQOVGcDKOMBpJGr9RxW77cbBd1haJd8ZFSnz5EVIHxuXbuRva6vKz1dHVvXgRr DVfn1Gta8rF8GTR5QgR8w0kwdbTCzwstvAoE2gPb8OGTGjEguKe8mOHWKDhp1bF48uv7ocowCTc WB68lAusF8EcS3E5Gjk4OOcMyEf/dH8ZjGfXgwcJaMvR6+/jjEvgzjeMlU56The138Hh+pQhpxv cKSn8/M7R8CILwmoZivqh4kWZHzq+IV5E6saAkX5dWIXpLOWtfUKp861rQF/LMNK/4+WiHAneOe DPo+o298Ji1vJi0s1YfsxX8asPfvoSxbglYAnCYx9JNDOrmkk/Xdn X-Google-Smtp-Source: AGHT+IGg+JDBd9preoVjnNefXW/WmxWfoHLPwJ7MUwBkxBuvsQ/Koi4ItSC+RrVrZqOWADDoxnsHoA== X-Received: by 2002:a05:600c:5387:b0:456:76c:84f2 with SMTP id 5b1f17b1804b1-456076c88c8mr32334675e9.30.1752349402024; Sat, 12 Jul 2025 12:43:22 -0700 (PDT) Received: from builder.. (246-9-142-46.pool.kielnet.net. [46.142.9.246]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-454d5032e9esm123422335e9.3.2025.07.12.12.43.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Jul 2025 12:43:21 -0700 (PDT) From: Jonas Jelonek To: linux-i2c@vger.kernel.org, Chris Packham , Andi Shyti , Rob Herring , Krzysztof Kozlowski , Conor Dooley , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Markus Stockhausen , Jonas Jelonek Subject: [PATCH v2 2/3] dt-bindings: i2c: realtek,rtl9301-i2c: extend for RTL9310 support Date: Sat, 12 Jul 2025 19:42:54 +0000 Message-ID: <20250712194255.7022-3-jelonek.jonas@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250712194255.7022-1-jelonek.jonas@gmail.com> References: <20250712194255.7022-1-jelonek.jonas@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add dt-bindings for RTL9310 series I2C controller. Adjust the regex for child-node address to account for the fact that RTL9310 supports 12 instead of only 8 SDA lines. Add a vendor-specific property to explicitly specify the Realtek-internal ID of the defined I2C controller/master. This is required, in particular for RTL9310, to describe the correct I2C master. Add compatibles for known SoC variants RTL9311, RTL9312 and RTL9313. Signed-off-by: Jonas Jelonek --- .../bindings/i2c/realtek,rtl9301-i2c.yaml | 37 +++++++++++++++++-- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/i2c/realtek,rtl9301-i2c.yaml= b/Documentation/devicetree/bindings/i2c/realtek,rtl9301-i2c.yaml index 69ac5db8b914..54327ca09e14 100644 --- a/Documentation/devicetree/bindings/i2c/realtek,rtl9301-i2c.yaml +++ b/Documentation/devicetree/bindings/i2c/realtek,rtl9301-i2c.yaml @@ -10,9 +10,11 @@ maintainers: - Chris Packham =20 description: - The RTL9300 SoC has two I2C controllers. Each of these has an SCL line (= which - if not-used for SCL can be a GPIO). There are 8 common SDA lines that ca= n be - assigned to either I2C controller. + The RTL9300 SoCs have two I2C controllers. Each of these has an SCL line + (which if not-used for SCL can be a GPIO). There are 8 common SDA lines + that can be assigned to either I2C controller. + The RTL9310 SoCs have equal capabilities but support 12 common SDA lines + which can be assigned to either I2C controller. =20 properties: compatible: @@ -23,7 +25,14 @@ properties: - realtek,rtl9302c-i2c - realtek,rtl9303-i2c - const: realtek,rtl9301-i2c + - items: + - enum: + - realtek,rtl9311-i2c + - realtek,rtl9312-i2c + - realtek,rtl9313-i2c + - const: realtek,rtl9310-i2c - const: realtek,rtl9301-i2c + - const: realtek,rtl9310-i2c =20 reg: items: @@ -35,8 +44,16 @@ properties: "#size-cells": const: 0 =20 + realtek,mst-id: + $ref: /schemas/types.yaml#/definitions/uint8 + description: + Realtek-internal ID of the I2C controller/master. Only required + for RTL9310 series. + minimum: 1 + maximum: 2 + patternProperties: - '^i2c@[0-7]$': + '^i2c@([0-9]|1[0-1])$': $ref: /schemas/i2c/i2c-controller.yaml unevaluatedProperties: false =20 @@ -68,3 +85,15 @@ examples: #size-cells =3D <0>; }; }; + - | + i2c@100c { + compatible =3D "realtek,rtl9310-i2c"; + reg =3D <0x100c 0x18>; + #address-cells =3D <1>; + #size-cells =3D <0>; + realtek,mst-id =3D <1>; + + i2c@0 { + reg =3D <0>; + }; + }; --=20 2.48.1 From nobody Tue Oct 7 06:50:53 2025 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BB80528DF01; Sat, 12 Jul 2025 19:43:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752349406; cv=none; b=D7j8QXpPUu6m7rVkRgNjcC262LSr7OJ3Vsh5I6jOzMCPACe2qecZJM584+66VcY0ID9IonQKTvaNFzq1dic/BHBAz2De6VKf5yLgSN8emE7778dgTpCqS8XwaInoWg9n5WR1z3CDt5NM2fTp+bru6mpMto395G83kr5bTY4OW9g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752349406; c=relaxed/simple; bh=MlD857l8cHKkEZPO+iHg5hCM+5U6Q+uE27YySfa9ceI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EcyVQHTjQxNYBRhVLoy0g5Y89BFAKCLa5h847OCRMgXkV/lvQWSkv1ysJUNudRD58Iw1HbfKcxfKKqjMSCLbYnnCv2690hj+zNnLj9sLgvJ5nnQWKwNNjntH9a0VgkNc4Y0kI70QJqoC9bM8YgXMBnX40UrKo8HDRQP24QoWOiY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=AHB9gtfw; arc=none smtp.client-ip=209.85.128.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="AHB9gtfw" Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-45526dec171so18743515e9.2; Sat, 12 Jul 2025 12:43:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752349403; x=1752954203; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=93QiYY9UXUVXVwv33Amwr6dmZ/i/JabCetPl6frAVnI=; b=AHB9gtfwgBlakRG0mRO7n2mHMWUa4cUvv7HFWHfjreJSA6u3S23UcDxL84ytlKkzaf njsWOSnkXi1SLT3BgZUbIq2UQbFnbvXp+KG8GBgLpkzQky0sGrlFAfmSlkUy5Db5qNyM n21rDuaKNXh8BTTyFNtBERmOJy9SHvGCcPR9vUNbV1K9SBYpFzy14/GS28HEQ4GhvSKU KkBuKRqF+PWCMvDIIaXQ9W+F5WjDT6QExfGtMCAicTNolCaEfPRxRuylTyAfqcn85tsC tOKDJqzl3nn51Eu/qZZJl8Bpr73KnHO75Q59ognh+404qF5KaPBkxcqsfXALu00UkfHu rYHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752349403; x=1752954203; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=93QiYY9UXUVXVwv33Amwr6dmZ/i/JabCetPl6frAVnI=; b=sZ4PUcNrf0WmMNNmfE22bnH/YV6HvJrCYbvT/UkyTisRXH7m2hKjS+PyeV9wkfjloC pAZeuimPWOatMjmnqbFdDbDU6SqrTYLNXOWW+/OEPz97mpJXovIl0BRTZcc5YsASr20w XuoEntxKL5sqf0zoY38/5kOcg6hmvJ9d3Mc9k2rfoCbzFdf7poH4jHE2e59Aniw6moP0 PQg4hjAE7o55LhABlcY/oUF/gdsgXI4fTa/1gzjsJT4Uv5piaXmTQh8HCKfdCJib3y9S lOgI2Kp1Xj9lMM9NSISHxalwNn2dq6Gq/QFtzB1pG9x6yRoDmHw20OrWGsUf/3JgF2rM mXbQ== X-Forwarded-Encrypted: i=1; AJvYcCV0fw8Eu6DUNuf3RjZ3uMdYUNOKpsvwTv0VdBSBBojKdwYRGpcFEwk6HdFYNgpDysezBgYGWM1FVDllEbQ/@vger.kernel.org, AJvYcCV7HHBq1EX2K8bnP2kUVky268bRXZutzDRIRf4iKOjlHhcwV3hHwT4mbglOIES0V5NFW20gyOUrHzsF@vger.kernel.org X-Gm-Message-State: AOJu0Yyw8eJyOmVTBnXhKxOsXrlx/myoHKxjp0KqKEuiu9tX2all9PD+ PT2VJs9ZRb1VxpB+tN7FnqVlvhv5xDWfpd03dylQO281kgmWuRZwlDzVGGcYBA== X-Gm-Gg: ASbGncuC+Pu7KSd0OGpTMOUdwvtYwABaQAtNfKzuIzGCxr4bSkoomZPalLz+hw9v7A9 MFwJ0OsqL+0adeDx5dQuPrMaQmy5bS6wwK7omRM6EL2c+sblfPZRmzOX3J8bFT0wxiep6z8Hf8R ra/186g9RL+lrhrX6gYx63/u+gbmwDbIbotKg0gjNDIAb07Ci3AGoD/siMG3RBjH2aSEKFzfqQm VGAVjBC5i8vksrjSDu3WviaqUcbLeRwl1Lp2g66wHwesPnhwoF4z1lwyxX3zn1T4ilD/evxNs8o U6G94Q3zBYxpJ62yZQ3ZLO6PdK5s/4rXjVzk/lr+tYwzFVSEVjqPCN46aDfQdHlNKvnlN0LTH0E LDVtQcYTcrCqmbcfdU8EwABiFSSqH8fbEpSdSFpAlYVhesP1ZyW2G X-Google-Smtp-Source: AGHT+IHtgsunHSjhffRz6c1cc3DmsH0OXq8L9HuXPnbjY498/l44sqIBP1B4Z2vdh3BvryNhDUc/pg== X-Received: by 2002:a05:600c:1c21:b0:43c:fe15:41cb with SMTP id 5b1f17b1804b1-454ec1342c8mr69793865e9.15.1752349402777; Sat, 12 Jul 2025 12:43:22 -0700 (PDT) Received: from builder.. (246-9-142-46.pool.kielnet.net. [46.142.9.246]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-454d5032e9esm123422335e9.3.2025.07.12.12.43.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Jul 2025 12:43:22 -0700 (PDT) From: Jonas Jelonek To: linux-i2c@vger.kernel.org, Chris Packham , Andi Shyti , Rob Herring , Krzysztof Kozlowski , Conor Dooley , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Markus Stockhausen , Jonas Jelonek Subject: [PATCH v2 3/3] i2c: add RTL9310 support to RTL9300 I2C controller driver Date: Sat, 12 Jul 2025 19:42:55 +0000 Message-ID: <20250712194255.7022-4-jelonek.jonas@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250712194255.7022-1-jelonek.jonas@gmail.com> References: <20250712194255.7022-1-jelonek.jonas@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add support for the internal I2C controllers of RTL9310 series based SoCs to the driver for RTL9300. Add register definitions, chip-specific functions and compatible strings for known RTL9310-based SoCs RTL9311, RTL9312 and RTL9313. Make use of a new device tree property 'realtek,mst-id' which needs to be specified in case both or only the second master is used. This is required due how the register layout changed in contrast to RTL9300, which has SCL selection in a global register instead of a master-specific one. Signed-off-by: Jonas Jelonek --- drivers/i2c/busses/i2c-rtl9300.c | 43 +++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/drivers/i2c/busses/i2c-rtl9300.c b/drivers/i2c/busses/i2c-rtl9= 300.c index f8e81102ee74..9bd8a62a2ba0 100644 --- a/drivers/i2c/busses/i2c-rtl9300.c +++ b/drivers/i2c/busses/i2c-rtl9300.c @@ -59,6 +59,7 @@ struct rtl9300_i2c_drv_data { }; =20 #define RTL9300_I2C_MUX_NCHAN 8 +#define RTL9310_I2C_MUX_NCHAN 12 =20 struct rtl9300_i2c { struct regmap *regmap; @@ -67,6 +68,7 @@ struct rtl9300_i2c { struct regmap_field *fields[F_NUM_FIELDS]; u32 reg_base; u32 data_reg; + u8 scl_num; u8 sda_pin; struct mutex lock; }; @@ -79,6 +81,11 @@ struct rtl9300_i2c { #define RTL9300_I2C_MST_DATA_WORD3 0x14 #define RTL9300_I2C_MST_GLB_CTRL 0x384 =20 +#define RTL9310_I2C_MST_IF_CTRL 0x1004 +#define RTL9310_I2C_MST_IF_SEL 0x1008 +#define RTL9310_I2C_MST_CTRL 0x0 +#define RTL9310_I2C_MST_MEMADDR_CTRL 0x4 +#define RTL9310_I2C_MST_DATA_CTRL 0x8 =20 static int rtl9300_i2c_reg_addr_set(struct rtl9300_i2c *i2c, u32 reg, u16 = len) { @@ -96,6 +103,11 @@ static int rtl9300_i2c_select_scl(struct rtl9300_i2c *i= 2c, u8 scl) return regmap_field_write(i2c->fields[F_SCL_SEL], 1); } =20 +static int rtl9310_i2c_select_scl(struct rtl9300_i2c *i2c, u8 scl) +{ + return regmap_field_update_bits(i2c->fields[F_SCL_SEL], BIT(scl), BIT(scl= )); +} + static int rtl9300_i2c_config_io(struct rtl9300_i2c *i2c, u8 sda_pin) { struct rtl9300_i2c_drv_data *drv_data; @@ -111,7 +123,7 @@ static int rtl9300_i2c_config_io(struct rtl9300_i2c *i2= c, u8 sda_pin) if (ret) return ret; =20 - return drv_data->select_scl(i2c, 0); + return drv_data->select_scl(i2c, i2c->scl_num); } =20 static int rtl9300_i2c_config_xfer(struct rtl9300_i2c *i2c, struct rtl9300= _i2c_chan *chan, @@ -346,6 +358,7 @@ static int rtl9300_i2c_probe(struct platform_device *pd= ev) struct device *dev =3D &pdev->dev; struct rtl9300_i2c *i2c; u32 clock_freq, sda_pin; + u8 mst_id; int ret, i =3D 0; struct fwnode_handle *child; struct rtl9300_i2c_drv_data *drv_data; @@ -366,6 +379,11 @@ static int rtl9300_i2c_probe(struct platform_device *p= dev) if (ret) return ret; =20 + ret =3D device_property_read_u8(dev, "realtek,mst-id", &mst_id); + if (ret || mst_id !=3D 2) + mst_id =3D 1; + i2c->scl_num =3D mst_id - 1; + platform_set_drvdata(pdev, i2c); =20 drv_data =3D (struct rtl9300_i2c_drv_data *)device_get_match_data(i2c->de= v); @@ -457,12 +475,35 @@ static const struct rtl9300_i2c_drv_data rtl9300_i2c_= drv_data =3D { .max_nchan =3D RTL9300_I2C_MUX_NCHAN, }; =20 +static const struct rtl9300_i2c_drv_data rtl9310_i2c_drv_data =3D { + .field_desc =3D { + [F_SCL_SEL] =3D GLB_REG_FIELD(RTL9310_I2C_MST_IF_SEL, 12, 13), + [F_SDA_SEL] =3D GLB_REG_FIELD(RTL9310_I2C_MST_IF_SEL, 0, 11), + [F_SCL_FREQ] =3D MST_REG_FIELD(RTL9310_I2C_MST_CTRL, 30, 31), + [F_DEV_ADDR] =3D MST_REG_FIELD(RTL9310_I2C_MST_CTRL, 11, 17), + [F_SDA_OUT_SEL] =3D MST_REG_FIELD(RTL9310_I2C_MST_CTRL, 18, 21), + [F_MEM_ADDR_WIDTH] =3D MST_REG_FIELD(RTL9310_I2C_MST_CTRL, 9, 10), + [F_DATA_WIDTH] =3D MST_REG_FIELD(RTL9310_I2C_MST_CTRL, 5, 8), + [F_RD_MODE] =3D MST_REG_FIELD(RTL9310_I2C_MST_CTRL, 4, 4), + [F_RWOP] =3D MST_REG_FIELD(RTL9310_I2C_MST_CTRL, 2, 2), + [F_I2C_FAIL] =3D MST_REG_FIELD(RTL9310_I2C_MST_CTRL, 1, 1), + [F_I2C_TRIG] =3D MST_REG_FIELD(RTL9310_I2C_MST_CTRL, 0, 0), + [F_MEM_ADDR] =3D MST_REG_FIELD(RTL9310_I2C_MST_MEMADDR_CTRL, 0, 23), + }, + .select_scl =3D rtl9310_i2c_select_scl, + .data_reg =3D RTL9310_I2C_MST_DATA_CTRL, + .max_nchan =3D RTL9310_I2C_MUX_NCHAN, +}; =20 static const struct of_device_id i2c_rtl9300_dt_ids[] =3D { { .compatible =3D "realtek,rtl9301-i2c", .data =3D (void *) &rtl9300_i2c_= drv_data }, { .compatible =3D "realtek,rtl9302b-i2c", .data =3D (void *) &rtl9300_i2c= _drv_data }, { .compatible =3D "realtek,rtl9302c-i2c", .data =3D (void *) &rtl9300_i2c= _drv_data }, { .compatible =3D "realtek,rtl9303-i2c", .data =3D (void *) &rtl9300_i2c_= drv_data }, + { .compatible =3D "realtek,rtl9310-i2c", .data =3D (void *) &rtl9310_i2c_= drv_data }, + { .compatible =3D "realtek,rtl9311-i2c", .data =3D (void *) &rtl9310_i2c_= drv_data }, + { .compatible =3D "realtek,rtl9312-i2c", .data =3D (void *) &rtl9310_i2c_= drv_data }, + { .compatible =3D "realtek,rtl9313-i2c", .data =3D (void *) &rtl9310_i2c_= drv_data }, {} }; MODULE_DEVICE_TABLE(of, i2c_rtl9300_dt_ids); --=20 2.48.1