power: pmic: Let PFUZE3000 see all 256 registers

[u-boot] / drivers / i2c / ihs_i2c.c

diff --git a/drivers/i2c/ihs_i2c.c b/drivers/i2c/ihs_i2c.c
index b24afa472b111165c00baf3e4cb91dd45f0b9901..0922fe9bb109c8c357b9e1f58e7228e6ec0f51f3 100644 (file)
--- a/drivers/i2c/ihs_i2c.c
+++ b/drivers/i2c/ihs_i2c.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2013
- * Dirk Eibach,  Guntermann & Drunck GmbH, eibach@gdsys.de
- *
- * SPDX-License-Identifier:    GPL-2.0+
+ * Dirk Eibach,  Guntermann & Drunck GmbH, dirk.eibach@gdsys.cc
  */
 
 #include <common.h>
@@ -99,7 +98,8 @@ static int wait_for_int(bool read)
 #endif
 
 #ifdef CONFIG_DM_I2C
-       fpgamap_read16(fpga, priv->addr + REG_INTERRUPT_STATUS, &val);
+       fpgamap_read(fpga, priv->addr + REG_INTERRUPT_STATUS, &val,
+                    FPGAMAP_SIZE_16);
 #else
        I2C_GET_REG(interrupt_status, &val);
 #endif
@@ -110,7 +110,8 @@ static int wait_for_int(bool read)
                if (ctr++ > 5000)
                        return 1;
 #ifdef CONFIG_DM_I2C
-               fpgamap_read16(fpga, priv->addr + REG_INTERRUPT_STATUS, &val);
+               fpgamap_read(fpga, priv->addr + REG_INTERRUPT_STATUS, &val,
+                            FPGAMAP_SIZE_16);
 #else
                I2C_GET_REG(interrupt_status, &val);
 #endif
