Skip to content

Commit 51616b0

Browse files
andy-shevAndi Shyti
authored andcommitted
i2c: busses: Use *-y instead of *-objs in Makefile
*-objs suffix is reserved rather for (user-space) host programs while usually *-y suffix is used for kernel drivers (although *-objs works for that purpose for now). Let's correct the old usages of *-objs in Makefiles. While at it, fix an obvious typo in help section of the Kconfig. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
1 parent 311499e commit 51616b0

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

drivers/i2c/busses/Kconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ config I2C_AT91
431431
are facing this situation, use the i2c-gpio driver.
432432

433433
config I2C_AT91_SLAVE_EXPERIMENTAL
434-
tristate "Microchip AT91 I2C experimental slave mode"
434+
bool "Microchip AT91 I2C experimental slave mode"
435435
depends on I2C_AT91
436436
select I2C_SLAVE
437437
help
@@ -440,7 +440,7 @@ config I2C_AT91_SLAVE_EXPERIMENTAL
440440
been tested in a heavy way, help wanted.
441441
There are known bugs:
442442
- It can hang, on a SAMA5D4, after several transfers.
443-
- There are some mismtaches with a SAMA5D4 as slave and a SAMA5D2 as
443+
- There are some mismatches with a SAMA5D4 as slave and a SAMA5D2 as
444444
master.
445445

446446
config I2C_AU1550

drivers/i2c/busses/Makefile

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,8 @@ obj-$(CONFIG_I2C_AMD_MP2) += i2c-amd-mp2-pci.o i2c-amd-mp2-plat.o
3939
obj-$(CONFIG_I2C_AMD_ASF) += i2c-amd-asf-plat.o
4040
obj-$(CONFIG_I2C_ASPEED) += i2c-aspeed.o
4141
obj-$(CONFIG_I2C_AT91) += i2c-at91.o
42-
i2c-at91-objs := i2c-at91-core.o i2c-at91-master.o
43-
ifeq ($(CONFIG_I2C_AT91_SLAVE_EXPERIMENTAL),y)
44-
i2c-at91-objs += i2c-at91-slave.o
45-
endif
42+
i2c-at91-y := i2c-at91-core.o i2c-at91-master.o
43+
i2c-at91-$(CONFIG_I2C_AT91_SLAVE_EXPERIMENTAL) += i2c-at91-slave.o
4644
obj-$(CONFIG_I2C_AU1550) += i2c-au1550.o
4745
obj-$(CONFIG_I2C_AXXIA) += i2c-axxia.o
4846
obj-$(CONFIG_I2C_BCM2835) += i2c-bcm2835.o
@@ -110,8 +108,8 @@ obj-$(CONFIG_I2C_SIMTEC) += i2c-simtec.o
110108
obj-$(CONFIG_I2C_SPRD) += i2c-sprd.o
111109
obj-$(CONFIG_I2C_ST) += i2c-st.o
112110
obj-$(CONFIG_I2C_STM32F4) += i2c-stm32f4.o
113-
i2c-stm32f7-drv-objs := i2c-stm32f7.o i2c-stm32.o
114111
obj-$(CONFIG_I2C_STM32F7) += i2c-stm32f7-drv.o
112+
i2c-stm32f7-drv-y := i2c-stm32f7.o i2c-stm32.o
115113
obj-$(CONFIG_I2C_SUN6I_P2WI) += i2c-sun6i-p2wi.o
116114
obj-$(CONFIG_I2C_SYNQUACER) += i2c-synquacer.o
117115
obj-$(CONFIG_I2C_TEGRA) += i2c-tegra.o
@@ -120,10 +118,10 @@ obj-$(CONFIG_I2C_UNIPHIER) += i2c-uniphier.o
120118
obj-$(CONFIG_I2C_UNIPHIER_F) += i2c-uniphier-f.o
121119
obj-$(CONFIG_I2C_VERSATILE) += i2c-versatile.o
122120
obj-$(CONFIG_I2C_WMT) += i2c-viai2c-wmt.o i2c-viai2c-common.o
123-
i2c-octeon-objs := i2c-octeon-core.o i2c-octeon-platdrv.o
124121
obj-$(CONFIG_I2C_OCTEON) += i2c-octeon.o
125-
i2c-thunderx-objs := i2c-octeon-core.o i2c-thunderx-pcidrv.o
122+
i2c-octeon-y := i2c-octeon-core.o i2c-octeon-platdrv.o
126123
obj-$(CONFIG_I2C_THUNDERX) += i2c-thunderx.o
124+
i2c-thunderx-y := i2c-octeon-core.o i2c-thunderx-pcidrv.o
127125
obj-$(CONFIG_I2C_XILINX) += i2c-xiic.o
128126
obj-$(CONFIG_I2C_XLP9XX) += i2c-xlp9xx.o
129127
obj-$(CONFIG_I2C_RCAR) += i2c-rcar.o

0 commit comments

Comments
 (0)