Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 226512
b: refs/heads/master
c: caeeb4a
h: refs/heads/master
v: v3
  • Loading branch information
Jarkko Nikula authored and Tony Lindgren committed Dec 21, 2010
1 parent 60256e9 commit b69a0f2
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 91db7b2985555bd0456ad30440dd615c985fc9c6
refs/heads/master: caeeb4aadfbff8d8efbb055594c0459cff94adad
12 changes: 12 additions & 0 deletions trunk/arch/arm/mach-omap2/board-rx51-peripherals.c
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,8 @@ static struct regulator_consumer_supply rx51_vmmc2_supplies[] = {
/* tlv320aic3x analog supplies */
REGULATOR_SUPPLY("AVDD", "2-0018"),
REGULATOR_SUPPLY("DRVDD", "2-0018"),
REGULATOR_SUPPLY("AVDD", "2-0019"),
REGULATOR_SUPPLY("DRVDD", "2-0019"),
/* tpa6130a2 */
REGULATOR_SUPPLY("Vdd", "2-0060"),
/* Keep vmmc as last item. It is not iterated for newer boards */
Expand All @@ -353,6 +355,8 @@ static struct regulator_consumer_supply rx51_vio_supplies[] = {
/* tlv320aic3x digital supplies */
REGULATOR_SUPPLY("IOVDD", "2-0018"),
REGULATOR_SUPPLY("DVDD", "2-0018"),
REGULATOR_SUPPLY("IOVDD", "2-0019"),
REGULATOR_SUPPLY("DVDD", "2-0019"),
};

#if defined(CONFIG_FB_OMAP2) || defined(CONFIG_FB_OMAP2_MODULE)
Expand Down Expand Up @@ -743,11 +747,19 @@ static struct aic3x_pdata rx51_aic3x_data = {
.gpio_reset = 60,
};

static struct aic3x_pdata rx51_aic3x_data2 = {
.gpio_reset = 60,
};

static struct i2c_board_info __initdata rx51_peripherals_i2c_board_info_2[] = {
{
I2C_BOARD_INFO("tlv320aic3x", 0x18),
.platform_data = &rx51_aic3x_data,
},
{
I2C_BOARD_INFO("tlv320aic3x", 0x19),
.platform_data = &rx51_aic3x_data2,
},
#if defined(CONFIG_SENSORS_TSL2563) || defined(CONFIG_SENSORS_TSL2563_MODULE)
{
I2C_BOARD_INFO("tsl2563", 0x29),
Expand Down

0 comments on commit b69a0f2

Please sign in to comment.