diff mbox series

[v2,7/7] i2c: designware: Group all DesignWare drivers under a single option

Message ID 20240903142506.3444628-8-heikki.krogerus@linux.intel.com
State Accepted
Delegated to: Andi Shyti
Headers show
Series i2c: designware: Group all DesignWare drivers under a single option | expand

Commit Message

Heikki Krogerus Sept. 3, 2024, 2:25 p.m. UTC
There are quite a few drivers and options for the DesignWare
I2C adapter in the Kconfig. Grouping all of them under the
I2C_DESIGNWARE_CORE. That makes the menuconfig a bit more
easier to understand.

Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
---
 drivers/i2c/busses/Kconfig | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

Comments

Andi Shyti Sept. 5, 2024, 8:46 p.m. UTC | #1
Hi Heikki,

On Tue, Sep 03, 2024 at 05:25:06PM GMT, Heikki Krogerus wrote:
> There are quite a few drivers and options for the DesignWare
> I2C adapter in the Kconfig. Grouping all of them under the
> I2C_DESIGNWARE_CORE. That makes the menuconfig a bit more
> easier to understand.
> 
> Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>

Thanks for your patch, I can take this only after the other
patches have been taken in.

Andi
Conor Dooley Sept. 9, 2024, 11:22 a.m. UTC | #2
On Thu, Sep 05, 2024 at 10:46:02PM +0200, Andi Shyti wrote:
> Hi Heikki,
> 
> On Tue, Sep 03, 2024 at 05:25:06PM GMT, Heikki Krogerus wrote:
> > There are quite a few drivers and options for the DesignWare
> > I2C adapter in the Kconfig. Grouping all of them under the
> > I2C_DESIGNWARE_CORE. That makes the menuconfig a bit more
> > easier to understand.
> > 
> > Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> 
> Thanks for your patch, I can take this only after the other
> patches have been taken in.

I assume then that you're expecting the prereqs to go through the
various arch trees? Is this not trivial enough that you could chuck it
on a dedicated branch in your tree and if, for some reason, there's a
non-trivial conflict the affected could pull it in?
Andi Shyti Sept. 9, 2024, 12:21 p.m. UTC | #3
Hi Conor,

On Mon, Sep 09, 2024 at 12:22:22PM GMT, Conor Dooley wrote:
> On Thu, Sep 05, 2024 at 10:46:02PM +0200, Andi Shyti wrote:
> > Hi Heikki,
> > 
> > On Tue, Sep 03, 2024 at 05:25:06PM GMT, Heikki Krogerus wrote:
> > > There are quite a few drivers and options for the DesignWare
> > > I2C adapter in the Kconfig. Grouping all of them under the
> > > I2C_DESIGNWARE_CORE. That makes the menuconfig a bit more
> > > easier to understand.
> > > 
> > > Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> > 
> > Thanks for your patch, I can take this only after the other
> > patches have been taken in.
> 
> I assume then that you're expecting the prereqs to go through the
> various arch trees? Is this not trivial enough that you could chuck it
> on a dedicated branch in your tree and if, for some reason, there's a
> non-trivial conflict the affected could pull it in?

Thanks for your advice: considering that cross-domain patches are
difficult to handle, I appreciate any suggestion on how to deal
with them :-)

Are you suggesting to set these up in a different branch and send
a pull request out of that branch?

I don't want here to step into other people branches if they
don't ack or express any thought.

Andi
Conor Dooley Sept. 9, 2024, 1:04 p.m. UTC | #4
On Mon, Sep 09, 2024 at 02:21:32PM +0200, Andi Shyti wrote:
> Hi Conor,
> 
> On Mon, Sep 09, 2024 at 12:22:22PM GMT, Conor Dooley wrote:
> > On Thu, Sep 05, 2024 at 10:46:02PM +0200, Andi Shyti wrote:
> > > Hi Heikki,
> > > 
> > > On Tue, Sep 03, 2024 at 05:25:06PM GMT, Heikki Krogerus wrote:
> > > > There are quite a few drivers and options for the DesignWare
> > > > I2C adapter in the Kconfig. Grouping all of them under the
> > > > I2C_DESIGNWARE_CORE. That makes the menuconfig a bit more
> > > > easier to understand.
> > > > 
> > > > Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> > > 
> > > Thanks for your patch, I can take this only after the other
> > > patches have been taken in.
> > 
> > I assume then that you're expecting the prereqs to go through the
> > various arch trees? Is this not trivial enough that you could chuck it
> > on a dedicated branch in your tree and if, for some reason, there's a
> > non-trivial conflict the affected could pull it in?
> 
> Thanks for your advice: considering that cross-domain patches are
> difficult to handle, I appreciate any suggestion on how to deal
> with them :-)

It's also helpful if the submitter of a series proposes what path
patches should take upstream. I find that people all look at something
like this and see "someone else's problem" written all over it, and
would be perfectly happy to accept a proposal from a submitter that it
all goes via I2C.

> Are you suggesting to set these up in a different branch and send
> a pull request out of that branch?

What I meant was put them in a dedicated branch (so probably on top of
-rc1 or similar) and merge that branch into your for-next branch. If
someone then was to run into a non-trivial conflict you could tag the
dedicated branch and they could pull it into their tree.

> I don't want here to step into other people branches if they
> don't ack or express any thought.

