[PATCH v2 01/12] i2c: allow setting the parent device and OF node through the adapter struct

[PATCH v2 01/12] i2c: allow setting the parent device and OF node through the adapter struct

[Bartosz Golaszewski]

In order to stop i2c bus drivers from dereferencing the struct device
embedded in struct i2c_adapter, let's allow configuring the parent
device and OF-node of the adapter directly through dedicated fields.

Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
---
 drivers/i2c/i2c-core-base.c | 5 +++++
 include/linux/i2c.h         | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
index 9c46147e3506d15d53b9b7d6b592709de56e41b9..dd8cec9b04c64b8340d20e018ab5ba28f1f7f5c9 100644
--- a/drivers/i2c/i2c-core-base.c
+++ b/drivers/i2c/i2c-core-base.c
@@ -1561,6 +1561,11 @@ static int i2c_register_adapter(struct i2c_adapter *adap)
 	adap->dev.type = &i2c_adapter_type;
 	device_initialize(&adap->dev);
 
+	if (!adap->dev.parent)
+		adap->dev.parent = adap->parent;
+	if (!adap->dev.of_node)
+		adap->dev.of_node = adap->of_node;
+
 	/*
 	 * This adapter can be used as a parent immediately after device_add(),
 	 * setup runtime-pm (especially ignore-children) before hand.
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index 20fd41b51d5c85ee1665395c07345faafd8e2fca..72677f29aff161530bc3c497d1e07144a44eb9e4 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -761,6 +761,10 @@ struct i2c_adapter {
 	struct irq_domain *host_notify_domain;
 	struct regulator *bus_regulator;
 
+	/* Device configuration. */
+	struct device *parent;
+	struct device_node *of_node;
+
 	struct dentry *debugfs;
 
 	/* 7bit address space */

-- 
2.47.3

Re: [PATCH v2 01/12] i2c: allow setting the parent device and OF node through the adapter struct

[Kalle Niemi]

On 2/23/26 11:05, Bartosz Golaszewski wrote:
> In order to stop i2c bus drivers from dereferencing the struct device
> embedded in struct i2c_adapter, let's allow configuring the parent
> device and OF-node of the adapter directly through dedicated fields.
> 
> Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
> ---
>   drivers/i2c/i2c-core-base.c | 5 +++++
>   include/linux/i2c.h         | 4 ++++
>   2 files changed, 9 insertions(+)
> 
> diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
> index 9c46147e3506d15d53b9b7d6b592709de56e41b9..dd8cec9b04c64b8340d20e018ab5ba28f1f7f5c9 100644
> --- a/drivers/i2c/i2c-core-base.c
> +++ b/drivers/i2c/i2c-core-base.c
> @@ -1561,6 +1561,11 @@ static int i2c_register_adapter(struct i2c_adapter *adap)
>   	adap->dev.type = &i2c_adapter_type;
>   	device_initialize(&adap->dev);
>   
> +	if (!adap->dev.parent)
> +		adap->dev.parent = adap->parent;
> +	if (!adap->dev.of_node)
> +		adap->dev.of_node = adap->of_node;
> +
>   	/*
>   	 * This adapter can be used as a parent immediately after device_add(),
>   	 * setup runtime-pm (especially ignore-children) before hand.
> diff --git a/include/linux/i2c.h b/include/linux/i2c.h
> index 20fd41b51d5c85ee1665395c07345faafd8e2fca..72677f29aff161530bc3c497d1e07144a44eb9e4 100644
> --- a/include/linux/i2c.h
> +++ b/include/linux/i2c.h
> @@ -761,6 +761,10 @@ struct i2c_adapter {
>   	struct irq_domain *host_notify_domain;
>   	struct regulator *bus_regulator;
>   
> +	/* Device configuration. */
> +	struct device *parent;
> +	struct device_node *of_node;
> +
>   	struct dentry *debugfs;
>   
>   	/* 7bit address space */
> 

Hello,

Automated driver test system bisected this commit to be the first bad 
commit, linux-next next-20260227 was tested. Failed tests include driver 
tests for ROHM PMIC and accelerometers, which are connected to 
BeagleBone Black.

The failed driver tests all fail to first i2cget and the tests stop 
there: "Could not open file '/dev/i2c-2' or 'dev/i2c/2': No such file or 
directory".

