diff options
author | Stefan Roese <sr@denx.de> | 2007-02-20 10:27:08 +0100 |
---|---|---|
committer | Stefan Roese <sr@denx.de> | 2007-02-20 10:27:08 +0100 |
commit | 79b2d0bb2eae09602448f7a7cb56530d2f31e6c6 (patch) | |
tree | ec226ccf8314e37981f946df4391446a6ff9dc11 /board | |
parent | 7372ca68227930d03cffa548310524cad5b96733 (diff) |
[PATCH] PPC4xx: Add support for multiple I2C busses
This patch adds support for multiple I2C busses on the PPC4xx
platforms. Define CONFIG_I2C_MULTI_BUS in the board config file
to make use of this feature.
It also merges the 405 and 440 i2c header files into one common
file 4xx_i2c.h.
Also the 4xx i2c reset procedure is reworked since I experienced
some problems with the first access on the 440SPe Katmai board.
Signed-off-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'board')
-rw-r--r-- | board/cray/L1/L1.c | 2 | ||||
-rw-r--r-- | board/esd/du405/du405.c | 2 | ||||
-rw-r--r-- | board/mpl/common/memtst.c | 2 | ||||
-rw-r--r-- | board/mpl/mip405/mip405.c | 2 | ||||
-rw-r--r-- | board/sandburst/common/ppc440gx_i2c.c | 7 | ||||
-rw-r--r-- | board/sandburst/common/ppc440gx_i2c.h | 6 |
6 files changed, 6 insertions, 15 deletions
diff --git a/board/cray/L1/L1.c b/board/cray/L1/L1.c index a7114eb074..a0fac7fe5a 100644 --- a/board/cray/L1/L1.c +++ b/board/cray/L1/L1.c @@ -23,7 +23,7 @@ #include <common.h> #include <asm/processor.h> -#include <405gp_i2c.h> +#include <4xx_i2c.h> #include <command.h> #include <rtc.h> #include <post.h> diff --git a/board/esd/du405/du405.c b/board/esd/du405/du405.c index a019ce4215..69432138d3 100644 --- a/board/esd/du405/du405.c +++ b/board/esd/du405/du405.c @@ -25,7 +25,7 @@ #include "du405.h" #include <asm/processor.h> #include <ppc4xx.h> -#include <405gp_i2c.h> +#include <4xx_i2c.h> #include <command.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/board/mpl/common/memtst.c b/board/mpl/common/memtst.c index ff1190ab21..1d28513d87 100644 --- a/board/mpl/common/memtst.c +++ b/board/mpl/common/memtst.c @@ -48,7 +48,7 @@ int testdram (void) #include <common.h> #include <asm/processor.h> -#include <405gp_i2c.h> +#include <4xx_i2c.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/board/mpl/mip405/mip405.c b/board/mpl/mip405/mip405.c index 34f328999d..4dbf4926c2 100644 --- a/board/mpl/mip405/mip405.c +++ b/board/mpl/mip405/mip405.c @@ -65,7 +65,7 @@ #include <common.h> #include "mip405.h" #include <asm/processor.h> -#include <405gp_i2c.h> +#include <4xx_i2c.h> #include <miiphy.h> #include "../common/common_util.h" #include <i2c.h> diff --git a/board/sandburst/common/ppc440gx_i2c.c b/board/sandburst/common/ppc440gx_i2c.c index 859dd7afe5..1e3dffb1ee 100644 --- a/board/sandburst/common/ppc440gx_i2c.c +++ b/board/sandburst/common/ppc440gx_i2c.c @@ -27,13 +27,8 @@ */ #include <common.h> #include <ppc4xx.h> -#if defined(CONFIG_440) -# include <440_i2c.h> -#else -# include <405gp_i2c.h> -#endif +#include <4xx_i2c.h> #include <i2c.h> -#include <440_i2c.h> #include <command.h> #include "ppc440gx_i2c.h" diff --git a/board/sandburst/common/ppc440gx_i2c.h b/board/sandburst/common/ppc440gx_i2c.h index cd4fc86661..10000f5ba9 100644 --- a/board/sandburst/common/ppc440gx_i2c.h +++ b/board/sandburst/common/ppc440gx_i2c.h @@ -27,11 +27,7 @@ */ #include <common.h> #include <ppc4xx.h> -#if defined(CONFIG_440) -# include <440_i2c.h> -#else -# include <405gp_i2c.h> -#endif +#include <4xx_i2c.h> #include <i2c.h> #ifdef CONFIG_HARD_I2C |