board: controlcenterd: Use new API for setting i2c bus

Signed-off-by: Dirk Eibach <dirk.eibach@gdsys.cc>
This commit is contained in:
Dirk Eibach 2014-07-03 09:28:16 +02:00 committed by Tom Rini
parent e9e374216f
commit 35ecf75230

View File

@ -86,6 +86,11 @@ enum {
ESDHC_BOOT_IMAGE_ENTRY_OFS = 0x60, ESDHC_BOOT_IMAGE_ENTRY_OFS = 0x60,
}; };
enum {
I2C_SOC_0 = 0,
I2C_SOC_1 = 1,
};
struct key_program { struct key_program {
uint32_t magic; uint32_t magic;
uint32_t code_crc; uint32_t code_crc;
@ -1156,7 +1161,7 @@ static void ccdm_hang(void)
int j; int j;
#endif #endif
I2C_SET_BUS(0); I2C_SET_BUS(I2C_SOC_0);
pca9698_direction_output(0x22, 0, 0); /* Finder */ pca9698_direction_output(0x22, 0, 0); /* Finder */
pca9698_direction_output(0x22, 4, 0); /* Status */ pca9698_direction_output(0x22, 4, 0); /* Status */
@ -1189,8 +1194,8 @@ int startup_ccdm_id_module(void)
int result = 0; int result = 0;
unsigned int orig_i2c_bus; unsigned int orig_i2c_bus;
orig_i2c_bus = I2C_GET_BUS(); orig_i2c_bus = i2c_get_bus_num();
I2C_SET_BUS(1); i2c_set_bus_num(I2C_SOC_1);
/* goto end; */ /* goto end; */
@ -1216,7 +1221,7 @@ int startup_ccdm_id_module(void)
failure: failure:
result = 1; result = 1;
end: end:
I2C_SET_BUS(orig_i2c_bus); i2c_set_bus_num(orig_i2c_bus);
if (result) if (result)
ccdm_hang(); ccdm_hang();