All of lore.kernel.org
 help / color / mirror / Atom feed
From: Piotr Wilczek <p.wilczek@samsung.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v3 04/12] i2c:multi_i2c: adapt file to new i2c framework
Date: Fri, 17 May 2013 14:55:47 +0200	[thread overview]
Message-ID: <1368795355-6717-5-git-send-email-p.wilczek@samsung.com> (raw)
In-Reply-To: <1368795355-6717-1-git-send-email-p.wilczek@samsung.com>

This patch change get bus macro to i2c_get_bus_num() function
New macros CONFIG_SOFT_I2C_I2C8_SCL/SDA is added.

Signed-off-by: Piotr Wilczek <p.wilczek@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
CC: Lukasz Majewski <l.majewski@samsung.com>

---
Changes in v3:
- I2C_GET_BUS replaced by i2c_get_bus_num() function

Changes in v2:
- new patch

 board/samsung/common/multi_i2c.c |   37 +++++++++++++++++++++++++++++++++++--
 1 file changed, 35 insertions(+), 2 deletions(-)

diff --git a/board/samsung/common/multi_i2c.c b/board/samsung/common/multi_i2c.c
index d6c3d37..f4735c7 100644
--- a/board/samsung/common/multi_i2c.c
+++ b/board/samsung/common/multi_i2c.c
@@ -24,15 +24,44 @@
 #include <common.h>
 #include <i2c.h>
 
+#ifndef CONFIG_SOFT_I2C_I2C5_SCL
+#define CONFIG_SOFT_I2C_I2C5_SCL 0
+#endif
+#ifndef CONFIG_SOFT_I2C_I2C7_SCL
+#define CONFIG_SOFT_I2C_I2C7_SCL 0
+#endif
+#ifndef CONFIG_SOFT_I2C_I2C8_SCL
+#define CONFIG_SOFT_I2C_I2C8_SCL 0
+#endif
+#ifndef CONFIG_SOFT_I2C_I2C9_SCL
+#define CONFIG_SOFT_I2C_I2C9_SCL 0
+#endif
+#ifndef CONFIG_SOFT_I2C_I2C5_SDA
+#define CONFIG_SOFT_I2C_I2C5_SDA 0
+#endif
+#ifndef CONFIG_SOFT_I2C_I2C7_SDA
+#define CONFIG_SOFT_I2C_I2C7_SDA 0
+#endif
+#ifndef CONFIG_SOFT_I2C_I2C8_SDA
+#define CONFIG_SOFT_I2C_I2C8_SDA 0
+#endif
+#ifndef CONFIG_SOFT_I2C_I2C9_SDA
+#define CONFIG_SOFT_I2C_I2C9_SDA 0
+#endif
+
 /* Handle multiple I2C buses instances */
 int get_multi_scl_pin(void)
 {
-	unsigned int bus = I2C_GET_BUS();
+	unsigned int bus = i2c_get_bus_num();
 
 	switch (bus) {
 	case I2C_0: /* I2C_0 definition - compatibility layer */
 	case I2C_5:
 		return CONFIG_SOFT_I2C_I2C5_SCL;
+	case I2C_7:
+		return CONFIG_SOFT_I2C_I2C7_SCL;
+	case I2C_8:
+		return CONFIG_SOFT_I2C_I2C8_SCL;
 	case I2C_9:
 		return CONFIG_SOFT_I2C_I2C9_SCL;
 	default:
@@ -44,12 +73,16 @@ int get_multi_scl_pin(void)
 
 int get_multi_sda_pin(void)
 {
-	unsigned int bus = I2C_GET_BUS();
+	unsigned int bus = i2c_get_bus_num();
 
 	switch (bus) {
 	case I2C_0: /* I2C_0 definition - compatibility layer */
 	case I2C_5:
 		return CONFIG_SOFT_I2C_I2C5_SDA;
+	case I2C_7:
+		return CONFIG_SOFT_I2C_I2C7_SDA;
+	case I2C_8:
+		return CONFIG_SOFT_I2C_I2C8_SDA;
 	case I2C_9:
 		return CONFIG_SOFT_I2C_I2C9_SDA;
 	default:
-- 
1.7.9.5

  parent reply	other threads:[~2013-05-17 12:55 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-17 12:55 [U-Boot] [PATCH v3 0/12] Introduce Samsung's new board Trats2 Piotr Wilczek
2013-05-17 12:55 ` [U-Boot] [PATCH v3 01/12] pmic:max77686: add function to set voltage and mode Piotr Wilczek
2013-05-17 12:55 ` [U-Boot] [PATCH v3 02/12] drivers:power:max77693: add support for new multi function pmic max77693 Piotr Wilczek
2013-05-17 12:55 ` [U-Boot] [PATCH v3 03/12] arm:exynos:gpio: fix s5p_gpio_part_max for exynos4x12 Piotr Wilczek
2013-05-17 12:55 ` Piotr Wilczek [this message]
2013-05-17 12:55 ` [U-Boot] [PATCH v3 05/12] power: fix pmic command Piotr Wilczek
2013-05-17 12:55 ` [U-Boot] [PATCH v3 06/12] drivers:power:power_i2c: adapt file to new i2c framework Piotr Wilczek
2013-05-17 12:55 ` [U-Boot] [PATCH v3 07/12] driver:i2c:s3c24x0: adapt driver " Piotr Wilczek
2013-05-17 12:55 ` [U-Boot] [PATCH v3 08/12] drivers:video:s6e8ax0: change data_to_send array to static Piotr Wilczek
2013-05-17 12:55 ` [U-Boot] [PATCH v3 09/12] drivers:lcd: fix unaligned access on lcd Piotr Wilczek
2013-05-17 12:55 ` [U-Boot] [PATCH v3 10/12] samsung: trats2: add support for new board Trats2 Piotr Wilczek
2013-05-17 12:55 ` [U-Boot] [PATCH v3 11/12] board:VCMA9 switch to ne i2c framework Piotr Wilczek
2013-05-17 12:55 ` [U-Boot] [PATCH v3 12/12] board:smdk5250: switch to new " Piotr Wilczek
2013-05-21  8:35 ` [U-Boot] [PATCH v3 0/12] Introduce Samsung's new board Trats2 Minkyu Kang
2013-05-21  9:00   ` Piotr Wilczek

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1368795355-6717-5-git-send-email-p.wilczek@samsung.com \
    --to=p.wilczek@samsung.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.