BR
Kalle Niemi

Re: [PATCH v2 01/12] i2c: allow setting the parent device and OF node through the adapter struct

[Bartosz Golaszewski]

On Mon, Mar 2, 2026 at 8:47 AM Kalle Niemi <kaleposti@gmail.com> wrote:
>
> On 2/23/26 11:05, Bartosz Golaszewski wrote:
> > In order to stop i2c bus drivers from dereferencing the struct device
> > embedded in struct i2c_adapter, let's allow configuring the parent
> > device and OF-node of the adapter directly through dedicated fields.
> >
> > Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
> > ---
> >
>
> Hello,
>
> Automated driver test system bisected this commit to be the first bad
> commit, linux-next next-20260227 was tested. Failed tests include driver
> tests for ROHM PMIC and accelerometers, which are connected to
> BeagleBone Black.
>
> The failed driver tests all fail to first i2cget and the tests stop
> there: "Could not open file '/dev/i2c-2' or 'dev/i2c/2': No such file or
> directory".
>

Wolfram: well, now it would actually be useful to know which commit
exactly is the culprit so maybe splitting the changes is not a bad
idea after all.

Kalle: which i2c bus driver fails here? Any errors in kernel log?

Bart

Re: [PATCH v2 01/12] i2c: allow setting the parent device and OF node through the adapter struct

[Bartosz Golaszewski]

On Mon, 2 Mar 2026 11:38:27 +0100, Kalle Niemi <kaleposti@gmail.com> said:
> On 3/2/26 10:55, Bartosz Golaszewski wrote:
>> On Mon, Mar 2, 2026 at 8:47 AM Kalle Niemi <kaleposti@gmail.com> wrote:
>>> On 2/23/26 11:05, Bartosz Golaszewski wrote:
>>>> In order to stop i2c bus drivers from dereferencing the struct device
>>>> embedded in struct i2c_adapter, let's allow configuring the parent
>>>> device and OF-node of the adapter directly through dedicated fields.
>>>> Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
>>>> ---
>>> Hello,
>>> Automated driver test system bisected this commit to be the first bad
>>> commit, linux-next next-20260227 was tested. Failed tests include driver
>>> tests for ROHM PMIC and accelerometers, which are connected to
>>> BeagleBone Black.
>>> The failed driver tests all fail to first i2cget and the tests stop
>>> there: "Could not open file '/dev/i2c-2' or 'dev/i2c/2': No such file or
>>> directory".
>> Wolfram: well, now it would actually be useful to know which commit
>> exactly is the culprit so maybe splitting the changes is not a bad
>> idea after all.
>> Kalle: which i2c bus driver fails here? Any errors in kernel log?
>> Bart
>
> Hello Bart,
>
> i2c-1 and i2c-2 are failing. I am not seeing any i2c errors in kernel log. I got two failures without the dmesg available (this is bugged test sequence, and not a kernel crash), but those got the same stdout message "Could not open file ...." as all others.
>
> -Kalle
>

I meant what driver are you using but I suppose it's i2c-omap.

Can you try the following change and let me know if it fixes the issue?

diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
index dd8cec9b04c6..01656f82d2c6 100644
--- a/drivers/i2c/i2c-core-base.c
+++ b/drivers/i2c/i2c-core-base.c
@@ -1548,6 +1548,11 @@ static int i2c_register_adapter(struct i2c_adapter *adap)
 	if (adap->timeout == 0)
 		adap->timeout = HZ;

