From a819b1a34ca55681e89675e83d5dbb33fc77c15e Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Tue, 30 Aug 2011 13:12:26 -0400 Subject: [PATCH] --- yaml --- r: 269287 b: refs/heads/master c: 2fba06f2b8a7fe69c0eff94389834821f54ada10 h: refs/heads/master i: 269285: 6de06d8b71c579460d75f6734d6f1f012d7e8d30 269283: 7371cc162281a5bab862b757035df00e1bd19d30 269279: 58214fb462957d47b455aac1365b35ea1e1aedcb v: v3 --- [refs] | 2 +- trunk/arch/blackfin/mach-bf537/boards/stamp.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 5ebe07abba67..12b7bdaa861f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2db1f97299131ecd121e32b6d2fc88ae4802bf86 +refs/heads/master: 2fba06f2b8a7fe69c0eff94389834821f54ada10 diff --git a/trunk/arch/blackfin/mach-bf537/boards/stamp.c b/trunk/arch/blackfin/mach-bf537/boards/stamp.c index 090a880927bf..fcd0a67efada 100644 --- a/trunk/arch/blackfin/mach-bf537/boards/stamp.c +++ b/trunk/arch/blackfin/mach-bf537/boards/stamp.c @@ -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), @@ -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, @@ -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)