i2c: Remove non-DM code from ihs_i2c.c

This driver and it's only user are converted to DM_I2C, remove legacy
code.

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/README b/README
index 21dc267..9313dbc 100644 (file)
--- a/README
+++ b/README
@@ -1527,30 +1527,6 @@ The following options need to be configured:
                    9 i2c buses for Exynos4 and 1 for S3C24X0 SoCs from Samsung)
                    with a fix speed from 100000 and the slave addr 0!
 
-               - drivers/i2c/ihs_i2c.c
-                 - activate this driver with CONFIG_SYS_I2C_IHS
-                 - CONFIG_SYS_I2C_IHS_CH0 activate hardware channel 0
-                 - CONFIG_SYS_I2C_IHS_SPEED_0 speed channel 0
-                 - CONFIG_SYS_I2C_IHS_SLAVE_0 slave addr channel 0
-                 - CONFIG_SYS_I2C_IHS_CH1 activate hardware channel 1
-                 - CONFIG_SYS_I2C_IHS_SPEED_1 speed channel 1
-                 - CONFIG_SYS_I2C_IHS_SLAVE_1 slave addr channel 1
-                 - CONFIG_SYS_I2C_IHS_CH2 activate hardware channel 2
-                 - CONFIG_SYS_I2C_IHS_SPEED_2 speed channel 2
-                 - CONFIG_SYS_I2C_IHS_SLAVE_2 slave addr channel 2
-                 - CONFIG_SYS_I2C_IHS_CH3 activate hardware channel 3
-                 - CONFIG_SYS_I2C_IHS_SPEED_3 speed channel 3
-                 - CONFIG_SYS_I2C_IHS_SLAVE_3 slave addr channel 3
-                 - activate dual channel with CONFIG_SYS_I2C_IHS_DUAL
-                 - CONFIG_SYS_I2C_IHS_SPEED_0_1 speed channel 0_1
-                 - CONFIG_SYS_I2C_IHS_SLAVE_0_1 slave addr channel 0_1
-                 - CONFIG_SYS_I2C_IHS_SPEED_1_1 speed channel 1_1
-                 - CONFIG_SYS_I2C_IHS_SLAVE_1_1 slave addr channel 1_1
-                 - CONFIG_SYS_I2C_IHS_SPEED_2_1 speed channel 2_1
-                 - CONFIG_SYS_I2C_IHS_SLAVE_2_1 slave addr channel 2_1
-                 - CONFIG_SYS_I2C_IHS_SPEED_3_1 speed channel 3_1
-                 - CONFIG_SYS_I2C_IHS_SLAVE_3_1 slave addr channel 3_1
-
                additional defines:
 
                CONFIG_SYS_NUM_I2C_BUSES

diff --git a/drivers/i2c/ihs_i2c.c b/drivers/i2c/ihs_i2c.c
index 02f0144..ecca906 100644 (file)
--- a/drivers/i2c/ihs_i2c.c
+++ b/drivers/i2c/ihs_i2c.c
@@ -6,19 +6,14 @@
 
 #include <common.h>
 #include <i2c.h>
-#if CONFIG_IS_ENABLED(DM_I2C)
 #include <dm.h>
 #include <regmap.h>
-#else
-#include <gdsys_fpga.h>
-#endif
 #include <log.h>
 #include <asm/global_data.h>
 #include <asm/unaligned.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 
