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

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

[Heikki Krogerus]

Hi guys,

This is a proposal for Kconfig improvement regarding the Synopsys
DesignWare I2C adapter driver.

Changes since v1:

There was one driver that selects I2C_DESIGNWARE_PLATFORM in its
Kconfig which causes an error because I2C_DESIGNWARE_CORE is not
selected.

The drivers Kconfig I'm proposing that we fix by using "depends on"
instead of "select". There are also a number of defconfigs that enable
I2C_DESIGNWARE_PLATFORM that now need to enable I2C_DESIGNWARE_CORE.

The original patch:
https://lore.kernel.org/linux-i2c/20240830111222.2131172-1-heikki.krogerus@linux.intel.com/

thanks,

Heikki Krogerus (7):
  ARC: configs: enable I2C_DESIGNWARE_CORE with I2C_DESIGNWARE_PLATFORM
  ARM: configs: enable I2C_DESIGNWARE_CORE with I2C_DESIGNWARE_PLATFORM
  arm64: defconfig: enable I2C_DESIGNWARE_CORE with
    I2C_DESIGNWARE_PLATFORM
  mips: configs: enable I2C_DESIGNWARE_CORE with I2C_DESIGNWARE_PLATFORM
  RISC-V: configs: enable I2C_DESIGNWARE_CORE with
    I2C_DESIGNWARE_PLATFORM
  net: txgbe: Fix I2C Kconfig dependencies
  i2c: designware: Group all DesignWare drivers under a single option

 arch/arc/configs/axs101_defconfig             |  1 +
 arch/arc/configs/axs103_defconfig             |  1 +
 arch/arc/configs/axs103_smp_defconfig         |  1 +
 arch/arc/configs/tb10x_defconfig              |  1 +
 arch/arm/configs/hisi_defconfig               |  1 +
 arch/arm/configs/multi_v7_defconfig           |  1 +
 arch/arm/configs/pxa_defconfig                |  1 +
 arch/arm/configs/socfpga_defconfig            |  1 +
 arch/arm/configs/spear13xx_defconfig          |  1 +
 arch/arm/configs/spear3xx_defconfig           |  1 +
 arch/arm/configs/spear6xx_defconfig           |  1 +
 arch/arm64/configs/defconfig                  |  1 +
 arch/mips/configs/generic/board-ocelot.config |  1 +
 arch/riscv/configs/defconfig                  |  1 +
 arch/riscv/configs/nommu_k210_defconfig       |  1 +
 .../riscv/configs/nommu_k210_sdcard_defconfig |  1 +
 drivers/i2c/busses/Kconfig                    | 29 ++++++++++++-------
 drivers/net/ethernet/wangxun/Kconfig          |  3 +-
 18 files changed, 35 insertions(+), 13 deletions(-)

-- 
2.45.2

[PATCH v2 1/7] ARC: configs: enable I2C_DESIGNWARE_CORE with I2C_DESIGNWARE_PLATFORM

[Heikki Krogerus]

The dependency handling of the Synopsys DesignWare I2C
adapter drivers is going to be changed so that the glue
drivers for the PCI and platform buses depend on
I2C_DESIGNWARE_CORE.

Cc: Vineet Gupta <vgupta@kernel.org>
Cc: linux-snps-arc@lists.infradead.org
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
---
 arch/arc/configs/axs101_defconfig     | 1 +
 arch/arc/configs/axs103_defconfig     | 1 +
 arch/arc/configs/axs103_smp_defconfig | 1 +
 arch/arc/configs/tb10x_defconfig      | 1 +
 4 files changed, 4 insertions(+)

diff --git a/arch/arc/configs/axs101_defconfig b/arch/arc/configs/axs101_defconfig
index 89720d6d7e0d..319bbe270322 100644
--- a/arch/arc/configs/axs101_defconfig
+++ b/arch/arc/configs/axs101_defconfig
@@ -66,6 +66,7 @@ CONFIG_SERIAL_OF_PLATFORM=y
 # CONFIG_HW_RANDOM is not set
 CONFIG_I2C=y
 CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_DESIGNWARE_CORE=y
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
 # CONFIG_HWMON is not set
 CONFIG_DRM=m
