Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 269287
b: refs/heads/master
c: 2fba06f
h: refs/heads/master
i:
  269285: 6de06d8
  269283: 7371cc1
  269279: 58214fb
v: v3
  • Loading branch information
Lars-Peter Clausen authored and Mike Frysinger committed Oct 25, 2011
1 parent d2e748c commit a819b1a
Show file tree
Hide file tree
Showing 2 changed files with 18 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: 2db1f97299131ecd121e32b6d2fc88ae4802bf86
refs/heads/master: 2fba06f2b8a7fe69c0eff94389834821f54ada10
17 changes: 17 additions & 0 deletions trunk/arch/blackfin/mach-bf537/boards/stamp.c
Original file line number Diff line number Diff line change
Expand Up @@ -2275,6 +2275,11 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
I2C_BOARD_INFO("adau1361", 0x38),
},
#endif
#if defined(CONFIG_SND_SOC_ADAU1701) || defined(CONFIG_SND_SOC_ADAU1701_MODULE)
{
I2C_BOARD_INFO("adau1701", 0x34),
},
#endif
#if defined(CONFIG_AD525X_DPOT) || defined(CONFIG_AD525X_DPOT_MODULE)
{
I2C_BOARD_INFO("ad5258", 0x18),
Expand Down Expand Up @@ -2661,6 +2666,13 @@ static struct platform_device iio_gpio_trigger = {
};
#endif

#if defined(CONFIG_SND_SOC_BFIN_EVAL_ADAU1701) || \
defined(CONFIG_SND_SOC_BFIN_EVAL_ADAU1701_MODULE)
static struct platform_device bf5xx_adau1701_device = {
.name = "bfin-eval-adau1701",
};
#endif

static struct platform_device *stamp_devices[] __initdata = {

&bfin_dpmc,
Expand Down Expand Up @@ -2821,6 +2833,11 @@ static struct platform_device *stamp_devices[] __initdata = {
defined(CONFIG_IIO_GPIO_TRIGGER_MODULE)
&iio_gpio_trigger,
#endif

#if defined(CONFIG_SND_SOC_BFIN_EVAL_ADAU1701) || \
defined(CONFIG_SND_SOC_BFIN_EVAL_ADAU1701_MODULE)
&bf5xx_adau1701_device,
#endif
};

static int __init net2272_init(void)
Expand Down

0 comments on commit a819b1a

Please sign in to comment.