Hi Axel, On Wed, 13 Jun 2012 20:51:37 +0800, Axel Lin wrote: > This patch adds config I2C_DESIGNWARE_CORE in Kconfig, and let > I2C_DESIGNWARE_PLATFORM and I2C_DESIGNWARE_PCI select I2C_DESIGNWARE_CORE. > > Because both I2C_DESIGNWARE_PLATFORM and I2C_DESIGNWARE_PCI can be built as > built-in or module, we also need to export the functions in > i2c-designware-core. > > This fixes below build error when CONFIG_I2C_DESIGNWARE_PLATFORM=y && > CONFIG_I2C_DESIGNWARE_PCI=y: > > LD drivers/i2c/busses/built-in.o > drivers/i2c/busses/i2c-designware-pci.o: In function `i2c_dw_clear_int': > i2c-designware-core.c:(.text+0xa10): multiple definition of `i2c_dw_clear_int' > drivers/i2c/busses/i2c-designware-platform.o:i2c-designware-platdrv.c:(.text+0x928): > first defined here > drivers/i2c/busses/i2c-designware-pci.o: In function `i2c_dw_init': > i2c-designware-core.c:(.text+0x178): multiple definition of `i2c_dw_init' > drivers/i2c/busses/i2c-designware-platform.o:i2c-designware-platdrv.c:(.text+0x90): > first defined here > drivers/i2c/busses/i2c-designware-pci.o: In function `dw_readl': > i2c-designware-core.c:(.text+0xe8): multiple definition of `dw_readl' > drivers/i2c/busses/i2c-designware-platform.o:i2c-designware-platdrv.c:(.text+0x0): > first defined here > drivers/i2c/busses/i2c-designware-pci.o: In function `i2c_dw_isr': > i2c-designware-core.c:(.text+0x724): multiple definition of `i2c_dw_isr' > drivers/i2c/busses/i2c-designware-platform.o:i2c-designware-platdrv.c:(.text+0x63c): > first defined here > drivers/i2c/busses/i2c-designware-pci.o: In function `i2c_dw_xfer': > i2c-designware-core.c:(.text+0x4b0): multiple definition of `i2c_dw_xfer' > drivers/i2c/busses/i2c-designware-platform.o:i2c-designware-platdrv.c:(.text+0x3c8): > first defined here > drivers/i2c/busses/i2c-designware-pci.o: In function `i2c_dw_is_enabled': > i2c-designware-core.c:(.text+0x9d4): multiple definition of > `i2c_dw_is_enabled' > drivers/i2c/busses/i2c-designware-platform.o:i2c-designware-platdrv.c:(.text+0x8ec): > first defined here > drivers/i2c/busses/i2c-designware-pci.o: In function `dw_writel': > i2c-designware-core.c:(.text+0x124): multiple definition of `dw_writel' > drivers/i2c/busses/i2c-designware-platform.o:i2c-designware-platdrv.c:(.text+0x3c): > first defined here > drivers/i2c/busses/i2c-designware-pci.o: In function `i2c_dw_xfer_msg': > i2c-designware-core.c:(.text+0x2e8): multiple definition of `i2c_dw_xfer_msg' > drivers/i2c/busses/i2c-designware-platform.o:i2c-designware-platdrv.c:(.text+0x200): > first defined here > drivers/i2c/busses/i2c-designware-pci.o: In function `i2c_dw_enable': > i2c-designware-core.c:(.text+0x9c8): multiple definition of `i2c_dw_enable' > drivers/i2c/busses/i2c-designware-platform.o:i2c-designware-platdrv.c:(.text+0x8e0): > first defined here > drivers/i2c/busses/i2c-designware-pci.o: In function `i2c_dw_read_comp_param': > i2c-designware-core.c:(.text+0xa24): multiple definition of > `i2c_dw_read_comp_param' > drivers/i2c/busses/i2c-designware-platform.o:i2c-designware-platdrv.c:(.text+0x93c): > first defined here > drivers/i2c/busses/i2c-designware-pci.o: In function `i2c_dw_disable': > i2c-designware-core.c:(.text+0x9dc): multiple definition of `i2c_dw_disable' > drivers/i2c/busses/i2c-designware-platform.o:i2c-designware-platdrv.c:(.text+0x8f4): > first defined here > drivers/i2c/busses/i2c-designware-pci.o: In function `i2c_dw_func': > i2c-designware-core.c:(.text+0x710): multiple definition of `i2c_dw_func' > drivers/i2c/busses/i2c-designware-platform.o:i2c-designware-platdrv.c:(.text+0x628): > first defined here > drivers/i2c/busses/i2c-designware-pci.o: In function `i2c_dw_disable_int': > i2c-designware-core.c:(.text+0xa18): multiple definition of > `i2c_dw_disable_int' > drivers/i2c/busses/i2c-designware-platform.o:i2c-designware-platdrv.c:(.text+0x930): > first defined here > make[3]: *** [drivers/i2c/busses/built-in.o] Error 1 > make[2]: *** [drivers/i2c/busses] Error 2 > make[1]: *** [drivers/i2c] Error 2 > make: *** [drivers] Error 2 > > Signed-off-by: Axel Lin <axel....@gmail.com> > --- > I don't have this hardware, just try to fix the build error I found.
Good catch. I can't test it either but your patch looks sane. Wolfram, I think these drivers are mostly used on embedded platforms so it would make more sense that you (or Ben) pick it. Please let me know if you want _me_ to take it for whatever reason. I also think this patch should go to stable kernel trees 3.2 and later, as it fixes a build bug. -- Jean Delvare -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
