i2c: designware: Remove useless driver specific option for I2C target

The generic option for I2C target is already user selectable,
which makes the DesignWare specific option completely
unnecessary. The DesignWare option also silently selected
I2C_SLAVE instead of depending on it without any real need
for it.

Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
Link: https://lore.kernel.org/r/20251218151509.361617-2-heikki.krogerus@linux.intel.com

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index cea87fcb4a1a945f805e9eff25d2f7ab9f61ddf9..f2df105d69ac290542e6d71d3f40cd5580c7b262 100644 (file)
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -568,20 +568,14 @@ config I2C_DESIGNWARE_CORE
        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.
+         Designware I2C adapter, and the I2C slave when enabled (select
+         I2C_SLAVE).
 
          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"
-       select I2C_SLAVE
-       help
-         If you say yes to this option, support will be included for the
-         Synopsys DesignWare I2C slave adapter.
-
 config I2C_DESIGNWARE_PLATFORM
        tristate "Synopsys DesignWare Platform driver"
        depends on (ACPI && COMMON_CLK) || !ACPI

diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile
index fb985769f5ff78a8de8aaa93668c7c4a7af590ac..547123ab351f1083329e70e045669dd78495a231 100644 (file)
--- a/drivers/i2c/busses/Makefile
+++ b/drivers/i2c/busses/Makefile
@@ -53,7 +53,7 @@ obj-$(CONFIG_I2C_DAVINCI)     += i2c-davinci.o
 obj-$(CONFIG_I2C_DESIGNWARE_CORE)                      += i2c-designware-core.o
 i2c-designware-core-y                                  := i2c-designware-common.o
 i2c-designware-core-y                                  += i2c-designware-master.o
-i2c-designware-core-$(CONFIG_I2C_DESIGNWARE_SLAVE)     += i2c-designware-slave.o
+i2c-designware-core-$(CONFIG_I2C_SLAVE)                += i2c-designware-slave.o
 obj-$(CONFIG_I2C_DESIGNWARE_PLATFORM)                  += i2c-designware-platform.o
 i2c-designware-platform-y                              := i2c-designware-platdrv.o
 i2c-designware-platform-$(CONFIG_I2C_DESIGNWARE_AMDPSP)        += i2c-designware-amdpsp.o

diff --git a/drivers/i2c/busses/i2c-designware-core.h b/drivers/i2c/busses/i2c-designware-core.h
index bb5ce0a382f92850e7f2f4c788a022459bc20c71..2a7decc249318d623ca32150e9554102a41c2b43 100644 (file)
--- a/drivers/i2c/busses/i2c-designware-core.h
+++ b/drivers/i2c/busses/i2c-designware-core.h
@@ -386,7 +386,7 @@ void i2c_dw_disable(struct dw_i2c_dev *dev);
 extern void i2c_dw_configure_master(struct dw_i2c_dev *dev);
 extern int i2c_dw_probe_master(struct dw_i2c_dev *dev);
 
-#if IS_ENABLED(CONFIG_I2C_DESIGNWARE_SLAVE)
+#if IS_ENABLED(CONFIG_I2C_SLAVE)
 extern void i2c_dw_configure_slave(struct dw_i2c_dev *dev);
 extern int i2c_dw_probe_slave(struct dw_i2c_dev *dev);
 #else