Merge tag 'i2c-for-5.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...
[linux-2.6-microblaze.git] / drivers / i2c / busses / i2c-npcm7xx.c
index aede9d5..0c365b5 100644 (file)
@@ -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,6 @@ enum i2c_addr {
 
 /* init register and default value required to enable module */
 #define NPCM_I2CSEGCTL                 0xE4
-#define NPCM_I2CSEGCTL_INIT_VAL                0x0333F000
 
 /* Common regs */
 #define NPCM_I2CSDA                    0x00
@@ -123,11 +123,11 @@ enum i2c_addr {
  * Since the addr regs are sprinkled all over the address space,
  * use this array to get the address or each register.
  */
-#define I2C_NUM_OWN_ADDR 10
+#define I2C_NUM_OWN_ADDR 2
+#define I2C_NUM_OWN_ADDR_SUPPORTED 2
+
 static const int npcm_i2caddr[I2C_NUM_OWN_ADDR] = {
-       NPCM_I2CADDR1, NPCM_I2CADDR2, NPCM_I2CADDR3, NPCM_I2CADDR4,
-       NPCM_I2CADDR5, NPCM_I2CADDR6, NPCM_I2CADDR7, NPCM_I2CADDR8,
-       NPCM_I2CADDR9, NPCM_I2CADDR10,
+       NPCM_I2CADDR1, NPCM_I2CADDR2,
 };
 #endif
 
@@ -226,8 +226,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 */
@@ -236,22 +235,18 @@ 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_THST                BIT(6)
 
 /* NPCM_I2CRXF_STS reg fields */
-#define NPCM_I2CRXF_STS_RX_BYTES       GENMASK(4, 0)
 #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 */
-#define NPCM_I2CRXF_CTL_RX_THR         GENMASK(4, 0)
-#define NPCM_I2CRXF_CTL_LAST_PEC       BIT(5)
 #define NPCM_I2CRXF_CTL_THR_RXIE       BIT(6)
 
-#define I2C_HW_FIFO_SIZE               16
+#define MAX_I2C_HW_FIFO_SIZE           32
 
 /* I2C_VER reg fields */
 #define I2C_VER_VERSION                        GENMASK(6, 0)
@@ -268,11 +263,36 @@ static const int npcm_i2caddr[I2C_NUM_OWN_ADDR] = {
 #define I2C_FREQ_MIN_HZ                        10000
 #define I2C_FREQ_MAX_HZ                        I2C_MAX_FAST_MODE_PLUS_FREQ
 
+struct npcm_i2c_data {
+       u8 fifo_size;
+       u32 segctl_init_val;
+       u8 txf_sts_tx_bytes;
+       u8 rxf_sts_rx_bytes;
+       u8 rxf_ctl_last_pec;
+};
+
+static const struct npcm_i2c_data npxm7xx_i2c_data = {
+       .fifo_size = 16,
+       .segctl_init_val = 0x0333F000,
+       .txf_sts_tx_bytes = GENMASK(4, 0),
+       .rxf_sts_rx_bytes = GENMASK(4, 0),
+       .rxf_ctl_last_pec = BIT(5),
+};
+
+static const struct npcm_i2c_data npxm8xx_i2c_data = {
+       .fifo_size = 32,
+       .segctl_init_val = 0x9333F000,
+       .txf_sts_tx_bytes = GENMASK(5, 0),
+       .rxf_sts_rx_bytes = GENMASK(5, 0),
+       .rxf_ctl_last_pec = BIT(7),
+};
+
 /* Status of one I2C module */
 struct npcm_i2c {
        struct i2c_adapter adap;
        struct device *dev;
        unsigned char __iomem *reg;
+       const struct npcm_i2c_data *data;
        spinlock_t lock;   /* IRQ synchronization */
        struct completion cmd_complete;
        int cmd_err;
@@ -305,8 +325,8 @@ struct npcm_i2c {
        int slv_rd_ind;
        int slv_wr_size;
        int slv_wr_ind;
-       u8 slv_rd_buf[I2C_HW_FIFO_SIZE];
-       u8 slv_wr_buf[I2C_HW_FIFO_SIZE];
+       u8 slv_rd_buf[MAX_I2C_HW_FIFO_SIZE];
+       u8 slv_wr_buf[MAX_I2C_HW_FIFO_SIZE];
 #endif
        struct dentry *debugfs; /* debugfs device directory */
        u64 ber_cnt;
@@ -392,14 +412,10 @@ static void npcm_i2c_disable(struct npcm_i2c *bus)
 #if IS_ENABLED(CONFIG_I2C_SLAVE)
        int i;
 
-       /* select bank 0 for I2C addresses */
-       npcm_i2c_select_bank(bus, I2C_BANK_0);
-
        /* Slave addresses removal */
-       for (i = I2C_SLAVE_ADDR1; i < I2C_NUM_OWN_ADDR; i++)
+       for (i = I2C_SLAVE_ADDR1; i < I2C_NUM_OWN_ADDR_SUPPORTED; i++)
                iowrite8(0, bus->reg + npcm_i2caddr[i]);
 
-       npcm_i2c_select_bank(bus, I2C_BANK_1);
 #endif
        /* Disable module */
        i2cctl2 = ioread8(bus->reg + NPCM_I2CCTL2);
@@ -443,7 +459,7 @@ static inline bool npcm_i2c_tx_fifo_empty(struct npcm_i2c *bus)
 
        tx_fifo_sts = ioread8(bus->reg + NPCM_I2CTXF_STS);
        /* check if TX FIFO is not empty */
-       if ((tx_fifo_sts & NPCM_I2CTXF_STS_TX_BYTES) == 0)
+       if ((tx_fifo_sts & bus->data->txf_sts_tx_bytes) == 0)
                return false;
 
        /* check if TX FIFO status bit is set: */
@@ -456,7 +472,7 @@ static inline bool npcm_i2c_rx_fifo_full(struct npcm_i2c *bus)
 
        rx_fifo_sts = ioread8(bus->reg + NPCM_I2CRXF_STS);
        /* check if RX FIFO is not empty: */
-       if ((rx_fifo_sts & NPCM_I2CRXF_STS_RX_BYTES) == 0)
+       if ((rx_fifo_sts & bus->data->rxf_sts_rx_bytes) == 0)
                return false;
 
        /* check if rx fifo full status is set: */
@@ -604,8 +620,7 @@ static int npcm_i2c_slave_enable(struct npcm_i2c *bus, enum i2c_addr addr_type,
                        i2cctl1 &= ~NPCM_I2CCTL1_GCMEN;
                iowrite8(i2cctl1, bus->reg + NPCM_I2CCTL1);
                return 0;
-       }
-       if (addr_type == I2C_ARP_ADDR) {
+       } else if (addr_type == I2C_ARP_ADDR) {
                i2cctl3 = ioread8(bus->reg + NPCM_I2CCTL3);
                if (enable)
                        i2cctl3 |= I2CCTL3_ARPMEN;
@@ -614,16 +629,16 @@ static int npcm_i2c_slave_enable(struct npcm_i2c *bus, enum i2c_addr addr_type,
                iowrite8(i2cctl3, bus->reg + NPCM_I2CCTL3);
                return 0;
        }
+       if (addr_type > I2C_SLAVE_ADDR2 && addr_type <= I2C_SLAVE_ADDR10)
+               dev_err(bus->dev, "try to enable more than 2 SA not supported\n");
+
        if (addr_type >= I2C_ARP_ADDR)
                return -EFAULT;
-       /* select bank 0 for address 3 to 10 */
-       if (addr_type > I2C_SLAVE_ADDR2)
-               npcm_i2c_select_bank(bus, I2C_BANK_0);
+
        /* Set and enable the address */
        iowrite8(sa_reg, bus->reg + npcm_i2caddr[addr_type]);
        npcm_i2c_slave_int_enable(bus, enable);
-       if (addr_type > I2C_SLAVE_ADDR2)
-               npcm_i2c_select_bank(bus, I2C_BANK_1);
+
        return 0;
 }
 #endif
@@ -665,7 +680,7 @@ static void npcm_i2c_reset(struct npcm_i2c *bus)
        }
 #endif
 
-       /* clear status bits for spurious interrupts */
+       /* Clear status bits for spurious interrupts */
        npcm_i2c_clear_master_status(bus);
 
        bus->state = I2C_IDLE;
@@ -744,11 +759,11 @@ static void npcm_i2c_callback(struct npcm_i2c *bus,
 static u8 npcm_i2c_fifo_usage(struct npcm_i2c *bus)
 {
        if (bus->operation == I2C_WRITE_OPER)
-               return FIELD_GET(NPCM_I2CTXF_STS_TX_BYTES,
-                                ioread8(bus->reg + NPCM_I2CTXF_STS));
+               return (bus->data->txf_sts_tx_bytes &
+                       ioread8(bus->reg + NPCM_I2CTXF_STS));
        if (bus->operation == I2C_READ_OPER)
-               return FIELD_GET(NPCM_I2CRXF_STS_RX_BYTES,
-                                ioread8(bus->reg + NPCM_I2CRXF_STS));
+               return (bus->data->rxf_sts_rx_bytes &
+                       ioread8(bus->reg + NPCM_I2CRXF_STS));
        return 0;
 }
 
@@ -760,13 +775,13 @@ static void npcm_i2c_write_to_fifo_master(struct npcm_i2c *bus, u16 max_bytes)
         * Fill the FIFO, while the FIFO is not full and there are more bytes
         * to write
         */
-       size_free_fifo = I2C_HW_FIFO_SIZE - npcm_i2c_fifo_usage(bus);
+       size_free_fifo = bus->data->fifo_size - npcm_i2c_fifo_usage(bus);
        while (max_bytes-- && size_free_fifo) {
                if (bus->wr_ind < bus->wr_size)
                        npcm_i2c_wr_byte(bus, bus->wr_buf[bus->wr_ind++]);
                else
                        npcm_i2c_wr_byte(bus, 0xFF);
-               size_free_fifo = I2C_HW_FIFO_SIZE - npcm_i2c_fifo_usage(bus);
+               size_free_fifo = bus->data->fifo_size - npcm_i2c_fifo_usage(bus);
        }
 }
 
@@ -787,11 +802,11 @@ static void npcm_i2c_set_fifo(struct npcm_i2c *bus, int nread, int nwrite)
 
        /* configure RX FIFO */
        if (nread > 0) {
-               rxf_ctl = min_t(int, nread, I2C_HW_FIFO_SIZE);
+               rxf_ctl = min_t(int, nread, bus->data->fifo_size);
 
                /* set LAST bit. if LAST is set next FIFO packet is nacked */
-               if (nread <= I2C_HW_FIFO_SIZE)
-                       rxf_ctl |= NPCM_I2CRXF_CTL_LAST_PEC;
+               if (nread <= bus->data->fifo_size)
+                       rxf_ctl |= bus->data->rxf_ctl_last_pec;
 
                /*
                 * if we are about to read the first byte in blk rd mode,
@@ -809,9 +824,9 @@ static void npcm_i2c_set_fifo(struct npcm_i2c *bus, int nread, int nwrite)
 
        /* configure TX FIFO */
        if (nwrite > 0) {
-               if (nwrite > I2C_HW_FIFO_SIZE)
+               if (nwrite > bus->data->fifo_size)
                        /* data to send is more then FIFO size. */
-                       iowrite8(I2C_HW_FIFO_SIZE, bus->reg + NPCM_I2CTXF_CTL);
+                       iowrite8(bus->data->fifo_size, bus->reg + NPCM_I2CTXF_CTL);
                else
                        iowrite8(nwrite, bus->reg + NPCM_I2CTXF_CTL);
 
@@ -846,15 +861,11 @@ static u8 npcm_i2c_get_slave_addr(struct npcm_i2c *bus, enum i2c_addr addr_type)
 {
        u8 slave_add;
 
-       /* select bank 0 for address 3 to 10 */
-       if (addr_type > I2C_SLAVE_ADDR2)
-               npcm_i2c_select_bank(bus, I2C_BANK_0);
+       if (addr_type > I2C_SLAVE_ADDR2 && addr_type <= I2C_SLAVE_ADDR10)
+               dev_err(bus->dev, "get slave: try to use more than 2 SA not supported\n");
 
        slave_add = ioread8(bus->reg + npcm_i2caddr[(int)addr_type]);
 
-       if (addr_type > I2C_SLAVE_ADDR2)
-               npcm_i2c_select_bank(bus, I2C_BANK_1);
-
        return slave_add;
 }
 
@@ -864,12 +875,12 @@ static int npcm_i2c_remove_slave_addr(struct npcm_i2c *bus, u8 slave_add)
 
        /* Set the enable bit */
        slave_add |= 0x80;
-       npcm_i2c_select_bank(bus, I2C_BANK_0);
-       for (i = I2C_SLAVE_ADDR1; i < I2C_NUM_OWN_ADDR; i++) {
+
+       for (i = I2C_SLAVE_ADDR1; i < I2C_NUM_OWN_ADDR_SUPPORTED; i++) {
                if (ioread8(bus->reg + npcm_i2caddr[i]) == slave_add)
                        iowrite8(0, bus->reg + npcm_i2caddr[i]);
        }
-       npcm_i2c_select_bank(bus, I2C_BANK_1);
+
        return 0;
 }
 
@@ -882,13 +893,13 @@ static void npcm_i2c_write_fifo_slave(struct npcm_i2c *bus, u16 max_bytes)
        npcm_i2c_clear_fifo_int(bus);
        npcm_i2c_clear_tx_fifo(bus);
        iowrite8(0, bus->reg + NPCM_I2CTXF_CTL);
-       while (max_bytes-- && I2C_HW_FIFO_SIZE != npcm_i2c_fifo_usage(bus)) {
+       while (max_bytes-- && bus->data->fifo_size != npcm_i2c_fifo_usage(bus)) {
                if (bus->slv_wr_size <= 0)
                        break;
-               bus->slv_wr_ind = bus->slv_wr_ind % I2C_HW_FIFO_SIZE;
+               bus->slv_wr_ind = bus->slv_wr_ind & (bus->data->fifo_size - 1);
                npcm_i2c_wr_byte(bus, bus->slv_wr_buf[bus->slv_wr_ind]);
                bus->slv_wr_ind++;
-               bus->slv_wr_ind = bus->slv_wr_ind % I2C_HW_FIFO_SIZE;
+               bus->slv_wr_ind = bus->slv_wr_ind & (bus->data->fifo_size - 1);
                bus->slv_wr_size--;
        }
 }
@@ -903,7 +914,7 @@ static void npcm_i2c_read_fifo_slave(struct npcm_i2c *bus, u8 bytes_in_fifo)
        while (bytes_in_fifo--) {
                data = npcm_i2c_rd_byte(bus);
 
-               bus->slv_rd_ind = bus->slv_rd_ind % I2C_HW_FIFO_SIZE;
+               bus->slv_rd_ind = bus->slv_rd_ind & (bus->data->fifo_size - 1);
                bus->slv_rd_buf[bus->slv_rd_ind] = data;
                bus->slv_rd_ind++;
 
@@ -921,16 +932,20 @@ static int npcm_i2c_slave_get_wr_buf(struct npcm_i2c *bus)
        int ret = bus->slv_wr_ind;
 
        /* fill a cyclic buffer */
-       for (i = 0; i < I2C_HW_FIFO_SIZE; i++) {
-               if (bus->slv_wr_size >= I2C_HW_FIFO_SIZE)
+       for (i = 0; i < bus->data->fifo_size; i++) {
+               if (bus->slv_wr_size >= bus->data->fifo_size)
                        break;
-               i2c_slave_event(bus->slave, I2C_SLAVE_READ_REQUESTED, &value);
-               ind = (bus->slv_wr_ind + bus->slv_wr_size) % I2C_HW_FIFO_SIZE;
+               if (bus->state == I2C_SLAVE_MATCH) {
+                       i2c_slave_event(bus->slave, I2C_SLAVE_READ_REQUESTED, &value);
+                       bus->state = I2C_OPER_STARTED;
+               } else {
+                       i2c_slave_event(bus->slave, I2C_SLAVE_READ_PROCESSED, &value);
+               }
+               ind = (bus->slv_wr_ind + bus->slv_wr_size) & (bus->data->fifo_size - 1);
                bus->slv_wr_buf[ind] = value;
                bus->slv_wr_size++;
-               i2c_slave_event(bus->slave, I2C_SLAVE_READ_PROCESSED, &value);
        }
-       return I2C_HW_FIFO_SIZE - ret;
+       return bus->data->fifo_size - ret;
 }
 
 static void npcm_i2c_slave_send_rd_buf(struct npcm_i2c *bus)
@@ -965,7 +980,7 @@ static void npcm_i2c_slave_receive(struct npcm_i2c *bus, u16 nread,
        bus->slv_rd_ind = 0;
 
        iowrite8(0, bus->reg + NPCM_I2CTXF_CTL);
-       iowrite8(I2C_HW_FIFO_SIZE, bus->reg + NPCM_I2CRXF_CTL);
+       iowrite8(bus->data->fifo_size, bus->reg + NPCM_I2CRXF_CTL);
        npcm_i2c_clear_tx_fifo(bus);
        npcm_i2c_clear_rx_fifo(bus);
 }
@@ -976,7 +991,6 @@ static void npcm_i2c_slave_xmit(struct npcm_i2c *bus, u16 nwrite,
        if (nwrite == 0)
                return;
 
-       bus->state = I2C_OPER_STARTED;
        bus->operation = I2C_WRITE_OPER;
 
        /* get the next buffer */
@@ -999,12 +1013,12 @@ static void npcm_i2c_slave_wr_buf_sync(struct npcm_i2c *bus)
 {
        int left_in_fifo;
 
-       left_in_fifo = FIELD_GET(NPCM_I2CTXF_STS_TX_BYTES,
-                                ioread8(bus->reg + NPCM_I2CTXF_STS));
+       left_in_fifo = bus->data->txf_sts_tx_bytes &
+                       ioread8(bus->reg + NPCM_I2CTXF_STS);
 
        /* fifo already full: */
-       if (left_in_fifo >= I2C_HW_FIFO_SIZE ||
-           bus->slv_wr_size >= I2C_HW_FIFO_SIZE)
+       if (left_in_fifo >= bus->data->fifo_size ||
+           bus->slv_wr_size >= bus->data->fifo_size)
                return;
 
        /* update the wr fifo index back to the untransmitted bytes: */
@@ -1012,7 +1026,7 @@ static void npcm_i2c_slave_wr_buf_sync(struct npcm_i2c *bus)
        bus->slv_wr_size = bus->slv_wr_size + left_in_fifo;
 
        if (bus->slv_wr_ind < 0)
-               bus->slv_wr_ind += I2C_HW_FIFO_SIZE;
+               bus->slv_wr_ind += bus->data->fifo_size;
 }
 
 static void npcm_i2c_slave_rd_wr(struct npcm_i2c *bus)
@@ -1158,7 +1172,7 @@ static irqreturn_t npcm_i2c_int_slave_handler(struct npcm_i2c *bus)
                npcm_i2c_clear_rx_fifo(bus);
                npcm_i2c_clear_tx_fifo(bus);
                iowrite8(0, bus->reg + NPCM_I2CTXF_CTL);
-               iowrite8(I2C_HW_FIFO_SIZE, bus->reg + NPCM_I2CRXF_CTL);
+               iowrite8(bus->data->fifo_size, bus->reg + NPCM_I2CRXF_CTL);
                if (NPCM_I2CST_XMIT & i2cst) {
                        bus->operation = I2C_WRITE_OPER;
                } else {
@@ -1238,7 +1252,7 @@ static irqreturn_t npcm_i2c_int_slave_handler(struct npcm_i2c *bus)
        } /* SDAST */
 
        /*
-        * if irq is not one of the above, make sure EOB is disabled and all
+        * If irq is not one of the above, make sure EOB is disabled and all
         * status bits are cleared.
         */
        if (ret == IRQ_NONE) {
@@ -1319,8 +1333,8 @@ static void npcm_i2c_master_fifo_read(struct npcm_i2c *bus)
         * read == FIFO Size + C (where C < FIFO Size)then first read C bytes
         * and in the next int we read rest of the data.
         */
-       if (rcount < (2 * I2C_HW_FIFO_SIZE) && rcount > I2C_HW_FIFO_SIZE)
-               fifo_bytes = rcount - I2C_HW_FIFO_SIZE;
+       if (rcount < (2 * bus->data->fifo_size) && rcount > bus->data->fifo_size)
+               fifo_bytes = rcount - bus->data->fifo_size;
 
        if (rcount <= fifo_bytes) {
                /* last bytes are about to be read - end of tx */
@@ -1492,7 +1506,7 @@ static void npcm_i2c_irq_handle_nack(struct npcm_i2c *bus)
                npcm_i2c_clear_master_status(bus);
                readx_poll_timeout_atomic(ioread8, bus->reg + NPCM_I2CCST, val,
                                          !(val & NPCM_I2CCST_BUSY), 10, 200);
-               /* verify no status bits are still set after bus is released */
+               /* Verify no status bits are still set after bus is released */
                npcm_i2c_clear_master_status(bus);
        }
        bus->state = I2C_IDLE;
@@ -1960,7 +1974,7 @@ static int npcm_i2c_init_module(struct npcm_i2c *bus, enum i2c_mode mode,
 
        npcm_i2c_reset(bus);
 
-       /* check HW is OK: SDA and SCL should be high at this point. */
+       /* Check HW is OK: SDA and SCL should be high at this point. */
        if ((npcm_i2c_get_SDA(&bus->adap) == 0) || (npcm_i2c_get_SCL(&bus->adap) == 0)) {
                dev_err(bus->dev, "I2C%d init fail: lines are low\n", bus->num);
                dev_err(bus->dev, "SDA=%d SCL=%d\n", npcm_i2c_get_SDA(&bus->adap),
@@ -2020,7 +2034,7 @@ static irqreturn_t npcm_i2c_bus_irq(int irq, void *dev_id)
                        return IRQ_HANDLED;
        }
 #endif
-       /* clear status bits for spurious interrupts */
+       /* Clear status bits for spurious interrupts */
        npcm_i2c_clear_master_status(bus);
 
        return IRQ_HANDLED;
@@ -2199,10 +2213,10 @@ static int npcm_i2c_master_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs,
         * It cannot be cleared without resetting the module.
         */
        else if (bus->cmd_err &&
-                (NPCM_I2CRXF_CTL_LAST_PEC & ioread8(bus->reg + NPCM_I2CRXF_CTL)))
+                (bus->data->rxf_ctl_last_pec & ioread8(bus->reg + NPCM_I2CRXF_CTL)))
                npcm_i2c_reset(bus);
 
-       /* after any xfer, successful or not, stall and EOB must be disabled */
+       /* After any xfer, successful or not, stall and EOB must be disabled */
        npcm_i2c_stall_after_start(bus, false);
        npcm_i2c_eob_int(bus, false);
 
@@ -2268,6 +2282,7 @@ static int npcm_i2c_probe_bus(struct platform_device *pdev)
 {
        struct device_node *np = pdev->dev.of_node;
        static struct regmap *gcr_regmap;
+       struct device *dev = &pdev->dev;
        struct i2c_adapter *adap;
        struct npcm_i2c *bus;
        struct clk *i2c_clk;
@@ -2280,6 +2295,12 @@ static int npcm_i2c_probe_bus(struct platform_device *pdev)
 
        bus->dev = &pdev->dev;
 
+       bus->data = of_device_get_match_data(dev);
+       if (!bus->data) {
+               dev_err(dev, "OF data missing\n");
+               return -EINVAL;
+       }
+
        bus->num = of_alias_get_id(pdev->dev.of_node, "i2c");
        /* core clk must be acquired to calculate module timing settings */
        i2c_clk = devm_clk_get(&pdev->dev, NULL);
@@ -2293,7 +2314,7 @@ static int npcm_i2c_probe_bus(struct platform_device *pdev)
 
        if (IS_ERR(gcr_regmap))
                return PTR_ERR(gcr_regmap);
-       regmap_write(gcr_regmap, NPCM_I2CSEGCTL, NPCM_I2CSEGCTL_INIT_VAL);
+       regmap_write(gcr_regmap, NPCM_I2CSEGCTL, bus->data->segctl_init_val);
 
        bus->reg = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(bus->reg))
@@ -2355,7 +2376,8 @@ 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,npcm750-i2c", .data = &npxm7xx_i2c_data },
+       { .compatible = "nuvoton,npcm845-i2c", .data = &npxm8xx_i2c_data },
        {}
 };
 MODULE_DEVICE_TABLE(of, npcm_i2c_bus_of_table);