Skip to contentSkip to conversation

ppc4xx: Fix problem with I2C bus >= 1 initialization

PATCH New Stefan Roese 2 participants 8 messages Mar 29, 2010 – Mar 30, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ppc4xx: Fix problem with I2C bus >= 1 initialization

This patch fixes a problem introduced with patch eb5eb2b0 [ppc4xx: Cleanup PPC4xx I2C infrastructure]. We need to assign the I2C base address to the "i2c" pointer inside of the controller loop. Otherwise controller 0 is initialized multiple times instead of initializing each I2C controller sequentially.

Tested on Katmai.

Cc Heiko Schocher <[email protected]>

---
Heiko, I just noticed that this PPC4xx I2C driver is still in the cpu/ppc4xx directory. I suggest that we move it into drivers/i2c after the next release. Is this ok for you? I can provide a patch for this soon.

Please let me know if you see any problems with this patch. I would really like to push it into this release, since it really is a bug fix.

Thanks.

 cpu/ppc4xx/i2c.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
cpu/ppc4xx/i2c.c +4 -1
index 7976e75..9b86187 100644
@@ -93,7 +93,7 @@ static void _i2c_bus_reset(void)
 
 void i2c_init(int speed, int slaveaddr)
 {
-	struct ppc4xx_i2c *i2c = (struct ppc4xx_i2c *)I2C_BASE_ADDR;
+	struct ppc4xx_i2c *i2c;
 	int val, divisor;
 	int bus;
 
@@ -109,6 +109,9 @@ void i2c_init(int speed, int slaveaddr)
 	for (bus = 0; bus < CONFIG_SYS_MAX_I2C_BUS; bus++) {
 		I2C_SET_BUS(bus);
 
+		/* Set i2c pointer after calling I2C_SET_BUS() */
+		i2c = (struct ppc4xx_i2c *)I2C_BASE_ADDR;
+
 		/* Handle possible failed I2C state */
 		/* FIXME: put this into i2c_init_board()? */
 		_i2c_bus_reset();
Signature · 1 line
1.7.0.3
#1 lore raw

PATCH 1/1 ppc4xx: Fix problem with I2C bus >= 1 initialization

Hello Stefan,

Quoted 8 lines · Stefan Roese

This patch fixes a problem introduced with patch eb5eb2b0 [ppc4xx: Cleanup PPC4xx I2C infrastructure]. We need to assign the I2C base address to the "i2c" pointer inside of the controller loop. Otherwise controller 0 is initialized multiple times instead of initializing each I2C controller sequentially.

Tested on Katmai.

Quoted 7 lines
Cc Heiko Schocher <[email protected]>

---
Heiko, I just noticed that this PPC4xx I2C driver is still in the cpu/ppc4xx directory. I suggest that we move it into drivers/i2c after the next release. Is this ok for you? I can provide a patch for this soon.

Yep, that would be the better place for it.
(Did this already in the multibus_v2 branch in
git://git.denx.de/u-boot-i2c.git)

Quoted 3 lines

Please let me know if you see any problems with this patch. I would really like to push it into this release, since it really is a bug fix.

It looks Ok for me.

bye
Heiko

Signature · 2 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
#2 lore raw

PATCH 1/1 ppc4xx: Fix problem with I2C bus >= 1 initialization

Hi Heiko,

Quoted 8 lines · On Monday 29 March 2010 15:43:50 Heiko Schocher wrote:
Quoted 4 lines

Heiko, I just noticed that this PPC4xx I2C driver is still in the cpu/ppc4xx directory. I suggest that we move it into drivers/i2c after the next release. Is this ok for you? I can provide a patch for this soon.

Yep, that would be the better place for it.
(Did this already in the multibus_v2 branch in
git://git.denx.de/u-boot-i2c.git)

OK, I'll send a moving patch for "next" soon.

Quoted 5 lines
Quoted 3 lines

Please let me know if you see any problems with this patch. I would really like to push it into this release, since it really is a bug fix.

It looks Ok for me.

Good. If nobody else objects, I'll push it into ppc4xx/master tomorrow and send a pull request to Wolfgang.

Cheers,
Stefan

--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: office at denx.de

#3 lore raw

PATCH 1/1 ppc4xx: Fix problem with I2C bus >= 1 initialization

Hello Stefan,

Quoted 10 lines · Stefan Roese
Quoted 7 lines · On Monday 29 March 2010 15:43:50 Heiko Schocher wrote:
Quoted 4 lines

Heiko, I just noticed that this PPC4xx I2C driver is still in the cpu/ppc4xx directory. I suggest that we move it into drivers/i2c after the next release. Is this ok for you? I can provide a patch for this soon.

Yep, that would be the better place for it.
(Did this already in the multibus_v2 branch in
git://git.denx.de/u-boot-i2c.git)

OK, I'll send a moving patch for "next" soon.

Great.

Quoted 7 lines
Quoted 4 lines
Quoted 3 lines

Please let me know if you see any problems with this patch. I would really like to push it into this release, since it really is a bug fix.

It looks Ok for me.

Good. If nobody else objects, I'll push it into ppc4xx/master tomorrow and send a pull request to Wolfgang.

Ah, I just wanted to send a pull request to Wolfgang, because I added it to i2c next ... is this Ok for you?

bye
Heiko

Signature · 2 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
#4 lore raw

PATCH 1/1 ppc4xx: Fix problem with I2C bus >= 1 initialization

Hi Heiko,

Quoted 11 lines · On Monday 29 March 2010 15:57:22 Heiko Schocher wrote:
Quoted 8 lines
Quoted 5 lines
Quoted 3 lines

Please let me know if you see any problems with this patch. I would really like to push it into this release, since it really is a bug fix.

It looks Ok for me.

Good. If nobody else objects, I'll push it into ppc4xx/master tomorrow and send a pull request to Wolfgang.

Ah, I just wanted to send a pull request to Wolfgang, because I added it to i2c next ... is this Ok for you?

It's supposed to go into "master" (bug fix). So if you plan to push it via your master branch, then it's fine with me.

Thanks.

Cheers,
Stefan

--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: office at denx.de

#5 lore raw

PATCH 1/1 ppc4xx: Fix problem with I2C bus >= 1 initialization

Hello Stefan,

Quoted 4 lines · Stefan Roese
Quoted 3 lines · On Monday 29 March 2010 15:57:22 Heiko Schocher wrote:
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines

Please let me know if you see any problems with this patch. I would really like to push it into this release, since it really is a bug fix.

Quoted 8 lines
Quoted 5 lines
Quoted 3 lines
Quoted 1 line

It looks Ok for me.

Good. If nobody else objects, I'll push it into ppc4xx/master tomorrow and send a pull request to Wolfgang.

Ah, I just wanted to send a pull request to Wolfgang, because I added it to i2c next ... is this Ok for you?

It's supposed to go into "master" (bug fix). So if you plan to push it via your master branch, then it's fine with me.

Of course ... Hmm.. I am fine with it, if you want to push this through ppc4xx/master, so you can add my:

bye,
Heiko

Signature · 2 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
#6 lore raw

PATCH 1/1 ppc4xx: Fix problem with I2C bus >= 1 initialization

Quoted 10 lines · On Monday 29 March 2010 16:56:32 Heiko Schocher wrote:
Quoted 5 lines
Quoted 2 lines

Ah, I just wanted to send a pull request to Wolfgang, because I added it to i2c next ... is this Ok for you?

It's supposed to go into "master" (bug fix). So if you plan to push it via your master branch, then it's fine with me.

Of course ... Hmm.. I am fine with it, if you want to push this through ppc4xx/master, so you can add my:

Thanks. I'll push it via ppc4xx/master tomorrow (if nobody objects).

Cheers,
Stefan

--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: office at denx.de

#7 lore raw

PATCH 1/1 ppc4xx: Fix problem with I2C bus >= 1 initialization

In reply to Stefan Roese
Quoted 7 lines · On Monday 29 March 2010 15:35:43 Stefan Roese wrote:

This patch fixes a problem introduced with patch eb5eb2b0 [ppc4xx: Cleanup PPC4xx I2C infrastructure]. We need to assign the I2C base address to the "i2c" pointer inside of the controller loop. Otherwise controller 0 is initialized multiple times instead of initializing each I2C controller sequentially.

Tested on Katmai.

Applied to u-boot-ppc4xx/master. Thanks.

Cheers,
Stefan

--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: office at denx.de