diff mbox

[8/8,V6] CONFIG: SMDK5250: I2C: Enable I2C

Message ID 1342698001-27683-9-git-send-email-rajeshwari.s@samsung.com
State New
Headers show

Commit Message

Rajeshwari Shinde July 19, 2012, 11:40 a.m. UTC 
This enables I2C support on smdk5250.
Pinmux setting moved to board file to avoid repeated setting of
gpio lines.

Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
Signed-off-by: Doug Anderson <dianders@chromium.org>
Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com>
Acked-by: Simon Glass <sjg@chromium.org>
---
Changes in V2:
        - None
Changes in V3:
        - None
Changes in V4:
        - None
Changes in V5:
        - Pinmux setting of gpio lines moved to board_early_init_f.
Chnages in V6:
        - EXYNOS_I2C_SPACING moved to cpu.h
        - board_i2c_init compiled only when CONFIG_DRIVER_S3C24X0_I2C is defined.
 board/samsung/smdk5250/smdk5250.c |   28 +++++++++++++++++++++++++++-
 include/configs/smdk5250.h        |    8 ++++++++
 2 files changed, 35 insertions(+), 1 deletions(-)

Comments

Simon Glass July 19, 2012, 6:23 p.m. UTC | #1 
On Thu, Jul 19, 2012 at 12:40 PM, Rajeshwari Shinde
<rajeshwari.s@samsung.com> wrote:
> This enables I2C support on smdk5250.
> Pinmux setting moved to board file to avoid repeated setting of
> gpio lines.
>
> Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
> Signed-off-by: Doug Anderson <dianders@chromium.org>
> Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com>
> Acked-by: Simon Glass <sjg@chromium.org>

Acked-by: Simon Glass <sjg@chromium.org>

> ---
> Changes in V2:
>         - None
> Changes in V3:
>         - None
> Changes in V4:
>         - None
> Changes in V5:
>         - Pinmux setting of gpio lines moved to board_early_init_f.
> Chnages in V6:
>         - EXYNOS_I2C_SPACING moved to cpu.h
>         - board_i2c_init compiled only when CONFIG_DRIVER_S3C24X0_I2C is defined.
>  board/samsung/smdk5250/smdk5250.c |   28 +++++++++++++++++++++++++++-
>  include/configs/smdk5250.h        |    8 ++++++++
>  2 files changed, 35 insertions(+), 1 deletions(-)
>
> diff --git a/board/samsung/smdk5250/smdk5250.c b/board/samsung/smdk5250/smdk5250.c
> index b593325..12e6e66 100644
> --- a/board/samsung/smdk5250/smdk5250.c
> +++ b/board/samsung/smdk5250/smdk5250.c
> @@ -172,9 +172,35 @@ static int board_uart_init(void)
>         return 0;
>  }
>
> +#ifdef CONFIG_DRIVER_S3C24X0_I2C
> +static int board_i2c_init(void)
> +{
> +       int i, err;
> +
> +       for (i = 0; i < CONFIG_MAX_I2C_NUM; i++) {
> +               err = exynos_pinmux_config((PERIPH_ID_I2C0 + i),
> +                                               PINMUX_FLAG_NONE);
> +               if (err) {
> +                       debug("I2C%d not configured\n", (PERIPH_ID_I2C0 + i));
> +                       return err;
> +               }
> +       }
> +       return 0;
> +}
> +#endif
> +
>  #ifdef CONFIG_BOARD_EARLY_INIT_F
>  int board_early_init_f(void)
>  {
> -       return board_uart_init();
> +       int err;
> +       err = board_uart_init();
> +       if (err) {
> +               debug("UART init failed\n");
> +               return err;
> +       }
> +#ifdef CONFIG_DRIVER_S3C24X0_I2C
> +       err = board_i2c_init();
> +#endif
> +       return err;
>  }
>  #endif
> diff --git a/include/configs/smdk5250.h b/include/configs/smdk5250.h
> index c0eaaf8..65dfe9f 100644
> --- a/include/configs/smdk5250.h
> +++ b/include/configs/smdk5250.h
> @@ -198,6 +198,14 @@
>
>  #define CONFIG_SYS_INIT_SP_ADDR        (CONFIG_SYS_LOAD_ADDR - 0x1000000)
>
> +/* I2C */
> +#define CONFIG_HARD_I2C
> +#define CONFIG_CMD_I2C
> +#define CONFIG_SYS_I2C_SPEED   100000          /* 100 Kbps */
> +#define CONFIG_DRIVER_S3C24X0_I2C
> +#define CONFIG_I2C_MULTI_BUS
> +#define CONFIG_MAX_I2C_NUM     8
> +
>  /* Ethernet Controllor Driver */
>  #ifdef CONFIG_CMD_NET
>  #define CONFIG_SMC911X
> --
> 1.7.4.4
>
Joonyoung Shim July 23, 2012, 4:40 a.m. UTC | #2 
On 07/19/2012 08:40 PM, Rajeshwari Shinde wrote:
> This enables I2C support on smdk5250.
> Pinmux setting moved to board file to avoid repeated setting of
> gpio lines.
>
> Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
> Signed-off-by: Doug Anderson <dianders@chromium.org>
> Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com>
> Acked-by: Simon Glass <sjg@chromium.org>
> ---
> Changes in V2:
>          - None
> Changes in V3:
>          - None
> Changes in V4:
>          - None
> Changes in V5:
>          - Pinmux setting of gpio lines moved to board_early_init_f.
> Chnages in V6:
>          - EXYNOS_I2C_SPACING moved to cpu.h
>          - board_i2c_init compiled only when CONFIG_DRIVER_S3C24X0_I2C is defined.
>   board/samsung/smdk5250/smdk5250.c |   28 +++++++++++++++++++++++++++-
>   include/configs/smdk5250.h        |    8 ++++++++
>   2 files changed, 35 insertions(+), 1 deletions(-)
>
> diff --git a/board/samsung/smdk5250/smdk5250.c b/board/samsung/smdk5250/smdk5250.c
> index b593325..12e6e66 100644
> --- a/board/samsung/smdk5250/smdk5250.c
> +++ b/board/samsung/smdk5250/smdk5250.c
> @@ -172,9 +172,35 @@ static int board_uart_init(void)
>   	return 0;
>   }
>   
> +#ifdef CONFIG_DRIVER_S3C24X0_I2C
> +static int board_i2c_init(void)
> +{
> +	int i, err;
> +
> +	for (i = 0; i < CONFIG_MAX_I2C_NUM; i++) {
> +		err = exynos_pinmux_config((PERIPH_ID_I2C0 + i),
> +						PINMUX_FLAG_NONE);
> +		if (err) {
> +			debug("I2C%d not configured\n", (PERIPH_ID_I2C0 + i));
> +			return err;
> +		}
> +	}
> +	return 0;
> +}
> +#endif

