i2c, ppc4xx: fix compiling KAREF and METROBOX boards.
PATCH 1/1 i2c, ppc4xx: fix compiling KAREF and METROBOX boards.
commit eb5eb2b0f744f0cba405160c5d01335c40f09acf
ppc4xx: Cleanup PPC4xx I2C infrastructure
This patch cleans up the PPC4xx I2C intrastructure:
- Use C struct to describe the I2C registers instead of defines
- Coding style cleanup (braces, whitespace, comments, line length)
- Extract common code from i2c_read() and i2c_write()
- Remove unneeded IIC defines from ppc405.h & ppc440.h
breaks comiling for the KAREF and METROBOX boards.
This patch fixes this issue.
---
based against git://git.denx.de/u-boot.git next
board/sandburst/common/ppc440gx_i2c.c | 73 +++++++++++++++++---------------- board/sandburst/common/ppc440gx_i2c.h | 30 +++++++------- 2 files changed, 53 insertions(+), 50 deletions(-)
board/sandburst/common/ppc440gx_i2c.c +38 -35
@@ -31,6 +31,7 @@#include <i2c.h> #include <command.h> #include "ppc440gx_i2c.h" +#include <asm-ppc/io.h> #ifdef CONFIG_I2C_BUS1
@@ -47,16 +48,18 @@static uchar i2c_no_probes[] =CONFIG_SYS_I2C_NOPROBES ;#endif +static struct ppc4xx_i2c *i2c = (struct ppc4xx_i2c *)I2C_REGISTERS_BUS1_BASE_ADDRESS ; +static void _i2c_bus1_reset (void ) {int i, status;/* Reset status register */ /* write 1 in SCMP and IRQA to clear these fields */ -out8 (IIC_STS1 ,0x0A ); +out_8 (IIC_STS1 ,0x0A );/* write 1 in IRQP IRQD LA ICT XFRA to clear these fields */ -out8 (IIC_EXTSTS1 ,0x8F ); +out_8 (IIC_EXTSTS1 ,0x8F ); __asm__volatile ("eieio" );/*
@@ -66,36 +69,36 @@ static void _i2c_bus1_reset (void) i =10 ;do {/* Get status */ - status =in8 (IIC_STS1 ); + status =in_8 (IIC_STS1 );udelay (500 );/* 500us */ i--; }while ((status &IIC_STS_PT ) && (i >0 ));/* Soft reset controller */ - status =in8 (IIC_XTCNTLSS1 ); -out8 (IIC_XTCNTLSS1 , (status |IIC_XTCNTLSS_SRST )); + status =in_8 (IIC_XTCNTLSS1 ); +out_8 (IIC_XTCNTLSS1 , (status |IIC_XTCNTLSS_SRST )); __asm__volatile ("eieio" );/* make sure where in initial state, data hi, clock hi */ -out8 (IIC_DIRECTCNTL1 ,0xC ); +out_8 (IIC_DIRECTCNTL1 ,0xC );for (i =0 ; i <10 ; i++) { -if ((in8 (IIC_DIRECTCNTL1 ) &0x3 ) !=0x3 ) { +if ((in_8 (IIC_DIRECTCNTL1 ) &0x3 ) !=0x3 ) {/* clock until we get to known state */ -out8 (IIC_DIRECTCNTL1 ,0x8 );/* clock lo */ +out_8 (IIC_DIRECTCNTL1 ,0x8 );/* clock lo */ udelay (100 );/* 100us */ -out8 (IIC_DIRECTCNTL1 ,0xC );/* clock hi */ +out_8 (IIC_DIRECTCNTL1 ,0xC );/* clock hi */ udelay (100 );/* 100us */ }else {break ; } }/* send start condition */ -out8 (IIC_DIRECTCNTL1 ,0x4 ); +out_8 (IIC_DIRECTCNTL1 ,0x4 );udelay (1000 );/* 1ms */ /* send stop condition */ -out8 (IIC_DIRECTCNTL1 ,0xC ); +out_8 (IIC_DIRECTCNTL1 ,0xC );udelay (1000 );/* 1ms */ /* Unreset controller */ -out8 (IIC_XTCNTLSS1 , (status & ~IIC_XTCNTLSS_SRST )); +out_8 (IIC_XTCNTLSS1 , (status & ~IIC_XTCNTLSS_SRST ));udelay (1000 );/* 1ms */ }
@@ -117,16 +120,16 @@ void i2c1_init (int speed, int slaveadd)_i2c_bus1_reset ();/* clear lo master address */ -out8 (IIC_LMADR1 ,0 ); +out_8 (IIC_LMADR1 ,0 );/* clear hi master address */ -out8 (IIC_HMADR1 ,0 ); +out_8 (IIC_HMADR1 ,0 );/* clear lo slave address */ -out8 (IIC_LSADR1 ,0 ); +out_8 (IIC_LSADR1 ,0 );/* clear hi slave address */ -out8 (IIC_HSADR1 ,0 ); +out_8 (IIC_HSADR1 ,0 );/* Clock divide Register */ /* get OPB frequency */
@@ -136,25 +139,25 @@ void i2c1_init (int speed, int slaveadd) divisor = (freqOPB -1 ) /10000000 ;if (divisor ==0 ) divisor =1 ; -out8 (IIC_CLKDIV1 , divisor); +out_8 (IIC_CLKDIV1 , divisor);/* no interrupts */ -out8 (IIC_INTRMSK1 ,0 ); +out_8 (IIC_INTRMSK1 ,0 );/* clear transfer count */ -out8 (IIC_XFRCNT1 ,0 ); +out_8 (IIC_XFRCNT1 ,0 );/* clear extended control & stat */ /* write 1 in SRC SRS SWC SWS to clear these fields */ -out8 (IIC_XTCNTLSS1 ,0xF0 ); +out_8 (IIC_XTCNTLSS1 ,0xF0 );/* Mode Control Register Flush Slave/Master data buffer */ -out8 (IIC_MDCNTL1 ,IIC_MDCNTL_FSDB |IIC_MDCNTL_FMDB ); +out_8 (IIC_MDCNTL1 ,IIC_MDCNTL_FSDB |IIC_MDCNTL_FMDB ); __asm__volatile ("eieio" ); - val =in8 (IIC_MDCNTL1 ); + val =in_8 (IIC_MDCNTL1 ); __asm__volatile ("eieio" );/* Ignore General Call, slave transfers are ignored,
@@ -167,10 +170,10 @@ void i2c1_init (int speed, int slaveadd)if ( speed >=400000 ){ val |=IIC_MDCNTL_FSM ; } -out8 (IIC_MDCNTL1 , val); +out_8 (IIC_MDCNTL1 , val);/* clear control reg */ -out8 (IIC_CNTL1 ,0x00 ); +out_8 (IIC_CNTL1 ,0x00 ); __asm__volatile ("eieio" ); }
@@ -178,7 +181,7 @@ void i2c1_init (int speed, int slaveadd)/* This code tries to use the features of the 405GP i2c controller. It will transfer up to 4 bytes in one pass -on the loop. It only does out8(lbz) to the buffer when it +on the loop. It only does out_8(lbz) to the buffer when it is possible to do out16(lhz) transfers. cmd_type is 0 for write 1 for read.
@@ -232,12 +235,12 @@ int i2c_transfer1(unsigned char cmd_type, }/*Clear Stop Complete Bit*/ -out8 (IIC_STS1 ,IIC_STS_SCMP ); +out_8 (IIC_STS1 ,IIC_STS_SCMP );/* Check init */ i=10 ;do {/* Get status */ - status =in8 (IIC_STS1 ); + status =in_8 (IIC_STS1 ); __asm__volatile ("eieio" ); i--; }while ((status &IIC_STS_PT ) && (i>0 ));
@@ -247,12 +250,12 @@ int i2c_transfer1(unsigned char cmd_type,return (result); }/*flush the Master/Slave Databuffers*/ -out8 (IIC_MDCNTL1 , ((in8 (IIC_MDCNTL1 ))|IIC_MDCNTL_FMDB |IIC_MDCNTL_FSDB )); +out_8 (IIC_MDCNTL1 , ((in_8 (IIC_MDCNTL1 ))|IIC_MDCNTL_FMDB |IIC_MDCNTL_FSDB ));/*need to wait 4 OPB clocks? code below should take that long*/ /* 7-bit adressing */ -out8 (IIC_HMADR1 ,0 ); -out8 (IIC_LMADR1 , chip); +out_8 (IIC_HMADR1 ,0 ); +out_8 (IIC_LMADR1 , chip); __asm__volatile ("eieio" ); tran =0 ;
@@ -280,11 +283,11 @@ int i2c_transfer1(unsigned char cmd_type,else {for (j=0 ; j<bc; j++) {/* Set buffer */ -out8 (IIC_MDBUF1 ,ptr[tran+j]); +out_8 (IIC_MDBUF1 ,ptr[tran+j]); __asm__volatile ("eieio" ); } } -out8 (IIC_CNTL1 , creg ); +out_8 (IIC_CNTL1 , creg ); __asm__volatile ("eieio" );/* Transfer is in progress
@@ -297,7 +300,7 @@ int i2c_transfer1(unsigned char cmd_type, i=2 *5 *8 ; do { /* Get status */ - status = in8(IIC_STS1); + status = in_8(IIC_STS1); __asm__ volatile("eieio"); udelay (10); i--;
@@ -306,7 +309,7 @@ int i2c_transfer1(unsigned char cmd_type,if (status &IIC_STS_ERR ) { result =IIC_NOK ; - status =in8 (IIC_EXTSTS1 ); + status =in_8 (IIC_EXTSTS1 );/* Lost arbitration? */ if (status &IIC_EXTSTS_LA ) result =IIC_NOK_LA ;
@@ -331,7 +334,7 @@ int i2c_transfer1(unsigned char cmd_type,*/ udelay (1 );for (j=0 ;j<bc;j++) { - ptr[tran+j] =in8 (IIC_MDBUF1 ); + ptr[tran+j] =in_8 (IIC_MDBUF1 ); __asm__volatile ("eieio" ); } }else
board/sandburst/common/ppc440gx_i2c.h +15 -15
@@ -34,21 +34,21 @@#define I2C_BUS1_BASE_ADDR (CONFIG_SYS_PERIPHERAL_BASE + 0x00000500)#define I2C_REGISTERS_BUS1_BASE_ADDRESS I2C_BUS1_BASE_ADDR -#define IIC_MDBUF1 (I2C_REGISTERS_BUS1_BASE_ADDRESS+IICMDBUF) -#define IIC_SDBUF1 (I2C_REGISTERS_BUS1_BASE_ADDRESS+IICSDBUF) -#define IIC_LMADR1 (I2C_REGISTERS_BUS1_BASE_ADDRESS+IICLMADR) -#define IIC_HMADR1 (I2C_REGISTERS_BUS1_BASE_ADDRESS+IICHMADR) -#define IIC_CNTL1 (I2C_REGISTERS_BUS1_BASE_ADDRESS+IICCNTL) -#define IIC_MDCNTL1 (I2C_REGISTERS_BUS1_BASE_ADDRESS+IICMDCNTL) -#define IIC_STS1 (I2C_REGISTERS_BUS1_BASE_ADDRESS+IICSTS) -#define IIC_EXTSTS1 (I2C_REGISTERS_BUS1_BASE_ADDRESS+IICEXTSTS) -#define IIC_LSADR1 (I2C_REGISTERS_BUS1_BASE_ADDRESS+IICLSADR) -#define IIC_HSADR1 (I2C_REGISTERS_BUS1_BASE_ADDRESS+IICHSADR) -#define IIC_CLKDIV1 (I2C_REGISTERS_BUS1_BASE_ADDRESS+IIC0_CLKDIV) -#define IIC_INTRMSK1 (I2C_REGISTERS_BUS1_BASE_ADDRESS+IICINTRMSK) -#define IIC_XFRCNT1 (I2C_REGISTERS_BUS1_BASE_ADDRESS+IICXFRCNT) -#define IIC_XTCNTLSS1 (I2C_REGISTERS_BUS1_BASE_ADDRESS+IICXTCNTLSS) -#define IIC_DIRECTCNTL1 (I2C_REGISTERS_BUS1_BASE_ADDRESS+IICDIRECTCNTL) +#define IIC_MDBUF1 (&i2c->mdbuf) +#define IIC_SDBUF1 (&i2c->sdbuf) +#define IIC_LMADR1 (&i2c->lmadr) +#define IIC_HMADR1 (&i2c->hmadr) +#define IIC_CNTL1 (&i2c->cntl) +#define IIC_MDCNTL1 (&i2c->mdcntl) +#define IIC_STS1 (&i2c->sts) +#define IIC_EXTSTS1 (&i2c->extsts) +#define IIC_LSADR1 (&i2c->lsadr) +#define IIC_HSADR1 (&i2c->hsadr) +#define IIC_CLKDIV1 (&i2c->clkdiv) +#define IIC_INTRMSK1 (&i2c->intrmsk) +#define IIC_XFRCNT1 (&i2c->xfrcnt) +#define IIC_XTCNTLSS1 (&i2c->xtcntlss) +#define IIC_DIRECTCNTL1 (&i2c->directcntl)void i2c1_init (int speed,int slaveadd);int i2c_probe1 (uchar chip);
Signature · 5 lines
1.6.2.5 -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
PATCH 1/1 i2c, ppc4xx: fix compiling KAREF and METROBOX boards.
Hi Heiko,
Quoted 6 lines · On Thursday 03 December 2009 11:23:17 Heiko Schocher wrote:
commit
eb5eb2b0f744f0cba405160c5d01335c40f09acfppc4xx: Cleanup PPC4xx I2C infrastructure
This patch cleans up the PPC4xx I2C intrastructure:
Quoted 8 lines
- Use C struct to describe the I2C registers instead of defines
- Coding style cleanup (braces, whitespace, comments, line length)
- Extract common code fromi2c_read()andi2c_write()
- Remove unneeded IIC defines fromppc405.h&ppc440.hbreaks comiling for the KAREF and METROBOX boards.
This patch fixes this issue.
Thanks for catching. Don't know why I missed those two boards.
But looking at the code (board/sandburst/common/ppc440gx_i2c.c), this seems to be a driver for the PPC4xx I2C bus 1. The common 4xx I2C driver (cpu/ppc4xx/i2c.c) is fully capable of handling I2C bus 0 *and* 1. Perhaps this was not the case when Travis wrote the board support. I would really like to drop this board specific code, as it doesn't seem necessary for me.
The board maintainer, Travis Sawyer, doesn't work for Sandburst (acquired by Broadcom some time ago?) any more. So we can't get his comments on this. Not sure what to do with those Sandburst boards now. They are not actively maintained any more. Perhaps we should remove them some time soon?
Wolfgang, what do you think? Should we try to carry such unmaintained boards on for ever?
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
PATCH 1/1 i2c, ppc4xx: fix compiling KAREF and METROBOX boards.
Hello Stefan,
Quoted 16 lines · Stefan Roese
Quoted 6 lines · On Thursday 03 December 2009 11:23:17 Heiko Schocher wrote:
commit
eb5eb2b0f744f0cba405160c5d01335c40f09acfppc4xx: Cleanup PPC4xx I2C infrastructure
This patch cleans up the PPC4xx I2C intrastructure:
Quoted 8 lines
- Use C struct to describe the I2C registers instead of defines
- Coding style cleanup (braces, whitespace, comments, line length)
- Extract common code fromi2c_read()andi2c_write()
- Remove unneeded IIC defines fromppc405.h&ppc440.hbreaks comiling for the KAREF and METROBOX boards.
This patch fixes this issue.
Quoted 7 lines
Thanks for catching. Don't know why I missed those two boards.
But looking at the code (
board/sandburst/common/ppc440gx_i2c.c), this seems to be a driver for the PPC4xx I2C bus 1. The common 4xx I2C driver (cpu/ppc4xx/i2c.c) is fully capable of handling I2C bus 0 *and* 1. Perhaps this was not the case when Travis wrote the board support. I would really like to drop this board specific code, as it doesn't seem necessary for me.
In the multibus_v2 approach I dropped it ;-)
I didn;t see any reasons for supporting this board specific i2c driver any longer ...
bye
Heiko
Signature · 2 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
PATCH 1/1 i2c, ppc4xx: fix compiling KAREF and METROBOX boards.
In reply to Stefan RoeseDear Stefan Roese,
Quoted 8 lines · In message <[email protected]> you wrote:
The board maintainer, Travis Sawyer, doesn't work for Sandburst (acquired by Broadcom some time ago?) any more. So we can't get his comments on this. Not sure what to do with those Sandburst boards now. They are not actively maintained any more. Perhaps we should remove them some time soon?
Wolfgang, what do you think? Should we try to carry such unmaintained boards on for ever?
If it's an easy change to do (say, up to 5 minutes work to make it compile) I suggest we clean it up and keep the code. If it starts making real efforts we can remove it, if nobody complains.
Best regards,
Wolfgang Denk
Signature · 5 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de Vulcans do not approve of violence. -- Spock, "Journey to Babel", stardate 3842.4
PATCH 1/1 i2c, ppc4xx: fix compiling KAREF and METROBOX boards.
Hello Wolfgang,
Quoted 6 lines · Wolfgang Denk
Quoted 5 lines · In message <[email protected]> you wrote:
The board maintainer, Travis Sawyer, doesn't work for Sandburst (acquired by Broadcom some time ago?) any more. So we can't get his comments on this. Not sure what to do with those Sandburst boards now. They are not actively maintained any more. Perhaps we should remove them some time soon?
Quoted 6 lines
Quoted 2 lines
Wolfgang, what do you think? Should we try to carry such unmaintained boards on for ever?
If it's an easy change to do (say, up to 5 minutes work to make it compile) I suggest we clean it up and keep the code. If it starts making real efforts we can remove it, if nobody complains.
Thats exactly, what my patch did ;-)
Stefan, would you pick it up?
bye
Heiko
Signature · 2 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
PATCH 1/1 i2c, ppc4xx: fix compiling KAREF and METROBOX boards.
Hi Heiko,
Quoted 9 lines · On Saturday 05 December 2009 11:41:07 Heiko Schocher wrote:
Quoted 9 lines
Quoted 8 lines
The board maintainer, Travis Sawyer, doesn't work for Sandburst (acquired by Broadcom some time ago?) any more. So we can't get his comments on this. Not sure what to do with those Sandburst boards now. They are not actively maintained any more. Perhaps we should remove them some time soon?
Wolfgang, what do you think? Should we try to carry such unmaintained boards on for ever?
Quoted 7 lines
Quoted 3 lines
If it's an easy change to do (say, up to 5 minutes work to make it compile) I suggest we clean it up and keep the code. If it starts making real efforts we can remove it, if nobody complains.
Thats exactly, what my patch did ;-)
Stefan, would you pick it up?
OK, I'll pick it up soon. 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
PATCH 1/1 i2c, ppc4xx: fix compiling KAREF and METROBOX boards.
In reply to Heiko SchocherQuoted 6 lines · On Thursday 03 December 2009 11:23:17 Heiko Schocher wrote:
commit
eb5eb2b0f744f0cba405160c5d01335c40f09acfppc4xx: Cleanup PPC4xx I2C infrastructure
This patch cleans up the PPC4xx I2C intrastructure:
Quoted 8 lines
- Use C struct to describe the I2C registers instead of defines
- Coding style cleanup (braces, whitespace, comments, line length)
- Extract common code fromi2c_read()andi2c_write()
- Remove unneeded IIC defines fromppc405.h&ppc440.hbreaks comiling for the KAREF and METROBOX boards.
This patch fixes this issue.
Applied to u-boot-ppc4xx. 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