Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 160872
b: refs/heads/master
c: cf87a6e
h: refs/heads/master
v: v3
  • Loading branch information
Sascha Hauer committed Aug 14, 2009
1 parent 1a91e75 commit bce5d4b
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 19 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a961bf380b93741c2191f8efc8f5f1c65224b216
refs/heads/master: cf87a6e2fe95891575c45ba1a0ecb8cf53c09732
6 changes: 2 additions & 4 deletions trunk/arch/arm/mach-mx1/mx1ads.c
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,10 @@ static struct imxi2c_platform_data mx1ads_i2c_data = {

static struct i2c_board_info mx1ads_i2c_devices[] = {
{
I2C_BOARD_INFO("pcf857x", 0x22),
.type = "pcf8575",
I2C_BOARD_INFO("pcf8575", 0x22),
.platform_data = &pcf857x_data[0],
}, {
I2C_BOARD_INFO("pcf857x", 0x24),
.type = "pcf8575",
I2C_BOARD_INFO("pcf8575", 0x24),
.platform_data = &pcf857x_data[1],
},
};
Expand Down
3 changes: 1 addition & 2 deletions trunk/arch/arm/mach-mx2/eukrea_cpuimx27.c
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,7 @@ static struct imxi2c_platform_data eukrea_cpuimx27_i2c_1_data = {

static struct i2c_board_info eukrea_cpuimx27_i2c_devices[] = {
{
I2C_BOARD_INFO("rtc-pcf8563", 0x51),
.type = "pcf8563"
I2C_BOARD_INFO("pcf8563", 0x51),
},
};

Expand Down
12 changes: 4 additions & 8 deletions trunk/arch/arm/mach-mx2/pcm038.c
Original file line number Diff line number Diff line change
Expand Up @@ -186,17 +186,13 @@ static struct at24_platform_data board_eeprom = {
};

static struct i2c_board_info pcm038_i2c_devices[] = {
[0] = {
{
I2C_BOARD_INFO("at24", 0x52), /* E0=0, E1=1, E2=0 */
.platform_data = &board_eeprom,
},
[1] = {
I2C_BOARD_INFO("rtc-pcf8563", 0x51),
.type = "pcf8563"
},
[2] = {
}, {
I2C_BOARD_INFO("pcf8563", 0x51),
}, {
I2C_BOARD_INFO("lm75", 0x4a),
.type = "lm75"
}
};

Expand Down
3 changes: 1 addition & 2 deletions trunk/arch/arm/mach-mx3/pcm037.c
Original file line number Diff line number Diff line change
Expand Up @@ -339,8 +339,7 @@ static struct i2c_board_info pcm037_i2c_devices[] = {
I2C_BOARD_INFO("at24", 0x52), /* E0=0, E1=1, E2=0 */
.platform_data = &board_eeprom,
}, {
I2C_BOARD_INFO("rtc-pcf8563", 0x51),
.type = "pcf8563",
I2C_BOARD_INFO("pcf8563", 0x51),
}
};

Expand Down
3 changes: 1 addition & 2 deletions trunk/arch/arm/mach-mx3/pcm043.c
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,7 @@ static struct i2c_board_info pcm043_i2c_devices[] = {
I2C_BOARD_INFO("at24", 0x52), /* E0=0, E1=1, E2=0 */
.platform_data = &board_eeprom,
}, {
I2C_BOARD_INFO("rtc-pcf8563", 0x51),
.type = "pcf8563",
I2C_BOARD_INFO("pcf8563", 0x51),
}
};
#endif
Expand Down

0 comments on commit bce5d4b

Please sign in to comment.