mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Lee Jones <lee@kernel.org>
To: Thomas Richard <thomas.richard@bootlin.com>
Cc: Andi Shyti <andi.shyti@kernel.org>,
	Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
	Werner Gartner <Werner.Gartner@congatec.com>,
	mfd@lists.linux.dev, linux-kernel@vger.kernel.org,
	linux-i2c@vger.kernel.org
Subject: Re: [PATCH v5 4/9] i2c: cgbc: Use plateform data to get bus ID and adapter name
Date: Mon, 16 Nov 2026 15:49:32 +0000	[thread overview]
Message-ID: <20261116154932.GA97865@joneslee-macbookpro.roam.internal> (raw)
In-Reply-To: <78cf973d-3434-4f81-82be-a22f4abcfe0c@bootlin.com>

On Mon, 16 Nov 2026, Thomas Richard wrote:

> Hi Lee,
> 
> On 11/3/26 5:49 PM, Thomas Richard (congatec GmbH) wrote:
> > Obtain the bus ID (from the BC point of view) and adapter name from
> > platform data. This allows the specific definitions to be removed, leaving
> > only a generic adapter definition.
> > 
> > Signed-off-by: Thomas Richard (congatec GmbH) <thomas.richard@bootlin.com>
> > ---
> >  drivers/i2c/busses/i2c-cgbc.c | 68 ++++++++++++++++---------------------------
> >  1 file changed, 25 insertions(+), 43 deletions(-)
> > 
> > diff --git a/drivers/i2c/busses/i2c-cgbc.c b/drivers/i2c/busses/i2c-cgbc.c
> > index ac23435b731b..40ffab4fd0bc 100644
> > --- a/drivers/i2c/busses/i2c-cgbc.c
> > +++ b/drivers/i2c/busses/i2c-cgbc.c
> > @@ -12,9 +12,6 @@
> >  #include <linux/module.h>
> >  #include <linux/platform_device.h>
> >  
> > -#define CGBC_I2C_PRIMARY_BUS_ID	0
> > -#define CGBC_I2C_PM_BUS_ID	4
> > -
> >  #define CGBC_I2C_CMD_START	0x40
> >  #define CGBC_I2C_CMD_STAT	0x48
> >  #define CGBC_I2C_CMD_DATA	0x50
> > @@ -60,11 +57,6 @@ enum cgbc_i2c_state {
> >  	CGBC_I2C_STATE_ERROR,
> >  };
> >  
> > -struct i2c_algo_cgbc_data {
> > -	u8		bus_id;
> > -	unsigned long	read_maxtime_us;
> > -};
> > -
> >  struct cgbc_i2c_data {
> >  	struct device		*dev;
> >  	struct cgbc_device_data *cgbc;
> > @@ -73,6 +65,8 @@ struct cgbc_i2c_data {
> >  	int			nmsgs;
> >  	int			pos;
> >  	enum cgbc_i2c_state	state;
> > +	u8			bus_id;
> > +	unsigned long		read_maxtime_us;
> >  };
> >  
> >  struct cgbc_i2c_transfer {
> > @@ -115,10 +109,9 @@ static unsigned int cgbc_i2c_reg_to_freq(u8 reg)
> >  
> >  static int cgbc_i2c_get_status(struct i2c_adapter *adap)
> >  {
> > -	struct i2c_algo_cgbc_data *algo_data = adap->algo_data;
> >  	struct cgbc_i2c_data *i2c = i2c_get_adapdata(adap);
> >  	struct cgbc_device_data *cgbc = i2c->cgbc;
> > -	u8 cmd = CGBC_I2C_CMD_STAT | algo_data->bus_id;
> > +	u8 cmd = CGBC_I2C_CMD_STAT | i2c->bus_id;
> >  	u8 status;
> >  	int ret;
> >  
> > @@ -132,7 +125,6 @@ static int cgbc_i2c_get_status(struct i2c_adapter *adap)
> >  static int cgbc_i2c_set_frequency(struct i2c_adapter *adap,
> >  				  unsigned int bus_frequency)
> >  {
> > -	struct i2c_algo_cgbc_data *algo_data = adap->algo_data;
> >  	struct cgbc_i2c_data *i2c = i2c_get_adapdata(adap);
> >  	struct cgbc_device_data *cgbc = i2c->cgbc;
> >  	u8 cmd[2], data;
> > @@ -144,7 +136,7 @@ static int cgbc_i2c_set_frequency(struct i2c_adapter *adap,
> >  		bus_frequency = I2C_MAX_STANDARD_MODE_FREQ;
> >  	}
> >  
> > -	cmd[0] = CGBC_I2C_CMD_SPEED | algo_data->bus_id;
> > +	cmd[0] = CGBC_I2C_CMD_SPEED | i2c->bus_id;
> >  	cmd[1] = cgbc_i2c_freq_to_reg(bus_frequency);
> >  
> >  	ret = cgbc_command(cgbc, &cmd, sizeof(cmd), &data, 1, NULL);
> > @@ -170,7 +162,7 @@ static int cgbc_i2c_set_frequency(struct i2c_adapter *adap,
> >  	 * can be read by a command is CGBC_I2C_READ_MAX_LEN.
> >  	 * Therefore, calculate the max time to properly size the timeout.
> >  	 */
> > -	algo_data->read_maxtime_us = (BITS_PER_BYTE + 1) * CGBC_I2C_READ_MAX_LEN
> > +	i2c->read_maxtime_us = (BITS_PER_BYTE + 1) * CGBC_I2C_READ_MAX_LEN
> >  		* USEC_PER_SEC / bus_frequency;
> >  
> >  	return 0;
> > @@ -200,7 +192,6 @@ static unsigned int cgbc_i2c_xfer_to_cmd(struct cgbc_i2c_transfer xfer, u8 *cmd)
> >  
> >  static int cgbc_i2c_xfer_msg(struct i2c_adapter *adap)
> >  {
> > -	struct i2c_algo_cgbc_data *algo_data = adap->algo_data;
> >  	struct cgbc_i2c_data *i2c = i2c_get_adapdata(adap);
> >  	struct cgbc_device_data *cgbc = i2c->cgbc;
> >  	struct i2c_msg *msg = i2c->msg;
> > @@ -210,7 +201,7 @@ static int cgbc_i2c_xfer_msg(struct i2c_adapter *adap)
> >  	u8 cmd_data, data_len;
> >  
> >  	struct cgbc_i2c_transfer xfer = {
> > -		.bus_id = algo_data->bus_id,
> > +		.bus_id = i2c->bus_id,
> >  		.addr = i2c_8bit_addr_from_msg(msg),
> >  	};
> >  
> > @@ -268,7 +259,7 @@ static int cgbc_i2c_xfer_msg(struct i2c_adapter *adap)
> >  
> >  		ret = read_poll_timeout(cgbc_i2c_get_status, status,
> >  					status != CGBC_I2C_STAT_BUSY, 0,
> > -					2 * algo_data->read_maxtime_us, false, adap);
> > +					2 * i2c->read_maxtime_us, false, adap);
> >  		if (ret)
> >  			goto err;
> >  
> > @@ -282,7 +273,7 @@ static int cgbc_i2c_xfer_msg(struct i2c_adapter *adap)
> >  			goto err;
> >  		}
> >  
> > -		cmd_data = CGBC_I2C_CMD_DATA | algo_data->bus_id;
> > +		cmd_data = CGBC_I2C_CMD_DATA | i2c->bus_id;
> >  		ret = cgbc_command(cgbc, &cmd_data, sizeof(cmd_data),
> >  				   msg->buf + i2c->pos, len, &data_len);
> >  		if (ret)
> > @@ -350,44 +341,35 @@ static const struct i2c_algorithm cgbc_i2c_algorithm = {
> >  	.functionality = cgbc_i2c_func,
> >  };
> >  
> > -static struct i2c_algo_cgbc_data cgbc_i2c_algo_data[] = {
> > -	{ .bus_id = CGBC_I2C_PRIMARY_BUS_ID },
> > -	{ .bus_id = CGBC_I2C_PM_BUS_ID },
> > -};
> > -
> > -static const struct i2c_adapter cgbc_i2c_adapter[] = {
> > -	{
> > -		.owner		= THIS_MODULE,
> > -		.name		= "cgbc-i2c0",
> > -		.class		= I2C_CLASS_DEPRECATED,
> > -		.algo		= &cgbc_i2c_algorithm,
> > -		.algo_data	= &cgbc_i2c_algo_data[0],
> > -		.nr		= -1,
> > -	},
> > -	{
> > -		.owner		= THIS_MODULE,
> > -		.name		= "cgbc-ddc0",
> > -		.class		= I2C_CLASS_DEPRECATED,
> > -		.algo		= &cgbc_i2c_algorithm,
> > -		.algo_data	= &cgbc_i2c_algo_data[1],
> > -		.nr		= -1,
> > -	},
> > +static const struct i2c_adapter cgbc_i2c_adapter = {
> > +	.owner		= THIS_MODULE,
> > +	.class		= I2C_CLASS_DEPRECATED,
> > +	.algo		= &cgbc_i2c_algorithm,
> > +	.nr		= -1,
> >  };
> >  
> >  static int cgbc_i2c_probe(struct platform_device *pdev)
> >  {
> > -	struct cgbc_device_data *cgbc = dev_get_drvdata(pdev->dev.parent);
> > +	struct device *dev = &pdev->dev;
> > +	struct cgbc_device_data *cgbc = dev_get_drvdata(dev->parent);
> > +	struct cgbc_i2c_platform_data *pdata;
> >  	struct cgbc_i2c_data *i2c;
> >  	int ret;
> >  
> > -	i2c = devm_kzalloc(&pdev->dev, sizeof(*i2c), GFP_KERNEL);
> > +	i2c = devm_kzalloc(dev, sizeof(*i2c), GFP_KERNEL);
> I was ready to send you the v6 (with your I2C patch) based on mfd-next,
> but I noticed an issue with this line. In v7.4-rc2 devm_kzalloc() has
> been replaced by devm_kzalloc_obj() (commit
> 4dd10fbbeb9c33709edc89916e19c03c780a0751). I guess this will conflict
> during the merge. So I don't know how to proceed. Please let me know
> what to do.

Rebase your set onto v7.4-rc2 or -next.

-- 
Lee Jones

  reply	other threads:[~2026-11-16 15:49 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-03 16:49 [PATCH v5 0/9] Congatec Board Controller: Add storage devices support Thomas Richard (congatec GmbH)
2026-11-03 16:49 ` [PATCH v5 1/9] mfd: cgbc: Fix use of negative error code as valid session handle Thomas Richard (congatec GmbH)
2026-11-03 16:49 ` [PATCH v5 2/9] i2c: cgbc: Use real I2C bus names Thomas Richard (congatec GmbH)
2026-11-03 16:49 ` [PATCH v5 3/9] mfd: cgbc: Add I2C platform data Thomas Richard (congatec GmbH)
2026-11-03 16:49 ` [PATCH v5 4/9] i2c: cgbc: Use plateform data to get bus ID and adapter name Thomas Richard (congatec GmbH)
2026-11-16 13:35   ` Thomas Richard
2026-11-16 15:49     ` Lee Jones [this message]
2026-11-03 16:49 ` [PATCH v5 5/9] mfd: cgbc: Use PLATFORM_DEVID_AUTO for child device registration Thomas Richard (congatec GmbH)
2026-11-03 16:49 ` [PATCH v5 6/9] i2c: cgbc: Add support for fixed frequency buses Thomas Richard (congatec GmbH)
2026-11-03 16:49 ` [PATCH v5 7/9] mfd: cgbc: Add virtual I2C bus support Thomas Richard (congatec GmbH)
2026-11-03 16:49 ` [PATCH v5 8/9] mfd: cgbc: Add virtual storage devices on the virtual I2C bus Thomas Richard (congatec GmbH)
2026-11-03 16:49 ` [PATCH v5 9/9] i2c: cgbc: Register known I2C devices on the bus Thomas Richard (congatec GmbH)
2026-11-13 19:44 ` [PATCH v5 0/9] Congatec Board Controller: Add storage devices support Lee Jones
2026-11-13 19:51   ` Thomas Richard

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20261116154932.GA97865@joneslee-macbookpro.roam.internal \
    --to=lee@kernel.org \
    --cc=Werner.Gartner@congatec.com \
    --cc=andi.shyti@kernel.org \
    --cc=linux-i2c@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mfd@lists.linux.dev \
    --cc=thomas.petazzoni@bootlin.com \
    --cc=thomas.richard@bootlin.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®