From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marek Vasut Date: Mon, 19 Sep 2011 08:57:11 +0200 Subject: [U-Boot] [PATCH] mx1: add mx1/l support for mxc_i2c In-Reply-To: <20110822205643.18696.97664.stgit@shuttle2.etheralp.ch> References: <20110822205643.18696.97664.stgit@shuttle2.etheralp.ch> Message-ID: <201109190857.11742.marek.vasut@gmail.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On Monday, August 22, 2011 10:56:43 PM Eric Jarrige wrote: > Signed-off-by: Eric Jarrige > Cc: Stefano Babic > Cc: Heiko Schocher > --- > drivers/i2c/mxc_i2c.c | 6 ++++++ > 1 files changed, 6 insertions(+), 0 deletions(-) > > diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c > index 89d1973..597e9ee 100644 > --- a/drivers/i2c/mxc_i2c.c > +++ b/drivers/i2c/mxc_i2c.c > @@ -27,7 +27,9 @@ > > #if defined(CONFIG_HARD_I2C) > > +#ifndef CONFIG_IMX > #include > +#endif > #include > > #define IADR 0x00 > @@ -63,6 +65,8 @@ > #define I2C_BASE I2C2_BASE_ADDR > #elif defined(CONFIG_SYS_I2C_MX35_PORT1) > #define I2C_BASE I2C_BASE_ADDR > +#elif defined(CONFIG_SYS_I2C_MX1_PORT1) > +#define I2C_BASE IMX_I2C_BASE > #else > #error "define CONFIG_SYS_I2C_MX_PORTx to use the mx I2C > driver" #endif > @@ -94,6 +98,8 @@ void i2c_init(int speed, int unused) > /* start the required I2C clock */ > writel(readl(&sc_regs->cgr0) | (3 << I2C_CLK_OFFSET), > &sc_regs->cgr0); > +#elif defined(CONFIG_IMX) > + freq = get_HCLK(); > #else > freq = mxc_get_clock(MXC_IPG_PERCLK); > #endif Please, no more ifdefs -- can't you actually modify your header files or add some which would define mxc_get_clock() ? That'd make this way much more clean. Cheers > > _______________________________________________ > U-Boot mailing list > U-Boot at lists.denx.de > http://lists.denx.de/mailman/listinfo/u-boot