How about use CONFIG_SYS_I2C_INIT_BOARD and i2c_init_board()?
Some i2c drivers are using them.

> +
>   #ifdef CONFIG_BOARD_EARLY_INIT_F
>   int board_early_init_f(void)
>   {
> -	return board_uart_init();
> +	int err;
> +	err = board_uart_init();
> +	if (err) {
> +		debug("UART init failed\n");
> +		return err;
> +	}
> +#ifdef CONFIG_DRIVER_S3C24X0_I2C
> +	err = board_i2c_init();
> +#endif
> +	return err;
>   }
>   #endif
> diff --git a/include/configs/smdk5250.h b/include/configs/smdk5250.h
> index c0eaaf8..65dfe9f 100644
> --- a/include/configs/smdk5250.h
> +++ b/include/configs/smdk5250.h
> @@ -198,6 +198,14 @@
>   
>   #define CONFIG_SYS_INIT_SP_ADDR	(CONFIG_SYS_LOAD_ADDR - 0x1000000)
>   
> +/* I2C */
> +#define CONFIG_HARD_I2C
> +#define CONFIG_CMD_I2C
> +#define CONFIG_SYS_I2C_SPEED	100000		/* 100 Kbps */
> +#define CONFIG_DRIVER_S3C24X0_I2C
> +#define CONFIG_I2C_MULTI_BUS
> +#define CONFIG_MAX_I2C_NUM	8
> +
>   /* Ethernet Controllor Driver */
>   #ifdef CONFIG_CMD_NET
>   #define CONFIG_SMC911X
diff mbox

Patch

diff --git a/board/samsung/smdk5250/smdk5250.c b/board/samsung/smdk5250/smdk5250.c
index b593325..12e6e66 100644
--- a/board/samsung/smdk5250/smdk5250.c
+++ b/board/samsung/smdk5250/smdk5250.c
@@ -172,9 +172,35 @@  static int board_uart_init(void)
 	return 0;
 }
 
+#ifdef CONFIG_DRIVER_S3C24X0_I2C
+static int board_i2c_init(void)
+{
+	int i, err;
+
+	for (i = 0; i < CONFIG_MAX_I2C_NUM; i++) {
+		err = exynos_pinmux_config((PERIPH_ID_I2C0 + i),
+						PINMUX_FLAG_NONE);
+		if (err) {
+			debug("I2C%d not configured\n", (PERIPH_ID_I2C0 + i));
+			return err;
+		}
+	}
+	return 0;
+}
+#endif
+
 #ifdef CONFIG_BOARD_EARLY_INIT_F
 int board_early_init_f(void)
 {
-	return board_uart_init();
+	int err;
+	err = board_uart_init();
+	if (err) {
+		debug("UART init failed\n");
+		return err;
+	}
+#ifdef CONFIG_DRIVER_S3C24X0_I2C
+	err = board_i2c_init();
+#endif
+	return err;
 }
 #endif
diff --git a/include/configs/smdk5250.h b/include/configs/smdk5250.h
index c0eaaf8..65dfe9f 100644
--- a/include/configs/smdk5250.h
+++ b/include/configs/smdk5250.h
@@ -198,6 +198,14 @@ 
 
 #define CONFIG_SYS_INIT_SP_ADDR	(CONFIG_SYS_LOAD_ADDR - 0x1000000)
 
+/* I2C */
+#define CONFIG_HARD_I2C
+#define CONFIG_CMD_I2C
+#define CONFIG_SYS_I2C_SPEED	100000		/* 100 Kbps */
+#define CONFIG_DRIVER_S3C24X0_I2C
+#define CONFIG_I2C_MULTI_BUS
+#define CONFIG_MAX_I2C_NUM	8
+
 /* Ethernet Controllor Driver */
 #ifdef CONFIG_CMD_NET
 #define CONFIG_SMC911X