i2c: octeon,thunderx: Move register offsets to struct

The register offsets are different between Octeon and ThunderX so move
them into the algorithm struct and get rid of the define.

Signed-off-by: Jan Glauber <jglauber@cavium.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>

diff --git a/drivers/i2c/busses/i2c-octeon-core.c b/drivers/i2c/busses/i2c-octeon-core.c
index 23384efc101aa79a2f0b177f971c5bf7e1927c79..a327a5fa453e5ac42202580ba24066dc0c6646cf 100644 (file)
--- a/drivers/i2c/busses/i2c-octeon-core.c
+++ b/drivers/i2c/busses/i2c-octeon-core.c
@@ -99,7 +99,7 @@ static int octeon_i2c_wait(struct octeon_i2c *i2c)
 
 static bool octeon_i2c_hlc_test_valid(struct octeon_i2c *i2c)
 {
-       return (__raw_readq(i2c->twsi_base + SW_TWSI) & SW_TWSI_V) == 0;
+       return (__raw_readq(i2c->twsi_base + SW_TWSI(i2c)) & SW_TWSI_V) == 0;
 }
 
 static bool octeon_i2c_hlc_test_ready(struct octeon_i2c *i2c, bool *first)
@@ -446,12 +446,12 @@ static int octeon_i2c_hlc_read(struct octeon_i2c *i2c, struct i2c_msg *msgs)
        else
                cmd |= SW_TWSI_OP_7;
 
-       octeon_i2c_writeq_flush(cmd, i2c->twsi_base + SW_TWSI);
+       octeon_i2c_writeq_flush(cmd, i2c->twsi_base + SW_TWSI(i2c));
        ret = octeon_i2c_hlc_wait(i2c);
        if (ret)
                goto err;
 
-       cmd = __raw_readq(i2c->twsi_base + SW_TWSI);
+       cmd = __raw_readq(i2c->twsi_base + SW_TWSI(i2c));
        if ((cmd & SW_TWSI_R) == 0)
                return -EAGAIN;
 
@@ -459,7 +459,7 @@ static int octeon_i2c_hlc_read(struct octeon_i2c *i2c, struct i2c_msg *msgs)
                msgs[0].buf[j] = (cmd >> (8 * i)) & 0xff;
 
        if (msgs[0].len > 4) {
-               cmd = __raw_readq(i2c->twsi_base + SW_TWSI_EXT);
+               cmd = __raw_readq(i2c->twsi_base + SW_TWSI_EXT(i2c));
                for (i = 0; i  < msgs[0].len - 4 && i < 4; i++, j--)
                        msgs[0].buf[j] = (cmd >> (8 * i)) & 0xff;
        }
@@ -496,15 +496,15 @@ static int octeon_i2c_hlc_write(struct octeon_i2c *i2c, struct i2c_msg *msgs)
 
                for (i = 0; i < msgs[0].len - 4 && i < 4; i++, j--)
                        ext |= (u64)msgs[0].buf[j] << (8 * i);
-               octeon_i2c_writeq_flush(ext, i2c->twsi_base + SW_TWSI_EXT);
+               octeon_i2c_writeq_flush(ext, i2c->twsi_base + SW_TWSI_EXT(i2c));
        }
 
-       octeon_i2c_writeq_flush(cmd, i2c->twsi_base + SW_TWSI);
+       octeon_i2c_writeq_flush(cmd, i2c->twsi_base + SW_TWSI(i2c));
        ret = octeon_i2c_hlc_wait(i2c);
        if (ret)
                goto err;
 
-       cmd = __raw_readq(i2c->twsi_base + SW_TWSI);
+       cmd = __raw_readq(i2c->twsi_base + SW_TWSI(i2c));
        if ((cmd & SW_TWSI_R) == 0)
                return -EAGAIN;
 
@@ -539,19 +539,19 @@ static int octeon_i2c_hlc_comp_read(struct octeon_i2c *i2c, struct i2c_msg *msgs
                cmd |= SW_TWSI_EIA;
                ext = (u64)msgs[0].buf[0] << SW_TWSI_IA_SHIFT;
                cmd |= (u64)msgs[0].buf[1] << SW_TWSI_IA_SHIFT;
-               octeon_i2c_writeq_flush(ext, i2c->twsi_base + SW_TWSI_EXT);
+               octeon_i2c_writeq_flush(ext, i2c->twsi_base + SW_TWSI_EXT(i2c));
        } else {
                cmd |= (u64)msgs[0].buf[0] << SW_TWSI_IA_SHIFT;
        }
 
        octeon_i2c_hlc_int_clear(i2c);