diff --git a/arch/arc/configs/axs103_defconfig b/arch/arc/configs/axs103_defconfig
index 73ec01ed0492..8c1f1a111a17 100644
--- a/arch/arc/configs/axs103_defconfig
+++ b/arch/arc/configs/axs103_defconfig
@@ -66,6 +66,7 @@ CONFIG_SERIAL_OF_PLATFORM=y
 # CONFIG_HW_RANDOM is not set
 CONFIG_I2C=y
 CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_DESIGNWARE_CORE=y
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
 # CONFIG_HWMON is not set
 CONFIG_FB=y
diff --git a/arch/arc/configs/axs103_smp_defconfig b/arch/arc/configs/axs103_smp_defconfig
index 4da0f626fa9d..75cab9f25b5b 100644
--- a/arch/arc/configs/axs103_smp_defconfig
+++ b/arch/arc/configs/axs103_smp_defconfig
@@ -66,6 +66,7 @@ CONFIG_SERIAL_OF_PLATFORM=y
 # CONFIG_HW_RANDOM is not set
 CONFIG_I2C=y
 CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_DESIGNWARE_CORE=y
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
 # CONFIG_HWMON is not set
 CONFIG_DRM=m
diff --git a/arch/arc/configs/tb10x_defconfig b/arch/arc/configs/tb10x_defconfig
index 1a68e4beebca..5aba3d850fa2 100644
--- a/arch/arc/configs/tb10x_defconfig
+++ b/arch/arc/configs/tb10x_defconfig
@@ -60,6 +60,7 @@ CONFIG_SERIAL_8250_DW=y
 # CONFIG_HW_RANDOM is not set
 CONFIG_I2C=y
 # CONFIG_I2C_COMPAT is not set
+CONFIG_I2C_DESIGNWARE_CORE=y
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_GPIO_SYSFS=y
 # CONFIG_HWMON is not set
-- 
2.45.2

[PATCH v2 2/7] ARM: configs: enable I2C_DESIGNWARE_CORE with I2C_DESIGNWARE_PLATFORM

[Heikki Krogerus]

The dependency handling of the Synopsys DesignWare I2C
adapter drivers is going to be changed so that the glue
drivers for the PCI and platform buses depend on
I2C_DESIGNWARE_CORE.

Cc: Russell King <linux@armlinux.org.uk>
Cc: Dinh Nguyen <dinguyen@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
---
 arch/arm/configs/hisi_defconfig      | 1 +
 arch/arm/configs/multi_v7_defconfig  | 1 +
 arch/arm/configs/pxa_defconfig       | 1 +
 arch/arm/configs/socfpga_defconfig   | 1 +
 arch/arm/configs/spear13xx_defconfig | 1 +
 arch/arm/configs/spear3xx_defconfig  | 1 +
 arch/arm/configs/spear6xx_defconfig  | 1 +
 7 files changed, 7 insertions(+)

diff --git a/arch/arm/configs/hisi_defconfig b/arch/arm/configs/hisi_defconfig
index 0376a65e8bc1..e19c1039fb93 100644
--- a/arch/arm/configs/hisi_defconfig
+++ b/arch/arm/configs/hisi_defconfig
@@ -43,6 +43,7 @@ CONFIG_SERIAL_8250_DW=y
 CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_SERIAL_AMBA_PL011=y
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
+CONFIG_I2C_DESIGNWARE_CORE=y
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_SPI=y
 CONFIG_SPI_PL022=y
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 62734530a3d6..9a5f5c439b87 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -413,6 +413,7 @@ CONFIG_I2C_AT91=m
 CONFIG_I2C_BCM2835=y
 CONFIG_I2C_CADENCE=y
 CONFIG_I2C_DAVINCI=y
+CONFIG_I2C_DESIGNWARE_CORE=y
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_I2C_DIGICOLOR=m
 CONFIG_I2C_EMEV2=m
diff --git a/arch/arm/configs/pxa_defconfig b/arch/arm/configs/pxa_defconfig
index f2ca5c9131b5..e1cb170c2bf0 100644
--- a/arch/arm/configs/pxa_defconfig
+++ b/arch/arm/configs/pxa_defconfig
@@ -277,6 +277,7 @@ CONFIG_HW_RANDOM=y
 CONFIG_I2C_CHARDEV=m
 CONFIG_I2C_MUX_PCA954x=m
 CONFIG_I2C_MUX_PINCTRL=m
+CONFIG_I2C_DESIGNWARE_CORE=m
 CONFIG_I2C_DESIGNWARE_PLATFORM=m
 CONFIG_I2C_GPIO=y
 CONFIG_I2C_PXA_SLAVE=y