@@ -128,6 +129,7 @@ static int ihs_i2c_transfer(uchar chip, uchar *buffer, int len, bool read,
 #endif
 {
        u16 val;
+       u16 data;
 #ifdef CONFIG_DM_I2C
        struct ihs_i2c_priv *priv = dev_get_priv(dev);
        struct udevice *fpga;
@@ -136,13 +138,14 @@ static int ihs_i2c_transfer(uchar chip, uchar *buffer, int len, bool read,
 #endif
 
        /* Clear interrupt status */
+       data = I2CINT_ERROR_EV | I2CINT_RECEIVE_EV | I2CINT_TRANSMIT_EV;
 #ifdef CONFIG_DM_I2C
-       fpgamap_write16(fpga, priv->addr + REG_INTERRUPT_STATUS,
-                       I2CINT_ERROR_EV | I2CINT_RECEIVE_EV | I2CINT_TRANSMIT_EV);
-       fpgamap_read16(fpga, priv->addr + REG_INTERRUPT_STATUS, &val);
+       fpgamap_write(fpga, priv->addr + REG_INTERRUPT_STATUS, &data,
+                     FPGAMAP_SIZE_16);
+       fpgamap_read(fpga, priv->addr + REG_INTERRUPT_STATUS, &val,
+                    FPGAMAP_SIZE_16);
 #else
-       I2C_SET_REG(interrupt_status, I2CINT_ERROR_EV
-                    | I2CINT_RECEIVE_EV | I2CINT_TRANSMIT_EV);
+       I2C_SET_REG(interrupt_status, data);
        I2C_GET_REG(interrupt_status, &val);
 #endif
 
@@ -153,26 +156,24 @@ static int ihs_i2c_transfer(uchar chip, uchar *buffer, int len, bool read,
                if (len > 1)
                        val |= buffer[1] << 8;
 #ifdef CONFIG_DM_I2C
-               fpgamap_write16(fpga, priv->addr + REG_WRITE_MAILBOX_EXT, val);
+               fpgamap_write(fpga, priv->addr + REG_WRITE_MAILBOX_EXT, &val,
+                             FPGAMAP_SIZE_16);
 #else
                I2C_SET_REG(write_mailbox_ext, val);
 #endif
        }
 
+       data = I2CMB_NATIVE
+              | (read ? 0 : I2CMB_WRITE)
+              | (chip << 1)
+              | ((len > 1) ? I2CMB_2BYTE : 0)
+              | (is_last ? 0 : I2CMB_HOLD_BUS);
+
 #ifdef CONFIG_DM_I2C
-       fpgamap_write16(fpga, priv->addr + REG_WRITE_MAILBOX,
-                       I2CMB_NATIVE
-                       | (read ? I2CMB_READ : I2CMB_WRITE)
-                       | (chip << 1)
-                       | ((len > 1) ? I2CMB_2BYTE : I2CMB_1BYTE)
-                       | (!is_last ? I2CMB_HOLD_BUS : I2CMB_DONT_HOLD_BUS));
+       fpgamap_write(fpga, priv->addr + REG_WRITE_MAILBOX, &data,
+                     FPGAMAP_SIZE_16);
 #else
-       I2C_SET_REG(write_mailbox,
-                   I2CMB_NATIVE
-                   | (read ? 0 : I2CMB_WRITE)
-                   | (chip << 1)
-                   | ((len > 1) ? I2CMB_2BYTE : 0)
-                   | (is_last ? 0 : I2CMB_HOLD_BUS));
+       I2C_SET_REG(write_mailbox, data);
 #endif
 
 #ifdef CONFIG_DM_I2C
@@ -185,7 +186,8 @@ static int ihs_i2c_transfer(uchar chip, uchar *buffer, int len, bool read,
        /* If we want to read, get the bytes from the mailbox */
        if (read) {
 #ifdef CONFIG_DM_I2C
-               fpgamap_read16(fpga, priv->addr + REG_READ_MAILBOX_EXT, &val);
+               fpgamap_read(fpga, priv->addr + REG_READ_MAILBOX_EXT, &val,
+                            FPGAMAP_SIZE_16);
 #else
                I2C_GET_REG(read_mailbox_ext, &val);
 #endif
@@ -198,31 +200,47 @@ static int ihs_i2c_transfer(uchar chip, uchar *buffer, int len, bool read,
 }
 
 #ifdef CONFIG_DM_I2C
-static int ihs_i2c_address(struct udevice *dev, uchar chip, u8 *addr, int alen, bool hold_bus)
+static int ihs_i2c_send_buffer(struct udevice *dev, uchar chip, u8 *data, int len, bool hold_bus, int read)
 #else
-static int ihs_i2c_address(uchar chip, u8 *addr, int alen, bool hold_bus)
+static int ihs_i2c_send_buffer(uchar chip, u8 *data, int len, bool hold_bus,
+                              int read)
 #endif
 {
-       while (alen) {
-               int transfer = min(alen, 2);
-               bool is_last = alen <= transfer;
+       while (len) {
+               int transfer = min(len, 2);
+               bool is_last = len <= transfer;
 
 #ifdef CONFIG_DM_I2C
-               if (ihs_i2c_transfer(dev, chip, addr, transfer, I2COP_WRITE,
+               if (ihs_i2c_transfer(dev, chip, data, transfer, read,
                                     hold_bus ? false : is_last))
                        return 1;
 #else
-               if (ihs_i2c_transfer(chip, addr, transfer, I2COP_WRITE,
+               if (ihs_i2c_transfer(chip, data, transfer, read,
                                     hold_bus ? false : is_last))
                        return 1;
 #endif
 
-               alen -= transfer;
+               data += transfer;
+               len -= transfer;
        }
 
        return 0;
 }
 
+#ifdef CONFIG_DM_I2C
+static int ihs_i2c_address(struct udevice *dev, uchar chip, u8 *addr, int alen,
+                          bool hold_bus)
+#else
+static int ihs_i2c_address(uchar chip, u8 *addr, int alen, bool hold_bus)
+#endif
+{
+#ifdef CONFIG_DM_I2C
+       return ihs_i2c_send_buffer(dev, chip, addr, alen, hold_bus, I2COP_WRITE);
+#else
+       return ihs_i2c_send_buffer(chip, addr, alen, hold_bus, I2COP_WRITE);
+#endif
+}
+
 #ifdef CONFIG_DM_I2C
 static int ihs_i2c_access(struct udevice *dev, uchar chip, u8 *addr,
                          int alen, uchar *buffer, int len, int read)
@@ -240,25 +258,11 @@ static int ihs_i2c_access(struct i2c_adapter *adap, uchar chip, u8 *addr,
                return 1;
 #endif
 
-       while (len) {
-               int transfer = min(len, 2);
-               bool is_last = len <= transfer;
-
 #ifdef CONFIG_DM_I2C
-               if (ihs_i2c_transfer(dev, chip, buffer, transfer, read,
-                                    is_last))
-                       return 2;
+       return ihs_i2c_send_buffer(dev, chip, buffer, len, false, read);
 #else
-               if (ihs_i2c_transfer(chip, buffer, transfer, read,
-                                    is_last))
-                       return 2;
+       return ihs_i2c_send_buffer(chip, buffer, len, false, read);
 #endif
-
-               buffer += transfer;
-               len -= transfer;
-       }
-
-       return 0;
 }
 
 #ifdef CONFIG_DM_I2C