+	if (!adap->dev.parent)
+		adap->dev.parent = adap->parent;
+	if (!adap->dev.of_node)
+		adap->dev.of_node = adap->of_node;
+
 	/* register soft irqs for Host Notify */
 	res = i2c_setup_host_notify_irq_domain(adap);
 	if (res) {
@@ -1561,11 +1566,6 @@ static int i2c_register_adapter(struct i2c_adapter *adap)
 	adap->dev.type = &i2c_adapter_type;
 	device_initialize(&adap->dev);

-	if (!adap->dev.parent)
-		adap->dev.parent = adap->parent;
-	if (!adap->dev.of_node)
-		adap->dev.of_node = adap->of_node;
-
 	/*
 	 * This adapter can be used as a parent immediately after device_add(),
 	 * setup runtime-pm (especially ignore-children) before hand.

Bart

Re: [PATCH v2 01/12] i2c: allow setting the parent device and OF node through the adapter struct

[Andreas Kemnade]

On Mon, 2 Mar 2026 12:38:27 +0200
Kalle Niemi <kaleposti@gmail.com> wrote:

> On 3/2/26 10:55, Bartosz Golaszewski wrote:
> > On Mon, Mar 2, 2026 at 8:47 AM Kalle Niemi <kaleposti@gmail.com> wrote:  
> >> On 2/23/26 11:05, Bartosz Golaszewski wrote:  
> >>> In order to stop i2c bus drivers from dereferencing the struct device
> >>> embedded in struct i2c_adapter, let's allow configuring the parent
> >>> device and OF-node of the adapter directly through dedicated fields.
> >>> Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
> >>> ---  
> >> Hello,
> >> Automated driver test system bisected this commit to be the first bad
> >> commit, linux-next next-20260227 was tested. Failed tests include driver
> >> tests for ROHM PMIC and accelerometers, which are connected to
> >> BeagleBone Black.
> >> The failed driver tests all fail to first i2cget and the tests stop
> >> there: "Could not open file '/dev/i2c-2' or 'dev/i2c/2': No such file or
> >> directory".  
> > Wolfram: well, now it would actually be useful to know which commit
> > exactly is the culprit so maybe splitting the changes is not a bad
> > idea after all.
> > Kalle: which i2c bus driver fails here? Any errors in kernel log?
> > Bart  
> 
> Hello Bart,
> 
> i2c-1 and i2c-2 are failing. I am not seeing any i2c errors in kernel log. I got two failures without the dmesg available (this is bugged test sequence, and not a kernel crash), but those got the same stdout message "Could not open file ...." as all others.
> 
Probably I am using the same host driver

tested on OMAP3 DM3730, result: i2c drivers get bound to their devices,
no obvious trouble. But controllers are registered with high indexes.

localhost:~# i2cdetect -l
i2c-3	i2c       	OMAP I2C adapter                	I2C adapter
i2c-4	i2c       	OMAP I2C adapter                	I2C adapter
i2c-5	i2c       	OMAP I2C adapter                	I2C adapter
localhost:~# uname -a
Linux localhost 7.0.0-rc1-next-20260227 #27 SMP Mon Mar  2 11:56:27 CET 2026 armv7l Linux

Regards,
Andreas

Re: [PATCH v2 01/12] i2c: allow setting the parent device and OF node through the adapter struct

[Bartosz Golaszewski]

On Mon, Mar 2, 2026 at 4:11 PM Andreas Kemnade <andreas@kemnade.info> wrote:
>
> On Mon, 2 Mar 2026 12:38:27 +0200
> Kalle Niemi <kaleposti@gmail.com> wrote:
>
> > On 3/2/26 10:55, Bartosz Golaszewski wrote:
> > > On Mon, Mar 2, 2026 at 8:47 AM Kalle Niemi <kaleposti@gmail.com> wrote:
> > >> On 2/23/26 11:05, Bartosz Golaszewski wrote:
> > >>> In order to stop i2c bus drivers from dereferencing the struct device
> > >>> embedded in struct i2c_adapter, let's allow configuring the parent
> > >>> device and OF-node of the adapter directly through dedicated fields.
> > >>> Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
> > >>> ---
> > >> Hello,
> > >> Automated driver test system bisected this commit to be the first bad
> > >> commit, linux-next next-20260227 was tested. Failed tests include driver
> > >> tests for ROHM PMIC and accelerometers, which are connected to
> > >> BeagleBone Black.
> > >> The failed driver tests all fail to first i2cget and the tests stop
> > >> there: "Could not open file '/dev/i2c-2' or 'dev/i2c/2': No such file or
> > >> directory".
> > > Wolfram: well, now it would actually be useful to know which commit
> > > exactly is the culprit so maybe splitting the changes is not a bad
> > > idea after all.
> > > Kalle: which i2c bus driver fails here? Any errors in kernel log?
> > > Bart
> >
> > Hello Bart,
> >
> > i2c-1 and i2c-2 are failing. I am not seeing any i2c errors in kernel log. I got two failures without the dmesg available (this is bugged test sequence, and not a kernel crash), but those got the same stdout message "Could not open file ...." as all others.
> >
> Probably I am using the same host driver
>
> tested on OMAP3 DM3730, result: i2c drivers get bound to their devices,
> no obvious trouble. But controllers are registered with high indexes.
>
> localhost:~# i2cdetect -l
> i2c-3   i2c             OMAP I2C adapter                        I2C adapter
> i2c-4   i2c             OMAP I2C adapter                        I2C adapter
> i2c-5   i2c             OMAP I2C adapter                        I2C adapter
> localhost:~# uname -a
> Linux localhost 7.0.0-rc1-next-20260227 #27 SMP Mon Mar  2 11:56:27 CET 2026 armv7l Linux
>
> Regards,
> Andreas

Hi! Does the change I posted earlier in this thread help?

Bart

Re: [PATCH v2 01/12] i2c: allow setting the parent device and OF node through the adapter struct

[Andreas Kemnade]

On Mon, 2 Mar 2026 03:08:24 -0800
Bartosz Golaszewski <brgl@kernel.org> wrote:

> On Mon, 2 Mar 2026 11:38:27 +0100, Kalle Niemi <kaleposti@gmail.com> said:
> > On 3/2/26 10:55, Bartosz Golaszewski wrote:  
> >> On Mon, Mar 2, 2026 at 8:47 AM Kalle Niemi <kaleposti@gmail.com> wrote:  
> >>> On 2/23/26 11:05, Bartosz Golaszewski wrote:  
> >>>> In order to stop i2c bus drivers from dereferencing the struct device
> >>>> embedded in struct i2c_adapter, let's allow configuring the parent
> >>>> device and OF-node of the adapter directly through dedicated fields.
> >>>> Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
> >>>> ---  
> >>> Hello,
> >>> Automated driver test system bisected this commit to be the first bad
> >>> commit, linux-next next-20260227 was tested. Failed tests include driver
> >>> tests for ROHM PMIC and accelerometers, which are connected to
> >>> BeagleBone Black.
> >>> The failed driver tests all fail to first i2cget and the tests stop
> >>> there: "Could not open file '/dev/i2c-2' or 'dev/i2c/2': No such file or
> >>> directory".  
> >> Wolfram: well, now it would actually be useful to know which commit
> >> exactly is the culprit so maybe splitting the changes is not a bad
> >> idea after all.
> >> Kalle: which i2c bus driver fails here? Any errors in kernel log?
> >> Bart  
> >
> > Hello Bart,
> >
> > i2c-1 and i2c-2 are failing. I am not seeing any i2c errors in kernel log. I got two failures without the dmesg available (this is bugged test sequence, and not a kernel crash), but those got the same stdout message "Could not open file ...." as all others.
> >
> > -Kalle
> >  
> 
> I meant what driver are you using but I suppose it's i2c-omap.
> 
> Can you try the following change and let me know if it fixes the issue?
> 
> diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
> index dd8cec9b04c6..01656f82d2c6 100644
> --- a/drivers/i2c/i2c-core-base.c
> +++ b/drivers/i2c/i2c-core-base.c
> @@ -1548,6 +1548,11 @@ static int i2c_register_adapter(struct i2c_adapter *adap)
>  	if (adap->timeout == 0)
>  		adap->timeout = HZ;
> 
> +	if (!adap->dev.parent)
> +		adap->dev.parent = adap->parent;
> +	if (!adap->dev.of_node)
> +		adap->dev.of_node = adap->of_node;
> +
>  	/* register soft irqs for Host Notify */
>  	res = i2c_setup_host_notify_irq_domain(adap);
>  	if (res) {
> @@ -1561,11 +1566,6 @@ static int i2c_register_adapter(struct i2c_adapter *adap)
>  	adap->dev.type = &i2c_adapter_type;
>  	device_initialize(&adap->dev);
> 
> -	if (!adap->dev.parent)
> -		adap->dev.parent = adap->parent;
> -	if (!adap->dev.of_node)
> -		adap->dev.of_node = adap->of_node;
> -
>  	/*
>  	 * This adapter can be used as a parent immediately after device_add(),
>  	 * setup runtime-pm (especially ignore-children) before hand.
> 
No changes here. Devices probe, bus indexes are still shifted.
If I take that into account, i2cget still works.

But I think there is no defined order anyways. So if
I would add e.g. usb device provoding i2c busses early than
omap-i2c for some odd reason, things were messed anyways.

On the other hand, just having numbers skipped seems to be odd.

Regards,
Andreas

Re: [PATCH v2 01/12] i2c: allow setting the parent device and OF node through the adapter struct

[Andreas Kemnade]

On Mon, 2 Mar 2026 16:42:58 +0100
Bartosz Golaszewski <brgl@kernel.org> wrote:

> On Mon, Mar 2, 2026 at 4:11 PM Andreas Kemnade <andreas@kemnade.info> wrote:
> >
> > On Mon, 2 Mar 2026 12:38:27 +0200
> > Kalle Niemi <kaleposti@gmail.com> wrote:
> >  
> > > On 3/2/26 10:55, Bartosz Golaszewski wrote:  
> > > > On Mon, Mar 2, 2026 at 8:47 AM Kalle Niemi <kaleposti@gmail.com> wrote:  
> > > >> On 2/23/26 11:05, Bartosz Golaszewski wrote:  
> > > >>> In order to stop i2c bus drivers from dereferencing the struct device
> > > >>> embedded in struct i2c_adapter, let's allow configuring the parent
> > > >>> device and OF-node of the adapter directly through dedicated fields.
> > > >>> Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
> > > >>> ---  
> > > >> Hello,
> > > >> Automated driver test system bisected this commit to be the first bad
> > > >> commit, linux-next next-20260227 was tested. Failed tests include driver
> > > >> tests for ROHM PMIC and accelerometers, which are connected to
> > > >> BeagleBone Black.
> > > >> The failed driver tests all fail to first i2cget and the tests stop
> > > >> there: "Could not open file '/dev/i2c-2' or 'dev/i2c/2': No such file or
> > > >> directory".  
> > > > Wolfram: well, now it would actually be useful to know which commit
> > > > exactly is the culprit so maybe splitting the changes is not a bad
> > > > idea after all.
> > > > Kalle: which i2c bus driver fails here? Any errors in kernel log?
> > > > Bart  
> > >
> > > Hello Bart,
> > >
> > > i2c-1 and i2c-2 are failing. I am not seeing any i2c errors in kernel log. I got two failures without the dmesg available (this is bugged test sequence, and not a kernel crash), but those got the same stdout message "Could not open file ...." as all others.
> > >  
> > Probably I am using the same host driver
> >
> > tested on OMAP3 DM3730, result: i2c drivers get bound to their devices,
> > no obvious trouble. But controllers are registered with high indexes.
> >
> > localhost:~# i2cdetect -l
> > i2c-3   i2c             OMAP I2C adapter                        I2C adapter
> > i2c-4   i2c             OMAP I2C adapter                        I2C adapter
> > i2c-5   i2c             OMAP I2C adapter                        I2C adapter
> > localhost:~# uname -a
> > Linux localhost 7.0.0-rc1-next-20260227 #27 SMP Mon Mar  2 11:56:27 CET 2026 armv7l Linux
> >
> > Regards,
> > Andreas  
> 
> Hi! Does the change I posted earlier in this thread help?
> 
It does *not* as written earlier.

Just for comparison, with the offending patch reverted, it
looks like this:

localhost:~# i2cdetect -l
i2c-0	i2c       	OMAP I2C adapter                	I2C adapter
i2c-1	i2c       	OMAP I2C adapter                	I2C adapter
i2c-2	i2c       	OMAP I2C adapter                	I2C adapter


So as long only kernel drivers are used and matched via devicetree compatible
nothing seems to care about the change of bus numbers.

Regards,
Andreas

Re: [PATCH v2 01/12] i2c: allow setting the parent device and OF node through the adapter struct

[Andreas Kemnade]

On Mon, 2 Mar 2026 16:59:28 +0100
Andreas Kemnade <andreas@kemnade.info> wrote:

> On Mon, 2 Mar 2026 03:08:24 -0800
> Bartosz Golaszewski <brgl@kernel.org> wrote:
> 
> > On Mon, 2 Mar 2026 11:38:27 +0100, Kalle Niemi <kaleposti@gmail.com> said:  
> > > On 3/2/26 10:55, Bartosz Golaszewski wrote:    
> > >> On Mon, Mar 2, 2026 at 8:47 AM Kalle Niemi <kaleposti@gmail.com> wrote:    
> > >>> On 2/23/26 11:05, Bartosz Golaszewski wrote:    
> > >>>> In order to stop i2c bus drivers from dereferencing the struct device
> > >>>> embedded in struct i2c_adapter, let's allow configuring the parent
> > >>>> device and OF-node of the adapter directly through dedicated fields.
> > >>>> Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
> > >>>> ---    
> > >>> Hello,
> > >>> Automated driver test system bisected this commit to be the first bad
> > >>> commit, linux-next next-20260227 was tested. Failed tests include driver
> > >>> tests for ROHM PMIC and accelerometers, which are connected to
> > >>> BeagleBone Black.
> > >>> The failed driver tests all fail to first i2cget and the tests stop
> > >>> there: "Could not open file '/dev/i2c-2' or 'dev/i2c/2': No such file or
> > >>> directory".    
> > >> Wolfram: well, now it would actually be useful to know which commit
> > >> exactly is the culprit so maybe splitting the changes is not a bad
> > >> idea after all.
> > >> Kalle: which i2c bus driver fails here? Any errors in kernel log?
> > >> Bart    
> > >
> > > Hello Bart,
> > >
> > > i2c-1 and i2c-2 are failing. I am not seeing any i2c errors in kernel log. I got two failures without the dmesg available (this is bugged test sequence, and not a kernel crash), but those got the same stdout message "Could not open file ...." as all others.
> > >
> > > -Kalle
> > >    
> > 
> > I meant what driver are you using but I suppose it's i2c-omap.
> > 
> > Can you try the following change and let me know if it fixes the issue?
> > 
> > diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
> > index dd8cec9b04c6..01656f82d2c6 100644
> > --- a/drivers/i2c/i2c-core-base.c
> > +++ b/drivers/i2c/i2c-core-base.c
> > @@ -1548,6 +1548,11 @@ static int i2c_register_adapter(struct i2c_adapter *adap)
> >  	if (adap->timeout == 0)
> >  		adap->timeout = HZ;
> > 
> > +	if (!adap->dev.parent)
> > +		adap->dev.parent = adap->parent;
> > +	if (!adap->dev.of_node)
> > +		adap->dev.of_node = adap->of_node;
> > +
> >  	/* register soft irqs for Host Notify */
> >  	res = i2c_setup_host_notify_irq_domain(adap);
> >  	if (res) {
> > @@ -1561,11 +1566,6 @@ static int i2c_register_adapter(struct i2c_adapter *adap)
> >  	adap->dev.type = &i2c_adapter_type;
> >  	device_initialize(&adap->dev);
> > 
> > -	if (!adap->dev.parent)
> > -		adap->dev.parent = adap->parent;
> > -	if (!adap->dev.of_node)
> > -		adap->dev.of_node = adap->of_node;
> > -
> >  	/*
> >  	 * This adapter can be used as a parent immediately after device_add(),
> >  	 * setup runtime-pm (especially ignore-children) before hand.
> >   
> No changes here. Devices probe, bus indexes are still shifted.
> If I take that into account, i2cget still works.
> 
> But I think there is no defined order anyways. So if
> I would add e.g. usb device provoding i2c busses early than
> omap-i2c for some odd reason, things were messed anyways.
> 
> On the other hand, just having numbers skipped seems to be odd.
> 
ok, looked around further,
We have aliases, so numbers should be static


i2c_add_adapter calls i2c_register_adapter() as the
last thing, but needs to determine the number earlier.

This seems to help:

diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
index dd8cec9b04c6..e22d784202b8 100644
--- a/drivers/i2c/i2c-core-base.c
+++ b/drivers/i2c/i2c-core-base.c
@@ -1657,10 +1657,9 @@ static int __i2c_add_numbered_adapter(struct i2c_adapter *adap)
  */
 int i2c_add_adapter(struct i2c_adapter *adapter)
 {
-	struct device *dev = &adapter->dev;
 	int id;
 
-	id = of_alias_get_id(dev->of_node, "i2c");
+	id = of_alias_get_id(adapter->of_node, "i2c");
 	if (id >= 0) {
 		adapter->nr = id;
 		return __i2c_add_numbered_adapter(adapter);

> Regards,
> Andreas
> 
>