diff mbox

[U-Boot,v4,03/13] board: controlcenterd: Use new API for setting i2c bus

Message ID 1404372506-15314-4-git-send-email-dirk.eibach@gdsys.cc
State Accepted
Delegated to: Tom Rini
Headers show

Commit Message

Dirk Eibach July 3, 2014, 7:28 a.m. UTC 
From: Dirk Eibach <dirk.eibach@gdsys.cc>

Signed-off-by: Dirk Eibach <dirk.eibach@gdsys.cc>

---

Changes in v4: None
Changes in v3: None
Changes in v2:
- use defines for I2C bus numbers

 board/gdsys/p1022/controlcenterd-id.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

Comments

Tom Rini July 8, 2014, 1:38 a.m. UTC | #1 
On Thu, Jul 03, 2014 at 09:28:16AM +0200, Dirk Eibach wrote:

> From: Dirk Eibach <dirk.eibach@gdsys.cc>
> 
> Signed-off-by: Dirk Eibach <dirk.eibach@gdsys.cc>

Applied to u-boot/master, thanks!
diff mbox

Patch

diff --git a/board/gdsys/p1022/controlcenterd-id.c b/board/gdsys/p1022/controlcenterd-id.c
index 3fca3c5..419fc2e 100644
--- a/board/gdsys/p1022/controlcenterd-id.c
+++ b/board/gdsys/p1022/controlcenterd-id.c
@@ -86,6 +86,11 @@  enum {
 	ESDHC_BOOT_IMAGE_ENTRY_OFS	= 0x60,
 };
 
+enum {
+	I2C_SOC_0 = 0,
+	I2C_SOC_1 = 1,
+};
+
 struct key_program {
 	uint32_t magic;
 	uint32_t code_crc;
@@ -1156,7 +1161,7 @@  static void ccdm_hang(void)
 	int j;
 #endif
 
-	I2C_SET_BUS(0);
+	I2C_SET_BUS(I2C_SOC_0);
 	pca9698_direction_output(0x22, 0, 0); /* Finder */
 	pca9698_direction_output(0x22, 4, 0); /* Status */
 
@@ -1189,8 +1194,8 @@  int startup_ccdm_id_module(void)
 	int result = 0;
 	unsigned int orig_i2c_bus;
 
-	orig_i2c_bus = I2C_GET_BUS();
-	I2C_SET_BUS(1);
+	orig_i2c_bus = i2c_get_bus_num();
+	i2c_set_bus_num(I2C_SOC_1);
 
 	/* goto end; */
 
@@ -1216,7 +1221,7 @@  int startup_ccdm_id_module(void)
 failure:
 	result = 1;
 end:
-	I2C_SET_BUS(orig_i2c_bus);
+	i2c_set_bus_num(orig_i2c_bus);
 	if (result)
 		ccdm_hang();