diff --git a/arch/arm/configs/socfpga_defconfig b/arch/arm/configs/socfpga_defconfig
index e82c3866b810..294906c8f16e 100644
--- a/arch/arm/configs/socfpga_defconfig
+++ b/arch/arm/configs/socfpga_defconfig
@@ -83,6 +83,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=2
 CONFIG_SERIAL_8250_DW=y
 CONFIG_I2C=y
 CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_DESIGNWARE_CORE=y
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_SPI=y
 CONFIG_SPI_CADENCE_QUADSPI=y
diff --git a/arch/arm/configs/spear13xx_defconfig b/arch/arm/configs/spear13xx_defconfig
index c8128a6180e7..a8f992fdb30d 100644
--- a/arch/arm/configs/spear13xx_defconfig
+++ b/arch/arm/configs/spear13xx_defconfig
@@ -62,6 +62,7 @@ CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
 # CONFIG_HW_RANDOM is not set
 CONFIG_RAW_DRIVER=y
 CONFIG_I2C=y
+CONFIG_I2C_DESIGNWARE_CORE=y
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_SPI=y
 CONFIG_SPI_PL022=y
diff --git a/arch/arm/configs/spear3xx_defconfig b/arch/arm/configs/spear3xx_defconfig
index 97ea2e9a6f07..8dc5a388759c 100644
--- a/arch/arm/configs/spear3xx_defconfig
+++ b/arch/arm/configs/spear3xx_defconfig
@@ -42,6 +42,7 @@ CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
 # CONFIG_HW_RANDOM is not set
 CONFIG_RAW_DRIVER=y
 CONFIG_I2C=y
+CONFIG_I2C_DESIGNWARE_CORE=y
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_SPI=y
 CONFIG_SPI_PL022=y
diff --git a/arch/arm/configs/spear6xx_defconfig b/arch/arm/configs/spear6xx_defconfig
index a7a3413ac968..4e9e1a6ff381 100644
--- a/arch/arm/configs/spear6xx_defconfig
+++ b/arch/arm/configs/spear6xx_defconfig
@@ -33,6 +33,7 @@ CONFIG_STMMAC_ETH=y
 CONFIG_SERIAL_AMBA_PL011=y
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
 CONFIG_I2C=y
+CONFIG_I2C_DESIGNWARE_CORE=y
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_SPI=y
 CONFIG_SPI_PL022=y
-- 
2.45.2

[PATCH v2 3/7] arm64: defconfig: enable I2C_DESIGNWARE_CORE with I2C_DESIGNWARE_PLATFORM

[Heikki Krogerus]

The dependency handling of the Synopsys DesignWare I2C
adapter drivers is going to be changed so that the glue
drivers for the PCI and platform buses depend on
I2C_DESIGNWARE_CORE.

Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
---
 arch/arm64/configs/defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index f064c7c91dbb..c2973b7a873e 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -518,6 +518,7 @@ CONFIG_I2C_MUX=y
 CONFIG_I2C_MUX_PCA954x=y
 CONFIG_I2C_BCM2835=m
 CONFIG_I2C_CADENCE=m
+CONFIG_I2C_DESIGNWARE_CORE=y
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_I2C_GPIO=m
 CONFIG_I2C_IMX=y
-- 
2.45.2

[PATCH v2 4/7] mips: configs: enable I2C_DESIGNWARE_CORE with I2C_DESIGNWARE_PLATFORM

[Heikki Krogerus]

The dependency handling of the Synopsys DesignWare I2C
adapter drivers is going to be changed so that the glue
drivers for the PCI and platform buses depend on
I2C_DESIGNWARE_CORE.

Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>
Cc: UNGLinuxDriver@microchip.com
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: linux-mips@vger.kernel.org
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
---
 arch/mips/configs/generic/board-ocelot.config | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/mips/configs/generic/board-ocelot.config b/arch/mips/configs/generic/board-ocelot.config
index 8cfbafa532e0..a5b5b5102472 100644
--- a/arch/mips/configs/generic/board-ocelot.config
+++ b/arch/mips/configs/generic/board-ocelot.config
@@ -31,6 +31,7 @@ CONFIG_MICROSEMI_PHY=y
 CONFIG_I2C=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_MUX=y
+CONFIG_I2C_DESIGNWARE_CORE=y
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
 
 CONFIG_SPI=y
-- 
2.45.2

