On 20/02/2022 04:53, Tyrone Ting wrote:
> From: Tyrone Ting <kfting@xxxxxxxxxxx>
>
> Add NPCM8XX I2C support.
> The NPCM8XX uses a similar i2c module as NPCM7XX.
> The internal HW FIFO is larger in NPCM8XX.
>
> 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 | 87 ++++++++++++++++++++++----------
> 3 files changed, 66 insertions(+), 31 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 2cbf9c679aed..b281e0424e3e 100644
> --- a/drivers/i2c/busses/i2c-npcm7xx.c
> +++ b/drivers/i2c/busses/i2c-npcm7xx.c
> @@ -17,6 +17,7 @@
> #include <linux/mfd/syscon.h>
> #include <linux/module.h>
> #include <linux/of.h>
> +#include <linux/of_device.h>
> #include <linux/platform_device.h>
> #include <linux/regmap.h>
>
> @@ -91,7 +92,7 @@ enum i2c_addr {
>
> /* init register and default value required to enable module */
> #define NPCM_I2CSEGCTL 0xE4
> -#define NPCM_I2CSEGCTL_INIT_VAL 0x0333F000
> +#define NPCM_I2CSEGCTL_INIT_VAL bus->data->segctl_init_val
>
> /* Common regs */
> #define NPCM_I2CSDA 0x00
> @@ -228,8 +229,7 @@ static const int npcm_i2caddr[I2C_NUM_OWN_ADDR] = {
> #define NPCM_I2CFIF_CTS_CLR_FIFO BIT(6)
> #define NPCM_I2CFIF_CTS_SLVRSTR BIT(7)
>
> -/* NPCM_I2CTXF_CTL reg fields */
> -#define NPCM_I2CTXF_CTL_TX_THR GENMASK(4, 0)
> +/* NPCM_I2CTXF_CTL reg field */
> #define NPCM_I2CTXF_CTL_THR_TXIE BIT(6)
>
> /* NPCM_I2CT_OUT reg fields */
> @@ -238,22 +238,22 @@ static const int npcm_i2caddr[I2C_NUM_OWN_ADDR] = {
> #define NPCM_I2CT_OUT_T_OUTST BIT(7)
>
> /* NPCM_I2CTXF_STS reg fields */
> -#define NPCM_I2CTXF_STS_TX_BYTES GENMASK(4, 0)
> +#define NPCM_I2CTXF_STS_TX_BYTES bus->data->txf_sts_tx_bytes
It's not a clean code to use defines for complex types. It's not a
constant anymore, so just use bus->data->txf_sts_tx_bytes directly.
The same in other places.
> #define NPCM_I2CTXF_STS_TX_THST BIT(6)
>
Best regards,
Krzysztof