-       octeon_i2c_writeq_flush(cmd, i2c->twsi_base + SW_TWSI);
+       octeon_i2c_writeq_flush(cmd, i2c->twsi_base + SW_TWSI(i2c));
 
        ret = octeon_i2c_hlc_wait(i2c);
        if (ret)
                goto err;
 
-       cmd = __raw_readq(i2c->twsi_base + SW_TWSI);
+       cmd = __raw_readq(i2c->twsi_base + SW_TWSI(i2c));
        if ((cmd & SW_TWSI_R) == 0)
                return -EAGAIN;
 
@@ -559,7 +559,7 @@ static int octeon_i2c_hlc_comp_read(struct octeon_i2c *i2c, struct i2c_msg *msgs
                msgs[1].buf[j] = (cmd >> (8 * i)) & 0xff;
 
        if (msgs[1].len > 4) {
-               cmd = __raw_readq(i2c->twsi_base + SW_TWSI_EXT);
+               cmd = __raw_readq(i2c->twsi_base + SW_TWSI_EXT(i2c));
                for (i = 0; i  < msgs[1].len - 4 && i < 4; i++, j--)
                        msgs[1].buf[j] = (cmd >> (8 * i)) & 0xff;
        }
@@ -606,16 +606,16 @@ static int octeon_i2c_hlc_comp_write(struct octeon_i2c *i2c, struct i2c_msg *msg
                set_ext = true;
        }
        if (set_ext)
-               octeon_i2c_writeq_flush(ext, i2c->twsi_base + SW_TWSI_EXT);
+               octeon_i2c_writeq_flush(ext, i2c->twsi_base + SW_TWSI_EXT(i2c));
 
        octeon_i2c_hlc_int_clear(i2c);
-       octeon_i2c_writeq_flush(cmd, i2c->twsi_base + SW_TWSI);
+       octeon_i2c_writeq_flush(cmd, i2c->twsi_base + SW_TWSI(i2c));
 
        ret = octeon_i2c_hlc_wait(i2c);
        if (ret)
                goto err;
 
-       cmd = __raw_readq(i2c->twsi_base + SW_TWSI);
+       cmd = __raw_readq(i2c->twsi_base + SW_TWSI(i2c));
        if ((cmd & SW_TWSI_R) == 0)
                return -EAGAIN;
 

diff --git a/drivers/i2c/busses/i2c-octeon-core.h b/drivers/i2c/busses/i2c-octeon-core.h
index 2ed6f7a36b88295a6f4a68e651fd9fee5d4a51aa..87151ea74acd475a37726fd43fa927f486ddc76e 100644 (file)
--- a/drivers/i2c/busses/i2c-octeon-core.h
+++ b/drivers/i2c/busses/i2c-octeon-core.h
@@ -8,17 +8,6 @@
 #include <linux/kernel.h>
 #include <linux/pci.h>
 
-/* Register offsets */
-#if IS_ENABLED(CONFIG_I2C_THUNDERX)
-       #define SW_TWSI                 0x1000
-       #define TWSI_INT                0x1010
-       #define SW_TWSI_EXT             0x1018
-#else
-       #define SW_TWSI                 0x00
-       #define TWSI_INT                0x10
-       #define SW_TWSI_EXT             0x18
-#endif
-
 /* Controller command patterns */
 #define SW_TWSI_V              BIT_ULL(63)     /* Valid bit */
 #define SW_TWSI_EIA            BIT_ULL(61)     /* Extended internal address */
@@ -98,9 +87,21 @@
 
 #define I2C_OCTEON_EVENT_WAIT 80 /* microseconds */
 
+/* Register offsets */
+struct octeon_i2c_reg_offset {
+       unsigned int sw_twsi;
+       unsigned int twsi_int;
+       unsigned int sw_twsi_ext;
+};
+
+#define SW_TWSI(x)     (x->roff.sw_twsi)
+#define TWSI_INT(x)    (x->roff.twsi_int)
+#define SW_TWSI_EXT(x) (x->roff.sw_twsi_ext)
+
 struct octeon_i2c {
        wait_queue_head_t queue;
        struct i2c_adapter adap;
+       struct octeon_i2c_reg_offset roff;
        struct clk *clk;
        int irq;
        int hlc_irq;            /* For cn7890 only */
@@ -142,9 +143,9 @@ static inline void octeon_i2c_reg_write(struct octeon_i2c *i2c, u64 eop_reg, u8
 {
        u64 tmp;
 
-       __raw_writeq(SW_TWSI_V | eop_reg | data, i2c->twsi_base + SW_TWSI);
+       __raw_writeq(SW_TWSI_V | eop_reg | data, i2c->twsi_base + SW_TWSI(i2c));
        do {
-               tmp = __raw_readq(i2c->twsi_base + SW_TWSI);
+               tmp = __raw_readq(i2c->twsi_base + SW_TWSI(i2c));
        } while ((tmp & SW_TWSI_V) != 0);
 }
 
@@ -166,9 +167,9 @@ static inline u8 octeon_i2c_reg_read(struct octeon_i2c *i2c, u64 eop_reg)
 {
        u64 tmp;
 
-       __raw_writeq(SW_TWSI_V | eop_reg | SW_TWSI_R, i2c->twsi_base + SW_TWSI);
+       __raw_writeq(SW_TWSI_V | eop_reg | SW_TWSI_R, i2c->twsi_base + SW_TWSI(i2c));
        do {
-               tmp = __raw_readq(i2c->twsi_base + SW_TWSI);
+               tmp = __raw_readq(i2c->twsi_base + SW_TWSI(i2c));
        } while ((tmp & SW_TWSI_V) != 0);
 
        return tmp & 0xFF;
@@ -189,7 +190,7 @@ static inline u8 octeon_i2c_reg_read(struct octeon_i2c *i2c, u64 eop_reg)
  */
 static inline u64 octeon_i2c_read_int(struct octeon_i2c *i2c)
 {
-       return __raw_readq(i2c->twsi_base + TWSI_INT);
+       return __raw_readq(i2c->twsi_base + TWSI_INT(i2c));
 }
 
 /**
@@ -199,7 +200,7 @@ static inline u64 octeon_i2c_read_int(struct octeon_i2c *i2c)
  */
 static inline void octeon_i2c_write_int(struct octeon_i2c *i2c, u64 data)
 {
-       octeon_i2c_writeq_flush(data, i2c->twsi_base + TWSI_INT);
+       octeon_i2c_writeq_flush(data, i2c->twsi_base + TWSI_INT(i2c));
 }
 
 /* Prototypes */

diff --git a/drivers/i2c/busses/i2c-octeon-platdrv.c b/drivers/i2c/busses/i2c-octeon-platdrv.c
index 53fa9a0d96bbed8647f0597d933d0a500a4c720e..2861821bbd60507e9e65d983091621209a9be88c 100644 (file)
--- a/drivers/i2c/busses/i2c-octeon-platdrv.c
+++ b/drivers/i2c/busses/i2c-octeon-platdrv.c
@@ -163,6 +163,10 @@ static int octeon_i2c_probe(struct platform_device *pdev)
        }
        i2c->dev = &pdev->dev;
 
+       i2c->roff.sw_twsi = 0x00;
+       i2c->roff.twsi_int = 0x10;
+       i2c->roff.sw_twsi_ext = 0x18;
+
        res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        i2c->twsi_base = devm_ioremap_resource(&pdev->dev, res_mem);
        if (IS_ERR(i2c->twsi_base)) {

diff --git a/drivers/i2c/busses/i2c-thunderx-pcidrv.c b/drivers/i2c/busses/i2c-thunderx-pcidrv.c
index e8c3ce0eaf4d38d58769a1c0f6a1e883145aa054..bba5b429f69c92e21a1b4934319ad78fc388ef0a 100644 (file)
--- a/drivers/i2c/busses/i2c-thunderx-pcidrv.c
+++ b/drivers/i2c/busses/i2c-thunderx-pcidrv.c
@@ -158,6 +158,10 @@ static int thunder_i2c_probe_pci(struct pci_dev *pdev,
        if (!i2c)
                return -ENOMEM;
 
+       i2c->roff.sw_twsi = 0x1000;
+       i2c->roff.twsi_int = 0x1010;
+       i2c->roff.sw_twsi_ext = 0x1018;
+
        i2c->dev = dev;
        pci_set_drvdata(pdev, i2c);
        ret = pcim_enable_device(pdev);