Re: [U-Boot] [PATCH 1/2] i2c: ihs: Get rid of fpgamap

2019-03-29 Thread Mario Six 
On Thu, Feb 7, 2019 at 6:24 AM Heiko Schocher  wrote:
>
> Hello Mario,
>
> Am 28.01.2019 um 09:45 schrieb Mario Six:
> > Since the IHS I2C driver want upstream, the surrounding infrastructure
> > has changed quite a bit (notably, the fpgamap driver was replaced with a
> > regmap driver).
> >
> > Update the driver to work with these changes.
> >
> > Signed-off-by: Mario Six 
> > ---
> >   drivers/i2c/ihs_i2c.c | 57 +--
> >   1 file changed, 23 insertions(+), 34 deletions(-)
>
> Just one nitpick ... what happens if regmap_set/get
> return with an error, I see no error handling ...
> (But in the old version there is also none, so may this
>   can/should be added in a second step)
>
> Reviewed-by: Heiko Schocher 
>
> Thanks!
>
> This patch is assigned to you, so it is fine for me, if you
> pick it up.
>
> bye,
> Heiko
> --
> DENX Software Engineering GmbH,  Managing Director: Wolfgang Denk
> HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
> Phone: +49-8142-66989-52   Fax: +49-8142-66989-80   Email: h...@denx.de
>

Applied to u-boot-mpc83xx/next.
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

Re: [U-Boot] [PATCH 1/2] i2c: ihs: Get rid of fpgamap

2019-02-06 Thread Heiko Schocher 

Hello Mario,

Am 28.01.2019 um 09:45 schrieb Mario Six:

Since the IHS I2C driver want upstream, the surrounding infrastructure
has changed quite a bit (notably, the fpgamap driver was replaced with a
regmap driver).

Update the driver to work with these changes.

Signed-off-by: Mario Six 
---
  drivers/i2c/ihs_i2c.c | 57 +--
  1 file changed, 23 insertions(+), 34 deletions(-)


Just one nitpick ... what happens if regmap_set/get
return with an error, I see no error handling ...
(But in the old version there is also none, so may this
 can/should be added in a second step)

Reviewed-by: Heiko Schocher 

Thanks!

This patch is assigned to you, so it is fine for me, if you
pick it up.

bye,
Heiko
--
DENX Software Engineering GmbH,  Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-52   Fax: +49-8142-66989-80   Email: h...@denx.de
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

[U-Boot] [PATCH 1/2] i2c: ihs: Get rid of fpgamap

2019-01-28 Thread Mario Six 
Since the IHS I2C driver want upstream, the surrounding infrastructure
has changed quite a bit (notably, the fpgamap driver was replaced with a
regmap driver).

Update the driver to work with these changes.

Signed-off-by: Mario Six 
---
 drivers/i2c/ihs_i2c.c | 57 +--
 1 file changed, 23 insertions(+), 34 deletions(-)

diff --git a/drivers/i2c/ihs_i2c.c b/drivers/i2c/ihs_i2c.c
index 0922fe9bb10..5313490bf3a 100644
--- a/drivers/i2c/ihs_i2c.c
+++ b/drivers/i2c/ihs_i2c.c
@@ -8,8 +8,7 @@
 #include 
 #ifdef CONFIG_DM_I2C
 #include 
-#include 
-#include "../misc/gdsys_soc.h"
+#include 
 #else
 #include 
 #endif
@@ -18,18 +17,24 @@
 #ifdef CONFIG_DM_I2C
 struct ihs_i2c_priv {
uint speed;
-   phys_addr_t addr;
+   struct regmap *map;
 };
 