-#if CONFIG_IS_ENABLED(DM_I2C)
 struct ihs_i2c_priv {
        uint speed;
        struct regmap *map;
@@ -39,37 +34,6 @@ struct ihs_i2c_regs {
 #define ihs_i2c_get(map, member, valp) \
        regmap_get(map, struct ihs_i2c_regs, member, valp)
 
-#else /* !CONFIG_DM_I2C */
-DECLARE_GLOBAL_DATA_PTR;
-
-#ifdef CONFIG_SYS_I2C_IHS_DUAL
-
-#define I2C_SET_REG(fld, val) \
-       do { \
-               if (I2C_ADAP_HWNR & 0x10) \
-                       FPGA_SET_REG(I2C_ADAP_HWNR & 0xf, i2c1.fld, val); \
-               else \
-                       FPGA_SET_REG(I2C_ADAP_HWNR, i2c0.fld, val); \
-       } while (0)
-#else
-#define I2C_SET_REG(fld, val) \
-               FPGA_SET_REG(I2C_ADAP_HWNR, i2c0.fld, val)
-#endif
-
-#ifdef CONFIG_SYS_I2C_IHS_DUAL
-#define I2C_GET_REG(fld, val) \
-       do {                                    \
-               if (I2C_ADAP_HWNR & 0x10) \
-                       FPGA_GET_REG(I2C_ADAP_HWNR & 0xf, i2c1.fld, val); \
-               else \
-                       FPGA_GET_REG(I2C_ADAP_HWNR, i2c0.fld, val); \
-       } while (0)
-#else
-#define I2C_GET_REG(fld, val) \
-               FPGA_GET_REG(I2C_ADAP_HWNR, i2c0.fld, val)
-#endif
-#endif /* CONFIG_DM_I2C */
-
 enum {
        I2CINT_ERROR_EV = BIT(13),
        I2CINT_TRANSMIT_EV = BIT(14),
@@ -91,23 +55,13 @@ enum {
        I2COP_READ = 1,
 };
 
-#if CONFIG_IS_ENABLED(DM_I2C)
 static int wait_for_int(struct udevice *dev, int read)
-#else
-static int wait_for_int(bool read)
-#endif
 {
        u16 val;
        uint ctr = 0;
-#if CONFIG_IS_ENABLED(DM_I2C)
        struct ihs_i2c_priv *priv = dev_get_priv(dev);
-#endif
 
-#if CONFIG_IS_ENABLED(DM_I2C)
        ihs_i2c_get(priv->map, interrupt_status, &val);
-#else
-       I2C_GET_REG(interrupt_status, &val);
-#endif
        /* Wait until error or receive/transmit interrupt was raised */
        while (!(val & (I2CINT_ERROR_EV
               | (read ? I2CINT_RECEIVE_EV : I2CINT_TRANSMIT_EV)))) {
@@ -116,40 +70,24 @@ static int wait_for_int(bool read)
                        debug("%s: timed out\n", __func__);
                        return -ETIMEDOUT;
                }
-#if CONFIG_IS_ENABLED(DM_I2C)
                ihs_i2c_get(priv->map, interrupt_status, &val);
-#else
-               I2C_GET_REG(interrupt_status, &val);
-#endif
        }
 
        return (val & I2CINT_ERROR_EV) ? -EIO : 0;
 }
 
-#if CONFIG_IS_ENABLED(DM_I2C)
 static int ihs_i2c_transfer(struct udevice *dev, uchar chip,
                            uchar *buffer, int len, int read, bool is_last)
-#else
-static int ihs_i2c_transfer(uchar chip, uchar *buffer, int len, bool read,
-                           bool is_last)
-#endif
 {
        u16 val;
        u16 data;
        int res;
-#if CONFIG_IS_ENABLED(DM_I2C)
        struct ihs_i2c_priv *priv = dev_get_priv(dev);
-#endif
 
        /* Clear interrupt status */
        data = I2CINT_ERROR_EV | I2CINT_RECEIVE_EV | I2CINT_TRANSMIT_EV;
-#if CONFIG_IS_ENABLED(DM_I2C)
        ihs_i2c_set(priv->map, interrupt_status, data);
        ihs_i2c_get(priv->map, interrupt_status, &val);
-#else
-       I2C_SET_REG(interrupt_status, data);
-       I2C_GET_REG(interrupt_status, &val);
-#endif
 
        /* If we want to write and have data, write the bytes to the mailbox */
        if (!read && len) {
@@ -157,11 +95,7 @@ static int ihs_i2c_transfer(uchar chip, uchar *buffer, int len, bool read,
 
                if (len > 1)
                        val |= buffer[1] << 8;
-#if CONFIG_IS_ENABLED(DM_I2C)
                ihs_i2c_set(priv->map, write_mailbox_ext, val);
-#else
-               I2C_SET_REG(write_mailbox_ext, val);
-#endif
        }
 
        data = I2CMB_NATIVE
@@ -170,17 +104,9 @@ static int ihs_i2c_transfer(uchar chip, uchar *buffer, int len, bool read,
               | ((len > 1) ? I2CMB_2BYTE : 0)
               | (is_last ? 0 : I2CMB_HOLD_BUS);
 
-#if CONFIG_IS_ENABLED(DM_I2C)
        ihs_i2c_set(priv->map, write_mailbox, data);
-#else
-       I2C_SET_REG(write_mailbox, data);
-#endif
 
-#if CONFIG_IS_ENABLED(DM_I2C)
        res = wait_for_int(dev, read);
-#else
-       res = wait_for_int(read);
-#endif
        if (res) {
                if (res == -ETIMEDOUT)
                        debug("%s: time out while waiting for event\n", __func__);
@@ -190,11 +116,7 @@ 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) {
-#if CONFIG_IS_ENABLED(DM_I2C)
                ihs_i2c_get(priv->map, read_mailbox_ext, &val);
-#else
-               I2C_GET_REG(read_mailbox_ext, &val);
-#endif
                buffer[0] = val & 0xff;
                if (len > 1)
                        buffer[1] = val >> 8;
@@ -203,12 +125,7 @@ static int ihs_i2c_transfer(uchar chip, uchar *buffer, int len, bool read,
        return 0;
 }
 
-#if CONFIG_IS_ENABLED(DM_I2C)
 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_send_buffer(uchar chip, u8 *data, int len, bool hold_bus,
-                              int read)
-#endif
 {
        int res;
 
@@ -216,13 +133,8 @@ static int ihs_i2c_send_buffer(uchar chip, u8 *data, int len, bool hold_bus,
                int transfer = min(len, 2);
                bool is_last = len <= transfer;
 
-#if CONFIG_IS_ENABLED(DM_I2C)
                res = ihs_i2c_transfer(dev, chip, data, transfer, read,
                                       hold_bus ? false : is_last);
-#else
-               res = ihs_i2c_transfer(chip, data, transfer, read,
-                                      hold_bus ? false : is_last);
-#endif
                if (res)
                        return res;
 
@@ -233,27 +145,14 @@ static int ihs_i2c_send_buffer(uchar chip, u8 *data, int len, bool hold_bus,
        return 0;
 }
 
-#if CONFIG_IS_ENABLED(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
 {
-#if CONFIG_IS_ENABLED(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
 }
 
-#if CONFIG_IS_ENABLED(DM_I2C)
 static int ihs_i2c_access(struct udevice *dev, uchar chip, u8 *addr,
                          int alen, uchar *buffer, int len, int read)
-#else
-static int ihs_i2c_access(struct i2c_adapter *adap, uchar chip, u8 *addr,
-                         int alen, uchar *buffer, int len, int read)
-#endif
 {
        int res;
 
@@ -261,23 +160,13 @@ static int ihs_i2c_access(struct i2c_adapter *adap, uchar chip, u8 *addr,
        if (len <= 0)
                return -EINVAL;
 
-#if CONFIG_IS_ENABLED(DM_I2C)
        res = ihs_i2c_address(dev, chip, addr, alen, len);
-#else
-       res = ihs_i2c_address(chip, addr, alen, len);
-#endif
        if (res)
                return res;
 
-#if CONFIG_IS_ENABLED(DM_I2C)
        return ihs_i2c_send_buffer(dev, chip, buffer, len, false, read);
-#else
-       return ihs_i2c_send_buffer(chip, buffer, len, false, read);
-#endif
 }
 
-#if CONFIG_IS_ENABLED(DM_I2C)
-
 int ihs_i2c_probe(struct udevice *bus)
 {
        struct ihs_i2c_priv *priv = dev_get_priv(bus);
@@ -358,120 +247,3 @@ U_BOOT_DRIVER(i2c_ihs) = {
        .priv_auto      = sizeof(struct ihs_i2c_priv),
        .ops = &ihs_i2c_ops,
 };
-
-#else /* CONFIG_DM_I2C */
-
-static void ihs_i2c_init(struct i2c_adapter *adap, int speed, int slaveaddr)
-{
-#ifdef CONFIG_SYS_I2C_INIT_BOARD
-       /*
-        * Call board specific i2c bus reset routine before accessing the
-        * environment, which might be in a chip on that bus. For details
-        * about this problem see doc/I2C_Edge_Conditions.
-        */
-       i2c_init_board();
-#endif
-}
-
-static int ihs_i2c_probe(struct i2c_adapter *adap, uchar chip)
-{
-       uchar buffer[2];
-       int res;
-
-       res = ihs_i2c_transfer(chip, buffer, 0, I2COP_READ, true);
-       if (res)
-               return res;
-
-       return 0;
-}
-
-static int ihs_i2c_read(struct i2c_adapter *adap, uchar chip, uint addr,
-                       int alen, uchar *buffer, int len)
-{
-       u8 addr_bytes[4];
-
-       put_unaligned_le32(addr, addr_bytes);
-
-       return ihs_i2c_access(adap, chip, addr_bytes, alen, buffer, len,
-                             I2COP_READ);
-}
-
-static int ihs_i2c_write(struct i2c_adapter *adap, uchar chip, uint addr,
-                        int alen, uchar *buffer, int len)
-{
-       u8 addr_bytes[4];
-
-       put_unaligned_le32(addr, addr_bytes);
-
-       return ihs_i2c_access(adap, chip, addr_bytes, alen, buffer, len,
-                             I2COP_WRITE);
-}
-
-static unsigned int ihs_i2c_set_bus_speed(struct i2c_adapter *adap,
-                                         unsigned int speed)
-{
-       if (speed != adap->speed)
-               return -EINVAL;
-       return speed;
-}
-
-/*
- * Register IHS i2c adapters
- */
-#ifdef CONFIG_SYS_I2C_IHS_CH0
-U_BOOT_I2C_ADAP_COMPLETE(ihs0, ihs_i2c_init, ihs_i2c_probe,
-                        ihs_i2c_read, ihs_i2c_write,
-                        ihs_i2c_set_bus_speed,
-                        CONFIG_SYS_I2C_IHS_SPEED_0,
-                        CONFIG_SYS_I2C_IHS_SLAVE_0, 0)
-#ifdef CONFIG_SYS_I2C_IHS_DUAL
-U_BOOT_I2C_ADAP_COMPLETE(ihs0_1, ihs_i2c_init, ihs_i2c_probe,
-                        ihs_i2c_read, ihs_i2c_write,
-                        ihs_i2c_set_bus_speed,
-                        CONFIG_SYS_I2C_IHS_SPEED_0_1,
-                        CONFIG_SYS_I2C_IHS_SLAVE_0_1, 16)
-#endif
-#endif
-#ifdef CONFIG_SYS_I2C_IHS_CH1
-U_BOOT_I2C_ADAP_COMPLETE(ihs1, ihs_i2c_init, ihs_i2c_probe,
-                        ihs_i2c_read, ihs_i2c_write,
-                        ihs_i2c_set_bus_speed,
-                        CONFIG_SYS_I2C_IHS_SPEED_1,
-                        CONFIG_SYS_I2C_IHS_SLAVE_1, 1)
-#ifdef CONFIG_SYS_I2C_IHS_DUAL
-U_BOOT_I2C_ADAP_COMPLETE(ihs1_1, ihs_i2c_init, ihs_i2c_probe,
-                        ihs_i2c_read, ihs_i2c_write,
-                        ihs_i2c_set_bus_speed,
-                        CONFIG_SYS_I2C_IHS_SPEED_1_1,
-                        CONFIG_SYS_I2C_IHS_SLAVE_1_1, 17)
-#endif
-#endif
-#ifdef CONFIG_SYS_I2C_IHS_CH2
-U_BOOT_I2C_ADAP_COMPLETE(ihs2, ihs_i2c_init, ihs_i2c_probe,
-                        ihs_i2c_read, ihs_i2c_write,
-                        ihs_i2c_set_bus_speed,
-                        CONFIG_SYS_I2C_IHS_SPEED_2,
-                        CONFIG_SYS_I2C_IHS_SLAVE_2, 2)
-#ifdef CONFIG_SYS_I2C_IHS_DUAL
-U_BOOT_I2C_ADAP_COMPLETE(ihs2_1, ihs_i2c_init, ihs_i2c_probe,
-                        ihs_i2c_read, ihs_i2c_write,
-                        ihs_i2c_set_bus_speed,
-                        CONFIG_SYS_I2C_IHS_SPEED_2_1,
-                        CONFIG_SYS_I2C_IHS_SLAVE_2_1, 18)
-#endif
-#endif
-#ifdef CONFIG_SYS_I2C_IHS_CH3
-U_BOOT_I2C_ADAP_COMPLETE(ihs3, ihs_i2c_init, ihs_i2c_probe,
-                        ihs_i2c_read, ihs_i2c_write,
-                        ihs_i2c_set_bus_speed,
-                        CONFIG_SYS_I2C_IHS_SPEED_3,
-                        CONFIG_SYS_I2C_IHS_SLAVE_3, 3)
-#ifdef CONFIG_SYS_I2C_IHS_DUAL
-U_BOOT_I2C_ADAP_COMPLETE(ihs3_1, ihs_i2c_init, ihs_i2c_probe,
-                        ihs_i2c_read, ihs_i2c_write,
-                        ihs_i2c_set_bus_speed,
-                        CONFIG_SYS_I2C_IHS_SPEED_3_1,
-                        CONFIG_SYS_I2C_IHS_SLAVE_3_1, 19)
-#endif
-#endif
-#endif /* CONFIG_DM_I2C */