| Message ID | 1494642810-22796-2-git-send-email-trini@konsulko.com |
|---|---|
| State | Accepted |
| Commit | 8f339d23460fd5a0231d080a26e8749de77a9c9f |
| Delegated to: | Tom Rini |
| Headers | show |
Hello Tom, Am 13.05.2017 um 04:33 schrieb Tom Rini: > We have nothing defining CONFIG_OMAP243X since we dropped the omap243x > platforms, drop these tests. > > Signed-off-by: Tom Rini <trini@konsulko.com> > --- > drivers/i2c/omap24xx_i2c.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) as you have delegated this patch to your Patchwork ToDo list: Acked-by: Heiko Schocher <hs@denx.de> bye, Heiko > > diff --git a/drivers/i2c/omap24xx_i2c.c b/drivers/i2c/omap24xx_i2c.c > index a23737ab7813..4b8397a890d6 100644 > --- a/drivers/i2c/omap24xx_i2c.c > +++ b/drivers/i2c/omap24xx_i2c.c > @@ -122,7 +122,7 @@ static int wait_for_bb(struct i2c *i2c_base, int waitdelay) > u16 stat; > > writew(0xFFFF, &i2c_base->stat); /* clear current interrupts...*/ > -#if defined(CONFIG_OMAP243X) || defined(CONFIG_OMAP34XX) > +#if defined(CONFIG_OMAP34XX) > while ((stat = readw(&i2c_base->stat) & I2C_STAT_BB) && timeout--) { > #else > /* Read RAW status */ > @@ -153,7 +153,7 @@ static u16 wait_for_event(struct i2c *i2c_base, int waitdelay) > > do { > udelay(waitdelay); > -#if defined(CONFIG_OMAP243X) || defined(CONFIG_OMAP34XX) > +#if defined(CONFIG_OMAP34XX) > status = readw(&i2c_base->stat); > #else > /* Read RAW status */ > @@ -338,7 +338,7 @@ retry: > /* own address */ > writew(slaveadd, &i2c_base->oa); > > -#if defined(CONFIG_OMAP243X) || defined(CONFIG_OMAP34XX) > +#if defined(CONFIG_OMAP34XX) > /* > * Have to enable interrupts for OMAP2/3, these IPs don't have > * an 'irqstatus_raw' register and we shall have to poll 'stat' >
On Fri, May 12, 2017 at 10:33:15PM -0400, Tom Rini wrote: > We have nothing defining CONFIG_OMAP243X since we dropped the omap243x > platforms, drop these tests. > > Signed-off-by: Tom Rini <trini@konsulko.com> > Acked-by: Heiko Schocher <hs@denx.de> Applied to u-boot/master, thanks!
diff --git a/drivers/i2c/omap24xx_i2c.c b/drivers/i2c/omap24xx_i2c.c index a23737ab7813..4b8397a890d6 100644 --- a/drivers/i2c/omap24xx_i2c.c +++ b/drivers/i2c/omap24xx_i2c.c @@ -122,7 +122,7 @@ static int wait_for_bb(struct i2c *i2c_base, int waitdelay) u16 stat; writew(0xFFFF, &i2c_base->stat); /* clear current interrupts...*/ -#if defined(CONFIG_OMAP243X) || defined(CONFIG_OMAP34XX) +#if defined(CONFIG_OMAP34XX) while ((stat = readw(&i2c_base->stat) & I2C_STAT_BB) && timeout--) { #else /* Read RAW status */ @@ -153,7 +153,7 @@ static u16 wait_for_event(struct i2c *i2c_base, int waitdelay) do { udelay(waitdelay); -#if defined(CONFIG_OMAP243X) || defined(CONFIG_OMAP34XX) +#if defined(CONFIG_OMAP34XX) status = readw(&i2c_base->stat); #else /* Read RAW status */ @@ -338,7 +338,7 @@ retry: /* own address */ writew(slaveadd, &i2c_base->oa); -#if defined(CONFIG_OMAP243X) || defined(CONFIG_OMAP34XX) +#if defined(CONFIG_OMAP34XX) /* * Have to enable interrupts for OMAP2/3, these IPs don't have * an 'irqstatus_raw' register and we shall have to poll 'stat'
We have nothing defining CONFIG_OMAP243X since we dropped the omap243x platforms, drop these tests. Signed-off-by: Tom Rini <trini@konsulko.com> --- drivers/i2c/omap24xx_i2c.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)