From: Tyrone Ting <kfting@xxxxxxxxxxx> NPCM8XX uses a similar i2c module as NPCM7XX. The only difference is that the internal HW FIFO is larger. Related Makefile and Kconfig files are modified to support as well. Fixes: 56a1485b102e ("i2c: npcm7xx: Add Nuvoton NPCM I2C controller driver") Signed-off-by: Tyrone Ting <kfting@xxxxxxxxxxx> Signed-off-by: Tali Perry <tali.perry1@xxxxxxxxx> --- drivers/i2c/busses/Kconfig | 8 ++++---- drivers/i2c/busses/Makefile | 2 +- drivers/i2c/busses/i2c-npcm7xx.c | 29 +++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 5 deletions(-) diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig index 42da31c1ab70..ab9ee2de5e00 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig @@ -817,13 +817,13 @@ config I2C_NOMADIK I2C interface from ST-Ericsson's Nomadik and Ux500 architectures, as well as the STA2X11 PCIe I/O HUB. -config I2C_NPCM7XX +config I2C_NPCM tristate "Nuvoton I2C Controller" - depends on ARCH_NPCM7XX || COMPILE_TEST + depends on ARCH_NPCM || COMPILE_TEST help If you say yes to this option, support will be included for the - Nuvoton I2C controller, which is available on the NPCM7xx BMC - controller. + Nuvoton I2C controller, which is available on the NPCM BMC + controllers. Driver can also support slave mode (select I2C_SLAVE). config I2C_OCORES diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile index 1d00dce77098..01fdf74a5565 100644 --- a/drivers/i2c/busses/Makefile +++ b/drivers/i2c/busses/Makefile @@ -80,7 +80,7 @@ obj-$(CONFIG_I2C_MT7621) += i2c-mt7621.o obj-$(CONFIG_I2C_MV64XXX) += i2c-mv64xxx.o obj-$(CONFIG_I2C_MXS) += i2c-mxs.o obj-$(CONFIG_I2C_NOMADIK) += i2c-nomadik.o -obj-$(CONFIG_I2C_NPCM7XX) += i2c-npcm7xx.o +obj-$(CONFIG_I2C_NPCM) += i2c-npcm7xx.o obj-$(CONFIG_I2C_OCORES) += i2c-ocores.o obj-$(CONFIG_I2C_OMAP) += i2c-omap.o obj-$(CONFIG_I2C_OWL) += i2c-owl.o diff --git a/drivers/i2c/busses/i2c-npcm7xx.c b/drivers/i2c/busses/i2c-npcm7xx.c index 0af97f179af2..4e0148ccc215 100644 --- a/drivers/i2c/busses/i2c-npcm7xx.c +++ b/drivers/i2c/busses/i2c-npcm7xx.c @@ -91,7 +91,11 @@ enum i2c_addr { /* init register and default value required to enable module */ #define NPCM_I2CSEGCTL 0xE4 +#ifdef CONFIG_ARCH_NPCM7XX #define NPCM_I2CSEGCTL_INIT_VAL 0x0333F000 +#else +#define NPCM_I2CSEGCTL_INIT_VAL 0x9333F000 +#endif /* Common regs */ #define NPCM_I2CSDA 0x00 @@ -229,7 +233,11 @@ static const int npcm_i2caddr[I2C_NUM_OWN_ADDR] = { #define NPCM_I2CFIF_CTS_SLVRSTR BIT(7) /* NPCM_I2CTXF_CTL reg fields */ +#ifdef CONFIG_ARCH_NPCM7XX #define NPCM_I2CTXF_CTL_TX_THR GENMASK(4, 0) +#else +#define NPCM_I2CTXF_CTL_TX_THR GENMASK(5, 0) +#endif /*CONFIG_ARCH_NPCM7XX*/ #define NPCM_I2CTXF_CTL_THR_TXIE BIT(6) /* NPCM_I2CT_OUT reg fields */ @@ -238,22 +246,42 @@ static const int npcm_i2caddr[I2C_NUM_OWN_ADDR] = { #define NPCM_I2CT_OUT_T_OUTST BIT(7) /* NPCM_I2CTXF_STS reg fields */ +#ifdef CONFIG_ARCH_NPCM7XX #define NPCM_I2CTXF_STS_TX_BYTES GENMASK(4, 0) +#else +#define NPCM_I2CTXF_STS_TX_BYTES GENMASK(5, 0) +#endif /*CONFIG_ARCH_NPCM7XX*/ #define NPCM_I2CTXF_STS_TX_THST BIT(6) /* NPCM_I2CRXF_STS reg fields */ +#ifdef CONFIG_ARCH_NPCM7XX #define NPCM_I2CRXF_STS_RX_BYTES GENMASK(4, 0) +#else +#define NPCM_I2CRXF_STS_RX_BYTES GENMASK(5, 0) +#endif /*CONFIG_ARCH_NPCM7XX*/ #define NPCM_I2CRXF_STS_RX_THST BIT(6) /* NPCM_I2CFIF_CTL reg fields */ #define NPCM_I2CFIF_CTL_FIFO_EN BIT(4) /* NPCM_I2CRXF_CTL reg fields */ +#ifdef CONFIG_ARCH_NPCM7XX #define NPCM_I2CRXF_CTL_RX_THR GENMASK(4, 0) +#else +#define NPCM_I2CRXF_CTL_RX_THR GENMASK(5, 0) +#endif /*CONFIG_ARCH_NPCM7XX*/ +#ifdef CONFIG_ARCH_NPCM7XX #define NPCM_I2CRXF_CTL_LAST_PEC BIT(5) +#else +#define NPCM_I2CRXF_CTL_LAST_PEC BIT(7) +#endif /*CONFIG_ARCH_NPCM7XX*/ #define NPCM_I2CRXF_CTL_THR_RXIE BIT(6) +#ifdef CONFIG_ARCH_NPCM7XX #define I2C_HW_FIFO_SIZE 16 +#else +#define I2C_HW_FIFO_SIZE 32 +#endif /* CONFIG_ARCH_NPCM7XX */ /* I2C_VER reg fields */ #define I2C_VER_VERSION GENMASK(6, 0) @@ -2356,6 +2384,7 @@ static int npcm_i2c_remove_bus(struct platform_device *pdev) static const struct of_device_id npcm_i2c_bus_of_table[] = { { .compatible = "nuvoton,npcm750-i2c", }, + { .compatible = "nuvoton,npcm845-i2c", }, {} }; MODULE_DEVICE_TABLE(of, npcm_i2c_bus_of_table); -- 2.17.1