i2c: ocores: convert to ioport_map() for IORESOURCE_IO

There is at least one machine that uses this driver but does not
have support for inb()/outb() instructions.

Convert this to using ioport_map() so it can build on architectures
that don't provide these but work correctly on machines that require
using port I/O.

Fixes: 47c21d2d52e0 ("i2c: add HAS_IOPORT dependencies")
Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Link: https://lore.kernel.org/lkml/CAMuHMdVUQ2WgtpYPYfO2T=itMmZ7w=geREqDtsP8Q3ODh9rxdw@mail.gmail.com/
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Andi Shyti <andi.shyti@kernel.org>

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 5f4dc31ed142646b57dcb62a2322d742df92d87f..760e14b04f959ac7c733482dfca7e3b7c9ec50d4 100644 (file)
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -885,7 +885,6 @@ config I2C_NPCM
 
 config I2C_OCORES
        tristate "OpenCores I2C Controller"
-       depends on HAS_IOPORT
        help
          If you say yes to this option, support will be included for the
          OpenCores I2C controller. For details see

diff --git a/drivers/i2c/busses/i2c-ocores.c b/drivers/i2c/busses/i2c-ocores.c
index e106af83cef4da5626e534325805aad70be2f617..56a4dabf5a388788ba488b2473d642093706cb24 100644 (file)
--- a/drivers/i2c/busses/i2c-ocores.c
+++ b/drivers/i2c/busses/i2c-ocores.c
@@ -32,7 +32,6 @@
  */
 struct ocores_i2c {
        void __iomem *base;
-       int iobase;
        u32 reg_shift;
        u32 reg_io_width;
        unsigned long flags;
@@ -136,16 +135,6 @@ static inline u8 oc_getreg_32be(struct ocores_i2c *i2c, int reg)
        return ioread32be(i2c->base + (reg << i2c->reg_shift));
 }
 
-static void oc_setreg_io_8(struct ocores_i2c *i2c, int reg, u8 value)
-{
-       outb(value, i2c->iobase + reg);
-}
-
-static inline u8 oc_getreg_io_8(struct ocores_i2c *i2c, int reg)
-{
-       return inb(i2c->iobase + reg);
-}
-
 static inline void oc_setreg(struct ocores_i2c *i2c, int reg, u8 value)
 {
        i2c->setreg(i2c, reg, value);
@@ -618,15 +607,19 @@ static int ocores_i2c_probe(struct platform_device *pdev)
                res = platform_get_resource(pdev, IORESOURCE_IO, 0);
                if (!res)
                        return -EINVAL;
-               i2c->iobase = res->start;
                if (!devm_request_region(&pdev->dev, res->start,
                                         resource_size(res),
                                         pdev->name)) {
                        dev_err(&pdev->dev, "Can't get I/O resource.\n");
                        return -EBUSY;
                }
-               i2c->setreg = oc_setreg_io_8;
-               i2c->getreg = oc_getreg_io_8;
+               i2c->base = devm_ioport_map(&pdev->dev, res->start,
+                                           resource_size(res));
+               if (!i2c->base) {
+                       dev_err(&pdev->dev, "Can't map I/O resource.\n");
+                       return -EBUSY;
+               }
+               i2c->reg_io_width = 1;
        }
 
        pdata = dev_get_platdata(&pdev->dev);