Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 269288
b: refs/heads/master
c: 080ae07
h: refs/heads/master
v: v3
  • Loading branch information
Lars-Peter Clausen authored and Mike Frysinger committed Oct 25, 2011
1 parent a819b1a commit 0fec7f0
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 4 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: 2fba06f2b8a7fe69c0eff94389834821f54ada10
refs/heads/master: 080ae07cb7c74e0a6fd4f69f56433f8456338d20
19 changes: 16 additions & 3 deletions trunk/arch/blackfin/mach-bf537/boards/stamp.c
Original file line number Diff line number Diff line change
Expand Up @@ -984,9 +984,9 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
},
#endif

#if defined(CONFIG_SND_BF5XX_SOC_ADAV80X) || defined(CONFIG_SND_BF5XX_SOC_ADAV80X_MODULE)
#if defined(CONFIG_SND_SOC_ADAV80X) || defined(CONFIG_SND_SOC_ADV80X_MODULE)
{
.modalias = "adav80x",
.modalias = "adav801",
.max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */
.bus_num = 0,
.chip_select = 1,
Expand Down Expand Up @@ -2101,7 +2101,7 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
},
#endif

#if defined(CONFIG_SND_BF5XX_SOC_ADAV80X) || defined(CONFIG_SND_BF5XX_SOC_ADAV80X_MODULE)
#if defined(CONFIG_SND_SOC_ADAV80X) || defined(CONFIG_SND_SOC_ADAV80X_MODULE)
{
I2C_BOARD_INFO("adav803", 0x10),
},
Expand Down Expand Up @@ -2552,6 +2552,14 @@ static struct platform_device bfin_ad73311_codec_device = {
};
#endif

#if defined(CONFIG_SND_SOC_BFIN_EVAL_ADAV80X) || \
defined(CONFIG_SND_SOC_BFIN_EVAL_ADAV80X_MODULE)
static struct platform_device bfin_eval_adav801_device = {
.name = "bfin-eval-adav801",
.id = -1,
};
#endif

#if defined(CONFIG_SND_BF5XX_SOC_I2S) || defined(CONFIG_SND_BF5XX_SOC_I2S_MODULE)
static struct platform_device bfin_i2s = {
.name = "bfin-i2s",
Expand Down Expand Up @@ -2838,6 +2846,11 @@ static struct platform_device *stamp_devices[] __initdata = {
defined(CONFIG_SND_SOC_BFIN_EVAL_ADAU1701_MODULE)
&bf5xx_adau1701_device,
#endif

#if defined(CONFIG_SND_SOC_BFIN_EVAL_ADAV80X) || \
defined(CONFIG_SND_SOC_BFIN_EVAL_ADAV80X_MODULE)
&bfin_eval_adav801_device,
#endif
};

static int __init net2272_init(void)
Expand Down

0 comments on commit 0fec7f0

Please sign in to comment.