Message ID | 1423762636-18353-4-git-send-email-albert.aribaud@3adev.fr |
---|---|
State | Superseded |
Delegated to: | Albert ARIBAUD |
Headers | show |
Hello Albert, Am 12.02.2015 18:37, schrieb Albert ARIBAUD (3ADEV): > Signed-off-by: Albert ARIBAUD (3ADEV) <albert.aribaud@3adev.fr> > --- > > Changes in v2: None > > arch/arm/cpu/arm926ejs/lpc32xx/devices.c | 11 ++ > arch/arm/include/asm/arch-lpc32xx/clk.h | 4 + > arch/arm/include/asm/arch-lpc32xx/cpu.h | 2 + > arch/arm/include/asm/arch-lpc32xx/sys_proto.h | 1 + > drivers/i2c/Makefile | 1 + > drivers/i2c/lpc32xx_i2c.c | 249 ++++++++++++++++++++++++++ > 6 files changed, 268 insertions(+) > create mode 100644 drivers/i2c/lpc32xx_i2c.c Acked-by: Heiko Schocher <hs@denx.de> Do you have a chance to use DM on this HW? bye, Heiko > > diff --git a/arch/arm/cpu/arm926ejs/lpc32xx/devices.c b/arch/arm/cpu/arm926ejs/lpc32xx/devices.c > index be4c93d..81b53ea 100644 > --- a/arch/arm/cpu/arm926ejs/lpc32xx/devices.c > +++ b/arch/arm/cpu/arm926ejs/lpc32xx/devices.c > @@ -50,3 +50,14 @@ void lpc32xx_mlc_nand_init(void) > /* Enable NAND interface */ > writel(CLK_NAND_MLC | CLK_NAND_MLC_INT, &clk->flashclk_ctrl); > } > + > +void lpc32xx_i2c_init(unsigned int devnum) > +{ > + /* Enable I2C interface */ > + uint32_t ctrl = readl(&clk->i2cclk_ctrl); > + if (devnum == 1) > + ctrl |= CLK_I2C1_ENABLE; > + if (devnum == 2) > + ctrl |= CLK_I2C2_ENABLE; > + writel(ctrl, &clk->i2cclk_ctrl); > +} > diff --git a/arch/arm/include/asm/arch-lpc32xx/clk.h b/arch/arm/include/asm/arch-lpc32xx/clk.h > index bc7d33d..781ac07 100644 > --- a/arch/arm/include/asm/arch-lpc32xx/clk.h > +++ b/arch/arm/include/asm/arch-lpc32xx/clk.h > @@ -123,6 +123,10 @@ struct clk_pm_regs { > #define CLK_MAC_SLAVE (1 << 1) > #define CLK_MAC_REG (1 << 0) > > +/* I2C Clock Control Register bits */ > +#define CLK_I2C2_ENABLE (1 << 1) > +#define CLK_I2C1_ENABLE (1 << 0) > + > /* Timer Clock Control1 Register bits */ > #define CLK_TIMCLK_MOTOR (1 << 6) > #define CLK_TIMCLK_TIMER3 (1 << 5) > diff --git a/arch/arm/include/asm/arch-lpc32xx/cpu.h b/arch/arm/include/asm/arch-lpc32xx/cpu.h > index 199b4a0..1067107 100644 > --- a/arch/arm/include/asm/arch-lpc32xx/cpu.h > +++ b/arch/arm/include/asm/arch-lpc32xx/cpu.h > @@ -37,6 +37,8 @@ > #define UART4_BASE 0x40088000 /* UART 4 registers base */ > #define UART5_BASE 0x40090000 /* UART 5 registers base */ > #define UART6_BASE 0x40098000 /* UART 6 registers base */ > +#define I2C1_BASE 0x400A0000 /* I2C 1 registers base */ > +#define I2C2_BASE 0x400A8000 /* I2C 2 registers base */ > > /* External SDRAM Memory Bank base addresses */ > #define EMC_DYCS0_BASE 0x80000000 /* SDRAM DYCS0 base address */ > diff --git a/arch/arm/include/asm/arch-lpc32xx/sys_proto.h b/arch/arm/include/asm/arch-lpc32xx/sys_proto.h > index 0c4e712..a4a05d1 100644 > --- a/arch/arm/include/asm/arch-lpc32xx/sys_proto.h > +++ b/arch/arm/include/asm/arch-lpc32xx/sys_proto.h > @@ -10,5 +10,6 @@ > void lpc32xx_uart_init(unsigned int uart_id); > void lpc32xx_mac_init(void); > void lpc32xx_mlc_nand_init(void); > +void lpc32xx_i2c_init(unsigned int devnum); > > #endif /* _LPC32XX_SYS_PROTO_H */ > diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile > index 774bc94..26ea854 100644 > --- a/drivers/i2c/Makefile > +++ b/drivers/i2c/Makefile > @@ -20,6 +20,7 @@ obj-$(CONFIG_SYS_I2C_FSL) += fsl_i2c.o > obj-$(CONFIG_SYS_I2C_FTI2C010) += fti2c010.o > obj-$(CONFIG_SYS_I2C_IHS) += ihs_i2c.o > obj-$(CONFIG_SYS_I2C_KONA) += kona_i2c.o > +obj-$(CONFIG_SYS_I2C_LPC32XX) += lpc32xx_i2c.o > obj-$(CONFIG_SYS_I2C_MVTWSI) += mvtwsi.o > obj-$(CONFIG_SYS_I2C_MXC) += mxc_i2c.o > obj-$(CONFIG_SYS_I2C_MXS) += mxs_i2c.o > diff --git a/drivers/i2c/lpc32xx_i2c.c b/drivers/i2c/lpc32xx_i2c.c > new file mode 100644 > index 0000000..78d26e4 > --- /dev/null > +++ b/drivers/i2c/lpc32xx_i2c.c > @@ -0,0 +1,249 @@ > +/* > + * LPC32xx I2C interface driver > + * > + * (C) Copyright 2014 DENX Software Engineering GmbH > + * Written-by: Albert ARIBAUD - 3ADEV <albert.aribaud@3adev.fr> > + * > + * SPDX-License-Identifier: GPL-2.0+ > + */ > + > +#include <common.h> > +#include <asm/io.h> > +#include <i2c.h> > +#include <asm/errno.h> > +#include <asm/arch/clk.h> > + > +/* > + * Provide default speed and slave if target did not > + */ > + > +#if !defined(CONFIG_SYS_I2C_LPC32XX_SPEED) > +#define CONFIG_SYS_I2C_LPC32XX_SPEED 350000 > +#endif > + > +#if !defined(CONFIG_SYS_I2C_LPC32XX_SLAVE) > +#define CONFIG_SYS_I2C_LPC32XX_SLAVE 0 > +#endif > + > +/* i2c register set */ > +struct lpc32xx_i2c_registers { > + union { > + u32 rx; > + u32 tx; > + }; > + u32 stat; > + u32 ctrl; > + u32 clk_hi; > + u32 clk_lo; > + u32 adr; > + u32 rxfl; > + u32 txfl; > + u32 rxb; > + u32 txb; > + u32 stx; > + u32 stxfl; > +}; > + > +/* TX register fields */ > +#define LPC32XX_I2C_TX_START 0x00000100 > +#define LPC32XX_I2C_TX_STOP 0x00000200 > + > +/* Control register values */ > +#define LPC32XX_I2C_SOFT_RESET 0x00000100 > + > +/* Status register values */ > +#define LPC32XX_I2C_STAT_TFF 0x00000400 > +#define LPC32XX_I2C_STAT_RFE 0x00000200 > +#define LPC32XX_I2C_STAT_DRMI 0x00000008 > +#define LPC32XX_I2C_STAT_NAI 0x00000004 > +#define LPC32XX_I2C_STAT_TDI 0x00000001 > + > +static struct lpc32xx_i2c_registers *lpc32xx_i2c[] = { > + (struct lpc32xx_i2c_registers *)I2C1_BASE, > + (struct lpc32xx_i2c_registers *)I2C2_BASE > +}; > + > +/* Set I2C bus speed */ > +static unsigned int lpc32xx_i2c_set_bus_speed(struct i2c_adapter *adap, > + unsigned int speed) > +{ > + int half_period; > + > + if (speed == 0) > + return -EINVAL; > + > + half_period = (105000000 / speed) / 2; > + > + if ((half_period > 255) || (half_period < 0)) > + return -EINVAL; > + > + writel(half_period, &lpc32xx_i2c[adap->hwadapnr]->clk_hi); > + writel(half_period, &lpc32xx_i2c[adap->hwadapnr]->clk_lo); > + return 0; > +} > + > +/* I2C init called by cmd_i2c when doing 'i2c reset'. */ > +static void _i2c_init(struct i2c_adapter *adap, > + int requested_speed, int slaveadd) > +{ > + struct lpc32xx_i2c_registers *i2c = lpc32xx_i2c[adap->hwadapnr]; > + > + /* soft reset (auto-clears) */ > + writel(LPC32XX_I2C_SOFT_RESET, &i2c->ctrl); > + /* set HI and LO periods for about 350 kHz */ > + lpc32xx_i2c_set_bus_speed(adap, requested_speed); > +} > + > +/* I2C probe called by cmd_i2c when doing 'i2c probe'. */ > +static int lpc32xx_i2c_probe(struct i2c_adapter *adap, u8 dev) > +{ > + struct lpc32xx_i2c_registers *i2c = lpc32xx_i2c[adap->hwadapnr]; > + int stat; > + > + /* Soft-reset the controller */ > + writel(LPC32XX_I2C_SOFT_RESET, &i2c->ctrl); > + while (readl(&i2c->ctrl) & LPC32XX_I2C_SOFT_RESET) > + ; > + /* Addre slave for write with start before and stop after */ > + writel((dev<<1) | LPC32XX_I2C_TX_START | LPC32XX_I2C_TX_STOP, > + &i2c->tx); > + /* wait for end of transation */ > + while (!((stat = readl(&i2c->stat)) & LPC32XX_I2C_STAT_TDI)) > + ; > + /* was there no acknowledge? */ > + return (stat & LPC32XX_I2C_STAT_NAI) ? -1 : 0; > +} > + > +/* > + * I2C read called by cmd_i2c when doing 'i2c read' and by cmd_eeprom.c > + * Begin write, send address byte(s), begin read, receive data bytes, end. > + */ > +static int lpc32xx_i2c_read(struct i2c_adapter *adap, u8 dev, uint addr, > + int alen, u8 *data, int length) > +{ > + struct lpc32xx_i2c_registers *i2c = lpc32xx_i2c[adap->hwadapnr]; > + int stat, wlen; > + > + /* Soft-reset the controller */ > + writel(LPC32XX_I2C_SOFT_RESET, &i2c->ctrl); > + while (readl(&i2c->ctrl) & LPC32XX_I2C_SOFT_RESET) > + ; > + /* do we need to write an address at all? */ > + if (alen) { > + /* Address slave in write mode */ > + writel((dev<<1) | LPC32XX_I2C_TX_START, &i2c->tx); > + /* write address bytes */ > + while (alen--) { > + /* compute address byte + stop for the last one */ > + int a = (addr >> (8 * alen)) & 0xff; > + if (!alen) > + a |= LPC32XX_I2C_TX_STOP; > + /* Send address byte */ > + writel(a, &i2c->tx); > + } > + /* wait for end of transation */ > + while (!((stat = readl(&i2c->stat)) & LPC32XX_I2C_STAT_TDI)) > + ; > + /* clear end-of-transaction flag */ > + writel(1, &i2c->stat); > + } > + /* do we have to read data at all? */ > + if (length) { > + /* Address slave in read mode */ > + writel(1 | (dev<<1) | LPC32XX_I2C_TX_START, &i2c->tx); > + wlen = length; > + /* get data */ > + while (length | wlen) { > + /* read status for TFF and RFE */ > + stat = readl(&i2c->stat); > + /* must we, can we write a trigger byte? */ > + if ((wlen > 0) > + & (!(stat & LPC32XX_I2C_STAT_TFF))) { > + wlen--; > + /* write trigger byte + stop if last */ > + writel(wlen ? 0 : > + LPC32XX_I2C_TX_STOP, &i2c->tx); > + } > + /* must we, can we read a data byte? */ > + if ((length > 0) > + & (!(stat & LPC32XX_I2C_STAT_RFE))) { > + length--; > + /* read byte */ > + *(data++) = readl(&i2c->rx); > + } > + } > + } > + /* wait for end of transation */ > + while (!((stat = readl(&i2c->stat)) & LPC32XX_I2C_STAT_TDI)) > + ; > + /* clear end-of-transaction flag */ > + writel(1, &i2c->stat); > + /* success */ > + return 0; > +} > + > +/* > + * I2C write called by cmd_i2c when doing 'i2c write' and by cmd_eeprom.c > + * Begin write, send address byte(s), send data bytes, end. > + */ > +static int lpc32xx_i2c_write(struct i2c_adapter *adap, u8 dev, uint addr, > + int alen, u8 *data, int length) > +{ > + struct lpc32xx_i2c_registers *i2c = lpc32xx_i2c[adap->hwadapnr]; > + int stat; > + > + /* Soft-reset the controller */ > + writel(LPC32XX_I2C_SOFT_RESET, &i2c->ctrl); > + while (readl(&i2c->ctrl) & LPC32XX_I2C_SOFT_RESET) > + ; > + /* do we need to write anything at all? */ > + if (alen | length) > + /* Address slave in write mode */ > + writel((dev<<1) | LPC32XX_I2C_TX_START, &i2c->tx); > + /* write address bytes */ > + while (alen) { > + /* wait for transmit fifo not full */ > + stat = readl(&i2c->stat); > + if (!(stat & LPC32XX_I2C_STAT_TFF)) { > + alen--; > + int a = (addr >> (8 * alen)) & 0xff; > + if (!(alen | length)) > + a |= LPC32XX_I2C_TX_STOP; > + /* Send address byte */ > + writel(a, &i2c->tx); > + } > + } > + while (length) { > + /* wait for transmit fifo not full */ > + stat = readl(&i2c->stat); > + if (!(stat & LPC32XX_I2C_STAT_TFF)) { > + /* compute data byte, add stop if length==0 */ > + length--; > + int d = *(data++); > + if (!length) > + d |= LPC32XX_I2C_TX_STOP; > + /* Send data byte */ > + writel(d, &i2c->tx); > + } > + } > + /* wait for end of transation */ > + while (!((stat = readl(&i2c->stat)) & LPC32XX_I2C_STAT_TDI)) > + ; > + /* clear end-of-transaction flag */ > + writel(1, &i2c->stat); > + return 0; > +} > + > +U_BOOT_I2C_ADAP_COMPLETE(lpc32xx_0, _i2c_init, lpc32xx_i2c_probe, > + lpc32xx_i2c_read, lpc32xx_i2c_write, > + lpc32xx_i2c_set_bus_speed, > + CONFIG_SYS_I2C_LPC32XX_SPEED, > + CONFIG_SYS_I2C_LPC32XX_SLAVE, > + 0) > + > +U_BOOT_I2C_ADAP_COMPLETE(lpc32xx_1, _i2c_init, lpc32xx_i2c_probe, > + lpc32xx_i2c_read, lpc32xx_i2c_write, > + lpc32xx_i2c_set_bus_speed, > + CONFIG_SYS_I2C_LPC32XX_SPEED, > + CONFIG_SYS_I2C_LPC32XX_SLAVE, > + 1) >
Hi Heiko, Le Fri, 13 Feb 2015 11:48:26 +0100, Heiko Schocher <hs@denx.de> a écrit : > Hello Albert, > > Am 12.02.2015 18:37, schrieb Albert ARIBAUD (3ADEV): > > Signed-off-by: Albert ARIBAUD (3ADEV) <albert.aribaud@3adev.fr> > > --- > > > > Changes in v2: None > > > > arch/arm/cpu/arm926ejs/lpc32xx/devices.c | 11 ++ > > arch/arm/include/asm/arch-lpc32xx/clk.h | 4 + > > arch/arm/include/asm/arch-lpc32xx/cpu.h | 2 + > > arch/arm/include/asm/arch-lpc32xx/sys_proto.h | 1 + > > drivers/i2c/Makefile | 1 + > > drivers/i2c/lpc32xx_i2c.c | 249 ++++++++++++++++++++++++++ > > 6 files changed, 268 insertions(+) > > create mode 100644 drivers/i2c/lpc32xx_i2c.c > > Acked-by: Heiko Schocher <hs@denx.de> > > Do you have a chance to use DM on this HW? I am using it for GPIOs already. I guess you would like I2C to use it too? > bye, > Heiko Cordialement, Albert ARIBAUD 3ADEV
Hello Albert, Am 13.02.2015 12:09, schrieb Albert ARIBAUD: > Hi Heiko, > > Le Fri, 13 Feb 2015 11:48:26 +0100, Heiko Schocher <hs@denx.de> a > écrit : > >> Hello Albert, >> >> Am 12.02.2015 18:37, schrieb Albert ARIBAUD (3ADEV): >>> Signed-off-by: Albert ARIBAUD (3ADEV) <albert.aribaud@3adev.fr> >>> --- >>> >>> Changes in v2: None >>> >>> arch/arm/cpu/arm926ejs/lpc32xx/devices.c | 11 ++ >>> arch/arm/include/asm/arch-lpc32xx/clk.h | 4 + >>> arch/arm/include/asm/arch-lpc32xx/cpu.h | 2 + >>> arch/arm/include/asm/arch-lpc32xx/sys_proto.h | 1 + >>> drivers/i2c/Makefile | 1 + >>> drivers/i2c/lpc32xx_i2c.c | 249 ++++++++++++++++++++++++++ >>> 6 files changed, 268 insertions(+) >>> create mode 100644 drivers/i2c/lpc32xx_i2c.c >> >> Acked-by: Heiko Schocher <hs@denx.de> >> >> Do you have a chance to use DM on this HW? > > I am using it for GPIOs already. I guess you would like I2C to use it > too? Yes, if it is possible for you to convert the driver to it, that would be great! DM is the future ;-) bye, Heiko
Hi Albert, On 13 February 2015 at 04:20, Heiko Schocher <hs@denx.de> wrote: > Hello Albert, > > Am 13.02.2015 12:09, schrieb Albert ARIBAUD: >> >> Hi Heiko, >> >> Le Fri, 13 Feb 2015 11:48:26 +0100, Heiko Schocher <hs@denx.de> a >> écrit : >> >>> Hello Albert, >>> >>> Am 12.02.2015 18:37, schrieb Albert ARIBAUD (3ADEV): >>>> >>>> Signed-off-by: Albert ARIBAUD (3ADEV) <albert.aribaud@3adev.fr> >>>> --- >>>> >>>> Changes in v2: None >>>> >>>> arch/arm/cpu/arm926ejs/lpc32xx/devices.c | 11 ++ >>>> arch/arm/include/asm/arch-lpc32xx/clk.h | 4 + >>>> arch/arm/include/asm/arch-lpc32xx/cpu.h | 2 + >>>> arch/arm/include/asm/arch-lpc32xx/sys_proto.h | 1 + >>>> drivers/i2c/Makefile | 1 + >>>> drivers/i2c/lpc32xx_i2c.c | 249 >>>> ++++++++++++++++++++++++++ >>>> 6 files changed, 268 insertions(+) >>>> create mode 100644 drivers/i2c/lpc32xx_i2c.c >>> >>> >>> Acked-by: Heiko Schocher <hs@denx.de> >>> >>> Do you have a chance to use DM on this HW? >> >> >> I am using it for GPIOs already. I guess you would like I2C to use it >> too? > > > Yes, if it is possible for you to convert the driver to it, that would > be great! > > DM is the future ;-) It is fairly straightforward for I2C now. There is no detailed documentation but i2c.h explains the methods and you can see examples with tegra, sandbox and samsung (s3c24x0.c). Regards, Simon
diff --git a/arch/arm/cpu/arm926ejs/lpc32xx/devices.c b/arch/arm/cpu/arm926ejs/lpc32xx/devices.c index be4c93d..81b53ea 100644 --- a/arch/arm/cpu/arm926ejs/lpc32xx/devices.c +++ b/arch/arm/cpu/arm926ejs/lpc32xx/devices.c @@ -50,3 +50,14 @@ void lpc32xx_mlc_nand_init(void) /* Enable NAND interface */ writel(CLK_NAND_MLC | CLK_NAND_MLC_INT, &clk->flashclk_ctrl); } + +void lpc32xx_i2c_init(unsigned int devnum) +{ + /* Enable I2C interface */ + uint32_t ctrl = readl(&clk->i2cclk_ctrl); + if (devnum == 1) + ctrl |= CLK_I2C1_ENABLE; + if (devnum == 2) + ctrl |= CLK_I2C2_ENABLE; + writel(ctrl, &clk->i2cclk_ctrl); +} diff --git a/arch/arm/include/asm/arch-lpc32xx/clk.h b/arch/arm/include/asm/arch-lpc32xx/clk.h index bc7d33d..781ac07 100644 --- a/arch/arm/include/asm/arch-lpc32xx/clk.h +++ b/arch/arm/include/asm/arch-lpc32xx/clk.h @@ -123,6 +123,10 @@ struct clk_pm_regs { #define CLK_MAC_SLAVE (1 << 1) #define CLK_MAC_REG (1 << 0) +/* I2C Clock Control Register bits */ +#define CLK_I2C2_ENABLE (1 << 1) +#define CLK_I2C1_ENABLE (1 << 0) + /* Timer Clock Control1 Register bits */ #define CLK_TIMCLK_MOTOR (1 << 6) #define CLK_TIMCLK_TIMER3 (1 << 5) diff --git a/arch/arm/include/asm/arch-lpc32xx/cpu.h b/arch/arm/include/asm/arch-lpc32xx/cpu.h index 199b4a0..1067107 100644 --- a/arch/arm/include/asm/arch-lpc32xx/cpu.h +++ b/arch/arm/include/asm/arch-lpc32xx/cpu.h @@ -37,6 +37,8 @@ #define UART4_BASE 0x40088000 /* UART 4 registers base */ #define UART5_BASE 0x40090000 /* UART 5 registers base */ #define UART6_BASE 0x40098000 /* UART 6 registers base */ +#define I2C1_BASE 0x400A0000 /* I2C 1 registers base */ +#define I2C2_BASE 0x400A8000 /* I2C 2 registers base */ /* External SDRAM Memory Bank base addresses */ #define EMC_DYCS0_BASE 0x80000000 /* SDRAM DYCS0 base address */ diff --git a/arch/arm/include/asm/arch-lpc32xx/sys_proto.h b/arch/arm/include/asm/arch-lpc32xx/sys_proto.h index 0c4e712..a4a05d1 100644 --- a/arch/arm/include/asm/arch-lpc32xx/sys_proto.h +++ b/arch/arm/include/asm/arch-lpc32xx/sys_proto.h @@ -10,5 +10,6 @@ void lpc32xx_uart_init(unsigned int uart_id); void lpc32xx_mac_init(void); void lpc32xx_mlc_nand_init(void); +void lpc32xx_i2c_init(unsigned int devnum); #endif /* _LPC32XX_SYS_PROTO_H */ diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile index 774bc94..26ea854 100644 --- a/drivers/i2c/Makefile +++ b/drivers/i2c/Makefile @@ -20,6 +20,7 @@ obj-$(CONFIG_SYS_I2C_FSL) += fsl_i2c.o obj-$(CONFIG_SYS_I2C_FTI2C010) += fti2c010.o obj-$(CONFIG_SYS_I2C_IHS) += ihs_i2c.o obj-$(CONFIG_SYS_I2C_KONA) += kona_i2c.o +obj-$(CONFIG_SYS_I2C_LPC32XX) += lpc32xx_i2c.o obj-$(CONFIG_SYS_I2C_MVTWSI) += mvtwsi.o obj-$(CONFIG_SYS_I2C_MXC) += mxc_i2c.o obj-$(CONFIG_SYS_I2C_MXS) += mxs_i2c.o diff --git a/drivers/i2c/lpc32xx_i2c.c b/drivers/i2c/lpc32xx_i2c.c new file mode 100644 index 0000000..78d26e4 --- /dev/null +++ b/drivers/i2c/lpc32xx_i2c.c @@ -0,0 +1,249 @@ +/* + * LPC32xx I2C interface driver + * + * (C) Copyright 2014 DENX Software Engineering GmbH + * Written-by: Albert ARIBAUD - 3ADEV <albert.aribaud@3adev.fr> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> +#include <asm/io.h> +#include <i2c.h> +#include <asm/errno.h> +#include <asm/arch/clk.h> + +/* + * Provide default speed and slave if target did not + */ + +#if !defined(CONFIG_SYS_I2C_LPC32XX_SPEED) +#define CONFIG_SYS_I2C_LPC32XX_SPEED 350000 +#endif + +#if !defined(CONFIG_SYS_I2C_LPC32XX_SLAVE) +#define CONFIG_SYS_I2C_LPC32XX_SLAVE 0 +#endif + +/* i2c register set */ +struct lpc32xx_i2c_registers { + union { + u32 rx; + u32 tx; + }; + u32 stat; + u32 ctrl; + u32 clk_hi; + u32 clk_lo; + u32 adr; + u32 rxfl; + u32 txfl; + u32 rxb; + u32 txb; + u32 stx; + u32 stxfl; +}; + +/* TX register fields */ +#define LPC32XX_I2C_TX_START 0x00000100 +#define LPC32XX_I2C_TX_STOP 0x00000200 + +/* Control register values */ +#define LPC32XX_I2C_SOFT_RESET 0x00000100 + +/* Status register values */ +#define LPC32XX_I2C_STAT_TFF 0x00000400 +#define LPC32XX_I2C_STAT_RFE 0x00000200 +#define LPC32XX_I2C_STAT_DRMI 0x00000008 +#define LPC32XX_I2C_STAT_NAI 0x00000004 +#define LPC32XX_I2C_STAT_TDI 0x00000001 + +static struct lpc32xx_i2c_registers *lpc32xx_i2c[] = { + (struct lpc32xx_i2c_registers *)I2C1_BASE, + (struct lpc32xx_i2c_registers *)I2C2_BASE +}; + +/* Set I2C bus speed */ +static unsigned int lpc32xx_i2c_set_bus_speed(struct i2c_adapter *adap, + unsigned int speed) +{ + int half_period; + + if (speed == 0) + return -EINVAL; + + half_period = (105000000 / speed) / 2; + + if ((half_period > 255) || (half_period < 0)) + return -EINVAL; + + writel(half_period, &lpc32xx_i2c[adap->hwadapnr]->clk_hi); + writel(half_period, &lpc32xx_i2c[adap->hwadapnr]->clk_lo); + return 0; +} + +/* I2C init called by cmd_i2c when doing 'i2c reset'. */ +static void _i2c_init(struct i2c_adapter *adap, + int requested_speed, int slaveadd) +{ + struct lpc32xx_i2c_registers *i2c = lpc32xx_i2c[adap->hwadapnr]; + + /* soft reset (auto-clears) */ + writel(LPC32XX_I2C_SOFT_RESET, &i2c->ctrl); + /* set HI and LO periods for about 350 kHz */ + lpc32xx_i2c_set_bus_speed(adap, requested_speed); +} + +/* I2C probe called by cmd_i2c when doing 'i2c probe'. */ +static int lpc32xx_i2c_probe(struct i2c_adapter *adap, u8 dev) +{ + struct lpc32xx_i2c_registers *i2c = lpc32xx_i2c[adap->hwadapnr]; + int stat; + + /* Soft-reset the controller */ + writel(LPC32XX_I2C_SOFT_RESET, &i2c->ctrl); + while (readl(&i2c->ctrl) & LPC32XX_I2C_SOFT_RESET) + ; + /* Addre slave for write with start before and stop after */ + writel((dev<<1) | LPC32XX_I2C_TX_START | LPC32XX_I2C_TX_STOP, + &i2c->tx); + /* wait for end of transation */ + while (!((stat = readl(&i2c->stat)) & LPC32XX_I2C_STAT_TDI)) + ; + /* was there no acknowledge? */ + return (stat & LPC32XX_I2C_STAT_NAI) ? -1 : 0; +} + +/* + * I2C read called by cmd_i2c when doing 'i2c read' and by cmd_eeprom.c + * Begin write, send address byte(s), begin read, receive data bytes, end. + */ +static int lpc32xx_i2c_read(struct i2c_adapter *adap, u8 dev, uint addr, + int alen, u8 *data, int length) +{ + struct lpc32xx_i2c_registers *i2c = lpc32xx_i2c[adap->hwadapnr]; + int stat, wlen; + + /* Soft-reset the controller */ + writel(LPC32XX_I2C_SOFT_RESET, &i2c->ctrl); + while (readl(&i2c->ctrl) & LPC32XX_I2C_SOFT_RESET) + ; + /* do we need to write an address at all? */ + if (alen) { + /* Address slave in write mode */ + writel((dev<<1) | LPC32XX_I2C_TX_START, &i2c->tx); + /* write address bytes */ + while (alen--) { + /* compute address byte + stop for the last one */ + int a = (addr >> (8 * alen)) & 0xff; + if (!alen) + a |= LPC32XX_I2C_TX_STOP; + /* Send address byte */ + writel(a, &i2c->tx); + } + /* wait for end of transation */ + while (!((stat = readl(&i2c->stat)) & LPC32XX_I2C_STAT_TDI)) + ; + /* clear end-of-transaction flag */ + writel(1, &i2c->stat); + } + /* do we have to read data at all? */ + if (length) { + /* Address slave in read mode */ + writel(1 | (dev<<1) | LPC32XX_I2C_TX_START, &i2c->tx); + wlen = length; + /* get data */ + while (length | wlen) { + /* read status for TFF and RFE */ + stat = readl(&i2c->stat); + /* must we, can we write a trigger byte? */ + if ((wlen > 0) + & (!(stat & LPC32XX_I2C_STAT_TFF))) { + wlen--; + /* write trigger byte + stop if last */ + writel(wlen ? 0 : + LPC32XX_I2C_TX_STOP, &i2c->tx); + } + /* must we, can we read a data byte? */ + if ((length > 0) + & (!(stat & LPC32XX_I2C_STAT_RFE))) { + length--; + /* read byte */ + *(data++) = readl(&i2c->rx); + } + } + } + /* wait for end of transation */ + while (!((stat = readl(&i2c->stat)) & LPC32XX_I2C_STAT_TDI)) + ; + /* clear end-of-transaction flag */ + writel(1, &i2c->stat); + /* success */ + return 0; +} + +/* + * I2C write called by cmd_i2c when doing 'i2c write' and by cmd_eeprom.c + * Begin write, send address byte(s), send data bytes, end. + */ +static int lpc32xx_i2c_write(struct i2c_adapter *adap, u8 dev, uint addr, + int alen, u8 *data, int length) +{ + struct lpc32xx_i2c_registers *i2c = lpc32xx_i2c[adap->hwadapnr]; + int stat; + + /* Soft-reset the controller */ + writel(LPC32XX_I2C_SOFT_RESET, &i2c->ctrl); + while (readl(&i2c->ctrl) & LPC32XX_I2C_SOFT_RESET) + ; + /* do we need to write anything at all? */ + if (alen | length) + /* Address slave in write mode */ + writel((dev<<1) | LPC32XX_I2C_TX_START, &i2c->tx); + /* write address bytes */ + while (alen) { + /* wait for transmit fifo not full */ + stat = readl(&i2c->stat); + if (!(stat & LPC32XX_I2C_STAT_TFF)) { + alen--; + int a = (addr >> (8 * alen)) & 0xff; + if (!(alen | length)) + a |= LPC32XX_I2C_TX_STOP; + /* Send address byte */ + writel(a, &i2c->tx); + } + } + while (length) { + /* wait for transmit fifo not full */ + stat = readl(&i2c->stat); + if (!(stat & LPC32XX_I2C_STAT_TFF)) { + /* compute data byte, add stop if length==0 */ + length--; + int d = *(data++); + if (!length) + d |= LPC32XX_I2C_TX_STOP; + /* Send data byte */ + writel(d, &i2c->tx); + } + } + /* wait for end of transation */ + while (!((stat = readl(&i2c->stat)) & LPC32XX_I2C_STAT_TDI)) + ; + /* clear end-of-transaction flag */ + writel(1, &i2c->stat); + return 0; +} + +U_BOOT_I2C_ADAP_COMPLETE(lpc32xx_0, _i2c_init, lpc32xx_i2c_probe, + lpc32xx_i2c_read, lpc32xx_i2c_write, + lpc32xx_i2c_set_bus_speed, + CONFIG_SYS_I2C_LPC32XX_SPEED, + CONFIG_SYS_I2C_LPC32XX_SLAVE, + 0) + +U_BOOT_I2C_ADAP_COMPLETE(lpc32xx_1, _i2c_init, lpc32xx_i2c_probe, + lpc32xx_i2c_read, lpc32xx_i2c_write, + lpc32xx_i2c_set_bus_speed, + CONFIG_SYS_I2C_LPC32XX_SPEED, + CONFIG_SYS_I2C_LPC32XX_SLAVE, + 1)
Signed-off-by: Albert ARIBAUD (3ADEV) <albert.aribaud@3adev.fr> --- Changes in v2: None arch/arm/cpu/arm926ejs/lpc32xx/devices.c | 11 ++ arch/arm/include/asm/arch-lpc32xx/clk.h | 4 + arch/arm/include/asm/arch-lpc32xx/cpu.h | 2 + arch/arm/include/asm/arch-lpc32xx/sys_proto.h | 1 + drivers/i2c/Makefile | 1 + drivers/i2c/lpc32xx_i2c.c | 249 ++++++++++++++++++++++++++ 6 files changed, 268 insertions(+) create mode 100644 drivers/i2c/lpc32xx_i2c.c