Sure, I wouldn't either, but it far from abnormal for driver subsystem
maintainer to take these sort of rename/dependency addition patches and
the normal path for 3 of the 5 architectures affected here is via Arnd
and I figure there's a low probability of the maintainers of those
architectures having their feels hurt.

Cheers,
Conor.
Andi Shyti Sept. 9, 2024, 7:06 p.m. UTC | #5
On Mon, Sep 09, 2024 at 02:04:05PM GMT, Conor Dooley wrote:
> On Mon, Sep 09, 2024 at 02:21:32PM +0200, Andi Shyti wrote:
> > On Mon, Sep 09, 2024 at 12:22:22PM GMT, Conor Dooley wrote:
> > > On Thu, Sep 05, 2024 at 10:46:02PM +0200, Andi Shyti wrote:
> > > > On Tue, Sep 03, 2024 at 05:25:06PM GMT, Heikki Krogerus wrote:
> > > > > There are quite a few drivers and options for the DesignWare
> > > > > I2C adapter in the Kconfig. Grouping all of them under the
> > > > > I2C_DESIGNWARE_CORE. That makes the menuconfig a bit more
> > > > > easier to understand.
> > > > > 
> > > > > Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> > > > 
> > > > Thanks for your patch, I can take this only after the other
> > > > patches have been taken in.
> > > 
> > > I assume then that you're expecting the prereqs to go through the
> > > various arch trees? Is this not trivial enough that you could chuck it
> > > on a dedicated branch in your tree and if, for some reason, there's a
> > > non-trivial conflict the affected could pull it in?
> > 
> > Thanks for your advice: considering that cross-domain patches are
> > difficult to handle, I appreciate any suggestion on how to deal
> > with them :-)
> 
> It's also helpful if the submitter of a series proposes what path
> patches should take upstream. I find that people all look at something
> like this and see "someone else's problem" written all over it, and
> would be perfectly happy to accept a proposal from a submitter that it
> all goes via I2C.
> 
> > Are you suggesting to set these up in a different branch and send
> > a pull request out of that branch?
> 
> What I meant was put them in a dedicated branch (so probably on top of
> -rc1 or similar) and merge that branch into your for-next branch. If
> someone then was to run into a non-trivial conflict you could tag the
> dedicated branch and they could pull it into their tree.
> 
> > I don't want here to step into other people branches if they
> > don't ack or express any thought.
> 
> Sure, I wouldn't either, but it far from abnormal for driver subsystem
> maintainer to take these sort of rename/dependency addition patches and
> the normal path for 3 of the 5 architectures affected here is via Arnd
> and I figure there's a low probability of the maintainers of those
> architectures having their feels hurt.

Thanks Conor! I will take it into i2c, then. In any case, Stephen
will check if there will be duplicates.

Thanks,
Andi
diff mbox series

Patch

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index a22f9125322a..027724358d28 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -559,28 +559,33 @@  config I2C_DAVINCI
 	  For details please see http://www.ti.com/davinci
 
 config I2C_DESIGNWARE_CORE
-	tristate
+	tristate "Synopsys DesignWare I2C adapter"
 	select REGMAP
+	help
+	  This option enables support for the Synopsys DesignWare I2C adapter.
+	  This driver includes support for the I2C host on the Synopsys
+	  Designware I2C adapter.
+
+	  To compile the driver as a module, choose M here: the module will be
+	  called i2c-designware-core.
+
+if I2C_DESIGNWARE_CORE
 
 config I2C_DESIGNWARE_SLAVE
 	bool "Synopsys DesignWare Slave"
-	depends on I2C_DESIGNWARE_CORE
 	select I2C_SLAVE
 	help
 	  If you say yes to this option, support will be included for the
 	  Synopsys DesignWare I2C slave adapter.
 
-	  This is not a standalone module, this module compiles together with
-	  i2c-designware-core.
-
 config I2C_DESIGNWARE_PLATFORM
-	tristate "Synopsys DesignWare Platform"
+	tristate "Synopsys DesignWare Platform driver"
 	depends on (ACPI && COMMON_CLK) || !ACPI
-	select I2C_DESIGNWARE_CORE
 	select MFD_SYSCON if MIPS_BAIKAL_T1
+	default I2C_DESIGNWARE_CORE
 	help
 	  If you say yes to this option, support will be included for the
-	  Synopsys DesignWare I2C adapter.
+	  Synopsys DesignWare I2C adapters on the platform bus.
 
 	  This driver can also be built as a module.  If so, the module
 	  will be called i2c-designware-platform.
@@ -613,17 +618,19 @@  config I2C_DESIGNWARE_BAYTRAIL
 	  a BayTrail system using the AXP288.
 
 config I2C_DESIGNWARE_PCI
-	tristate "Synopsys DesignWare PCI"
+	tristate "Synopsys DesignWare PCI driver"
 	depends on PCI
-	select I2C_DESIGNWARE_CORE
 	select I2C_CCGX_UCSI
 	help
 	  If you say yes to this option, support will be included for the
-	  Synopsys DesignWare I2C adapter. Only master mode is supported.
+	  Synopsys DesignWare I2C adapters on the PCI bus. Only master mode is
+	  supported.
 
 	  This driver can also be built as a module.  If so, the module
 	  will be called i2c-designware-pci.
 
+endif
+
 config I2C_DIGICOLOR
 	tristate "Conexant Digicolor I2C driver"
 	depends on ARCH_DIGICOLOR || COMPILE_TEST