-enum {
-   REG_INTERRUPT_STATUS = 0x00,
-   REG_INTERRUPT_ENABLE_CONTROL = 0x02,
-   REG_WRITE_MAILBOX_EXT = 0x04,
-   REG_WRITE_MAILBOX = 0x06,
-   REG_READ_MAILBOX_EXT = 0x08,
-   REG_READ_MAILBOX = 0x0A,
+struct ihs_i2c_regs {
+   u16 interrupt_status;
+   u16 interrupt_enable_control;
+   u16 write_mailbox_ext;
+   u16 write_mailbox;
+   u16 read_mailbox_ext;
+   u16 read_mailbox;
 };
 
+#define ihs_i2c_set(map, member, val) \
+   regmap_set(map, struct ihs_i2c_regs, member, val)
+
+#define ihs_i2c_get(map, member, valp) \
+   regmap_get(map, struct ihs_i2c_regs, member, valp)
+
 #else /* !CONFIG_DM_I2C */
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -92,14 +97,10 @@ static int wait_for_int(bool read)
uint ctr = 0;
 #ifdef CONFIG_DM_I2C
struct ihs_i2c_priv *priv = dev_get_priv(dev);
-   struct udevice *fpga;
-
-   gdsys_soc_get_fpga(dev, &fpga);
 #endif
 
 #ifdef CONFIG_DM_I2C
-   fpgamap_read(fpga, priv->addr + REG_INTERRUPT_STATUS, &val,
-FPGAMAP_SIZE_16);
+   ihs_i2c_get(priv->map, interrupt_status, &val);
 #else
I2C_GET_REG(interrupt_status, &val);
 #endif
@@ -110,8 +111,7 @@ static int wait_for_int(bool read)
if (ctr++ > 5000)
return 1;
 #ifdef CONFIG_DM_I2C
-   fpgamap_read(fpga, priv->addr + REG_INTERRUPT_STATUS, &val,
-FPGAMAP_SIZE_16);
+   ihs_i2c_get(priv->map, interrupt_status, &val);
 #else
I2C_GET_REG(interrupt_status, &val);
 #endif
@@ -132,18 +132,13 @@ static int ihs_i2c_transfer(uchar chip, uchar *buffer, 
int len, bool read,
u16 data;
 #ifdef CONFIG_DM_I2C
struct ihs_i2c_priv *priv = dev_get_priv(dev);
-   struct udevice *fpga;
-
-   gdsys_soc_get_fpga(dev, &fpga);
 #endif
 
/* Clear interrupt status */
data = I2CINT_ERROR_EV | I2CINT_RECEIVE_EV | I2CINT_TRANSMIT_EV;
 #ifdef CONFIG_DM_I2C
-   fpgamap_write(fpga, priv->addr + REG_INTERRUPT_STATUS, &data,
- FPGAMAP_SIZE_16);
-   fpgamap_read(fpga, priv->addr + REG_INTERRUPT_STATUS, &val,
-FPGAMAP_SIZE_16);
+   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);
@@ -156,8 +151,7 @@ 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_write(fpga, priv->addr + REG_WRITE_MAILBOX_EXT, &val,
- FPGAMAP_SIZE_16);
+   ihs_i2c_set(priv->map, write_mailbox_ext, val);
 #else
I2C_SET_REG(write_mailbox_ext, val);
 #endif
@@ -170,8 +164,7 @@ static int ihs_i2c_transfer(uchar chip, uchar *buffer, int 
len, bool read,
   | (is_last ? 0 : I2CMB_HOLD_BUS);
 
 #ifdef CONFIG_DM_I2C
-   fpgamap_write(fpga, priv->addr + REG_WRITE_MAILBOX, &data,
- FPGAMAP_SIZE_16);
+   ihs_i2c_set(priv->map, write_mailbox, data);
 #else
I2C_SET_REG(write_mailbox, data);
 #endif
@@ -186,8 +179,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) {
 #ifdef CONFIG_DM_I2C
-   fpgamap_read(fpga, priv->addr + REG_READ_MAILBOX_EXT, &val,
-FPGAMAP_SIZE_16);
+   ihs_i2c_get(priv->map, read_mailbox_ext, &val);
 #else
I2C_GET_REG(read_mailbox_ext, &val);
 #endif
@@ -270,11 +262,8 @@ static int ihs_i2c_access(struct i2c_adapter *adap, uchar 
chip, u8 *addr,
 int ihs_i2c_probe(struct udevice *bus)
 {
struct ihs_i2c_priv *priv = dev_get_priv(bus);
-   int addr;
-
-   addr = dev_read_u32_default(bus, "reg", -1);
 
-   priv->addr = addr;
+   regmap_init_mem(dev_ofnode(bus), &priv->map);
 
return 0;
 }
-- 
2.20.1

___
U-Boot mailing list
U-Boot@lists.denx.de
https://list