[PATCH v2 5/7] RISC-V: configs: enable I2C_DESIGNWARE_CORE with I2C_DESIGNWARE_PLATFORM

[Heikki Krogerus]

The dependency handling of the Synopsys DesignWare I2C
adapter drivers is going to be changed so that the glue
drivers for the PCI and platform buses depend on
I2C_DESIGNWARE_CORE.

Cc: Paul Walmsley <paul.walmsley@sifive.com>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Albert Ou <aou@eecs.berkeley.edu>
Cc: linux-riscv@lists.infradead.org
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
---
 arch/riscv/configs/defconfig                   | 1 +
 arch/riscv/configs/nommu_k210_defconfig        | 1 +
 arch/riscv/configs/nommu_k210_sdcard_defconfig | 1 +
 3 files changed, 3 insertions(+)

diff --git a/arch/riscv/configs/defconfig b/arch/riscv/configs/defconfig
index 0d678325444f..a644a798f602 100644
--- a/arch/riscv/configs/defconfig
+++ b/arch/riscv/configs/defconfig
@@ -157,6 +157,7 @@ CONFIG_HW_RANDOM_VIRTIO=y
 CONFIG_HW_RANDOM_JH7110=m
 CONFIG_I2C=y
 CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_DESIGNWARE_CORE=y
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_I2C_MV64XXX=m
 CONFIG_I2C_RIIC=y
diff --git a/arch/riscv/configs/nommu_k210_defconfig b/arch/riscv/configs/nommu_k210_defconfig
index af9601da4643..87ff5a1233af 100644
--- a/arch/riscv/configs/nommu_k210_defconfig
+++ b/arch/riscv/configs/nommu_k210_defconfig
@@ -58,6 +58,7 @@ CONFIG_I2C=y
 # CONFIG_I2C_COMPAT is not set
 CONFIG_I2C_CHARDEV=y
 # CONFIG_I2C_HELPER_AUTO is not set
+CONFIG_I2C_DESIGNWARE_CORE=y
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_SPI=y
 # CONFIG_SPI_MEM is not set
diff --git a/arch/riscv/configs/nommu_k210_sdcard_defconfig b/arch/riscv/configs/nommu_k210_sdcard_defconfig
index dd460c649152..95cbd574f291 100644
--- a/arch/riscv/configs/nommu_k210_sdcard_defconfig
+++ b/arch/riscv/configs/nommu_k210_sdcard_defconfig
@@ -50,6 +50,7 @@ CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_I2C=y
 CONFIG_I2C_CHARDEV=y
 # CONFIG_I2C_HELPER_AUTO is not set
+CONFIG_I2C_DESIGNWARE_CORE=y
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_SPI=y
 # CONFIG_SPI_MEM is not set
-- 
2.45.2

Re: [PATCH v2 5/7] RISC-V: configs: enable I2C_DESIGNWARE_CORE with I2C_DESIGNWARE_PLATFORM

[Palmer Dabbelt]

