Patchwork [U-Boot,02/24] mxc_i2c: remove ifdef of CONFIG_HARD_I2C

login
register
mail settings
Submitter Troy Kisky
Date June 22, 2012, 4:11 a.m.
Message ID <1340338339-11626-2-git-send-email-troy.kisky@boundarydevices.com>
Download mbox | patch
Permalink /patch/166483/
State Accepted
Commit 24cd738bc420630f5362e2845a9f8aa4076273e5
Delegated to: Heiko Schocher
Headers show

Comments

Troy Kisky - June 22, 2012, 4:11 a.m.
This is always selected when CONFIG_I2C_MXC is
selected, so it adds no value.

Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
---
 drivers/i2c/mxc_i2c.c |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
Marek Vasut - June 22, 2012, 4:55 p.m.
Dear Troy Kisky,

> This is always selected when CONFIG_I2C_MXC is
> selected, so it adds no value.
> 
> Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>

Acked-by: Marek Vasut <marex@denx.de>

> ---
>  drivers/i2c/mxc_i2c.c |    6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)
> 
> diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c
> index c0c45fd..0b46c9c 100644
> --- a/drivers/i2c/mxc_i2c.c
> +++ b/drivers/i2c/mxc_i2c.c
> @@ -31,12 +31,9 @@
>   */
> 
>  #include <common.h>
> -#include <asm/io.h>
> -
> -#if defined(CONFIG_HARD_I2C)
> -
>  #include <asm/arch/clock.h>
>  #include <asm/arch/imx-regs.h>
> +#include <asm/io.h>
>  #include <i2c.h>
> 
>  struct mxc_i2c_regs {
> @@ -446,4 +443,3 @@ int i2c_write(uchar chip, uint addr, int alen, uchar
> *buf, int len)
> 
>  	return ret;
>  }
> -#endif /* CONFIG_HARD_I2C */

Best regards,
Marek Vasut

Patch

diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c
index c0c45fd..0b46c9c 100644
--- a/drivers/i2c/mxc_i2c.c
+++ b/drivers/i2c/mxc_i2c.c
@@ -31,12 +31,9 @@ 
  */
 
 #include <common.h>
-#include <asm/io.h>
-
-#if defined(CONFIG_HARD_I2C)
-
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
+#include <asm/io.h>
 #include <i2c.h>
 
 struct mxc_i2c_regs {
@@ -446,4 +443,3 @@  int i2c_write(uchar chip, uint addr, int alen, uchar *buf, int len)
 
 	return ret;
 }
-#endif /* CONFIG_HARD_I2C */