On Tue, 03 Sep 2024 07:25:04 PDT (-0700), heikki.krogerus@linux.intel.com wrote:
> The dependency handling of the Synopsys DesignWare I2C
> adapter drivers is going to be changed so that the glue
> drivers for the PCI and platform buses depend on
> I2C_DESIGNWARE_CORE.
>
> Cc: Paul Walmsley <paul.walmsley@sifive.com>
> Cc: Palmer Dabbelt <palmer@dabbelt.com>
> Cc: Albert Ou <aou@eecs.berkeley.edu>
> Cc: linux-riscv@lists.infradead.org
> Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> ---
>  arch/riscv/configs/defconfig                   | 1 +
>  arch/riscv/configs/nommu_k210_defconfig        | 1 +
>  arch/riscv/configs/nommu_k210_sdcard_defconfig | 1 +
>  3 files changed, 3 insertions(+)
>
> diff --git a/arch/riscv/configs/defconfig b/arch/riscv/configs/defconfig
> index 0d678325444f..a644a798f602 100644
> --- a/arch/riscv/configs/defconfig
> +++ b/arch/riscv/configs/defconfig
> @@ -157,6 +157,7 @@ CONFIG_HW_RANDOM_VIRTIO=y
>  CONFIG_HW_RANDOM_JH7110=m
>  CONFIG_I2C=y
>  CONFIG_I2C_CHARDEV=m
> +CONFIG_I2C_DESIGNWARE_CORE=y
>  CONFIG_I2C_DESIGNWARE_PLATFORM=y
>  CONFIG_I2C_MV64XXX=m
>  CONFIG_I2C_RIIC=y
> diff --git a/arch/riscv/configs/nommu_k210_defconfig b/arch/riscv/configs/nommu_k210_defconfig
> index af9601da4643..87ff5a1233af 100644
> --- a/arch/riscv/configs/nommu_k210_defconfig
> +++ b/arch/riscv/configs/nommu_k210_defconfig
> @@ -58,6 +58,7 @@ CONFIG_I2C=y
>  # CONFIG_I2C_COMPAT is not set
>  CONFIG_I2C_CHARDEV=y
>  # CONFIG_I2C_HELPER_AUTO is not set
> +CONFIG_I2C_DESIGNWARE_CORE=y
>  CONFIG_I2C_DESIGNWARE_PLATFORM=y
>  CONFIG_SPI=y
>  # CONFIG_SPI_MEM is not set
> diff --git a/arch/riscv/configs/nommu_k210_sdcard_defconfig b/arch/riscv/configs/nommu_k210_sdcard_defconfig
> index dd460c649152..95cbd574f291 100644
> --- a/arch/riscv/configs/nommu_k210_sdcard_defconfig
> +++ b/arch/riscv/configs/nommu_k210_sdcard_defconfig
> @@ -50,6 +50,7 @@ CONFIG_DEVTMPFS_MOUNT=y
>  CONFIG_I2C=y
>  CONFIG_I2C_CHARDEV=y
>  # CONFIG_I2C_HELPER_AUTO is not set
> +CONFIG_I2C_DESIGNWARE_CORE=y
>  CONFIG_I2C_DESIGNWARE_PLATFORM=y
>  CONFIG_SPI=y
>  # CONFIG_SPI_MEM is not set

Acked-by: Palmer Dabbelt <palmer@rivosinc.com>

(based on the rest of the thread I'm assuming you're taking these all 
together, which seems saner to me)

[PATCH v2 6/7] net: txgbe: Fix I2C Kconfig dependencies

[Heikki Krogerus]

The dependency handling of the Synopsys DesignWare I2C
adapter drivers is going to be changed so that the glue
drivers for the platform and PCI buses depend on
I2C_DESIGNWARE_CORE. Right now this driver prevents that
update because it selects I2C_DESIGNWARE_PLATFORM.

To make the dependency on I2C_DESIGNWARE_PLATFORM consistent
with the other drivers in kernel that depend on it, and
allow the dependency handling of the Synopsys DesignWare I2C
drivers to be updated, change the "select" into "depends on".

Cc: Jiawen Wu <jiawenwu@trustnetic.com>
Cc: Mengyuan Lou <mengyuanlou@net-swift.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Eric Dumazet <edumazet@google.com>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Paolo Abeni <pabeni@redhat.com>
Cc: netdev@vger.kernel.org
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
---
 drivers/net/ethernet/wangxun/Kconfig | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/wangxun/Kconfig b/drivers/net/ethernet/wangxun/Kconfig
index 85cdbdd44fec..e46ccebcfd22 100644
--- a/drivers/net/ethernet/wangxun/Kconfig
+++ b/drivers/net/ethernet/wangxun/Kconfig
@@ -41,10 +41,9 @@ config TXGBE
 	tristate "Wangxun(R) 10GbE PCI Express adapters support"
 	depends on PCI
 	depends on COMMON_CLK
+	depends on I2C_DESIGNWARE_PLATFORM
 	select MARVELL_10G_PHY
 	select REGMAP
-	select I2C
-	select I2C_DESIGNWARE_PLATFORM
 	select PHYLINK
 	select HWMON if TXGBE=y
 	select SFP
-- 
2.45.2

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

[Heikki Krogerus]

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(-)

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
-- 
2.45.2

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

[Andi Shyti]

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

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

[Conor Dooley]

[-- Attachment #1: Type: text/plain, Size: 804 bytes --]

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?

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

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

[Andi Shyti]

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

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

[Conor Dooley]

[-- Attachment #1: Type: text/plain, Size: 2306 bytes --]

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.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

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

[Andi Shyti]

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

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

[Andi Shyti]

Hi Jarkko, Andy,

...

> Heikki Krogerus (7):
>   ARC: configs: enable I2C_DESIGNWARE_CORE with I2C_DESIGNWARE_PLATFORM
>   ARM: configs: enable I2C_DESIGNWARE_CORE with I2C_DESIGNWARE_PLATFORM
>   arm64: defconfig: enable I2C_DESIGNWARE_CORE with
>     I2C_DESIGNWARE_PLATFORM
>   mips: configs: enable I2C_DESIGNWARE_CORE with I2C_DESIGNWARE_PLATFORM
>   RISC-V: configs: enable I2C_DESIGNWARE_CORE with
>     I2C_DESIGNWARE_PLATFORM
>   net: txgbe: Fix I2C Kconfig dependencies
>   i2c: designware: Group all DesignWare drivers under a single option

I believe you know this code already, do you mind giving it an
ack?

Thanks,
Andi

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

[Jarkko Nikula]

On 9/4/24 12:01 AM, Andi Shyti wrote:
> Hi Jarkko, Andy,
> 
> ...
> 
>> Heikki Krogerus (7):
>>    ARC: configs: enable I2C_DESIGNWARE_CORE with I2C_DESIGNWARE_PLATFORM
>>    ARM: configs: enable I2C_DESIGNWARE_CORE with I2C_DESIGNWARE_PLATFORM
>>    arm64: defconfig: enable I2C_DESIGNWARE_CORE with
>>      I2C_DESIGNWARE_PLATFORM
>>    mips: configs: enable I2C_DESIGNWARE_CORE with I2C_DESIGNWARE_PLATFORM
>>    RISC-V: configs: enable I2C_DESIGNWARE_CORE with
>>      I2C_DESIGNWARE_PLATFORM
>>    net: txgbe: Fix I2C Kconfig dependencies
>>    i2c: designware: Group all DesignWare drivers under a single option
> 
> I believe you know this code already, do you mind giving it an
> ack?
> 
To the patches 1-7/7 in this set:

Acked-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>

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

[Andi Shyti]

Hi Heikki,

> Heikki Krogerus (7):
>   ARC: configs: enable I2C_DESIGNWARE_CORE with I2C_DESIGNWARE_PLATFORM
>   ARM: configs: enable I2C_DESIGNWARE_CORE with I2C_DESIGNWARE_PLATFORM
>   arm64: defconfig: enable I2C_DESIGNWARE_CORE with
>     I2C_DESIGNWARE_PLATFORM
>   mips: configs: enable I2C_DESIGNWARE_CORE with I2C_DESIGNWARE_PLATFORM
>   RISC-V: configs: enable I2C_DESIGNWARE_CORE with
>     I2C_DESIGNWARE_PLATFORM
>   net: txgbe: Fix I2C Kconfig dependencies
>   i2c: designware: Group all DesignWare drivers under a single option

Merged to i2c/i2c-host.

Thanks,
Andi

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

[patchwork-bot+linux-riscv]

Hello:

This patch was applied to riscv/linux.git (fixes)
by Andi Shyti <andi.shyti@kernel.org>:

On Tue,  3 Sep 2024 17:24:59 +0300 you wrote:
> Hi guys,
> 
> This is a proposal for Kconfig improvement regarding the Synopsys
> DesignWare I2C adapter driver.
> 
> Changes since v1:
> 
> [...]

Here is the summary with links:
  - [v2,5/7] RISC-V: configs: enable I2C_DESIGNWARE_CORE with I2C_DESIGNWARE_PLATFORM
    https://git.kernel.org/riscv/c/0175b1d3c6df

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html

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

[Andi Shyti]

Hi,

On Tue, Oct 01, 2024 at 11:35:13AM GMT, patchwork-bot+linux-riscv@kernel.org wrote:
> Hello:
> 
> This patch was applied to riscv/linux.git (fixes)
> by Andi Shyti <andi.shyti@kernel.org>:
> 
> On Tue,  3 Sep 2024 17:24:59 +0300 you wrote:
> > Hi guys,
> > 
> > This is a proposal for Kconfig improvement regarding the Synopsys
> > DesignWare I2C adapter driver.
> > 
> > Changes since v1:
> > 
> > [...]
> 
> Here is the summary with links:
>   - [v2,5/7] RISC-V: configs: enable I2C_DESIGNWARE_CORE with I2C_DESIGNWARE_PLATFORM
>     https://git.kernel.org/riscv/c/0175b1d3c6df

This patch has already been taken and merged to mainline through
i2c.

Andi

> You are awesome, thank you!
> -- 
> Deet-doot-dot, I am a bot.
> https://korg.docs.kernel.org/patchwork/pwbot.html
> 
>