Merge branch 'topic/asoc' into for-linus

diff --combined arch/arm/mach-davinci/board-da850-evm.c
index b280efb1fa120806b1cfe85bdea1f90d1bc0caaf,d4ec18d0b4a4fc7a58c95f054b50511e4e448731..e8c8190902681f01341c6d3d7cd8f3551cd072f3
--- 1/arch/arm/mach-davinci/board-da850-evm.c
--- 2/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@@ -25,7 -25,6 +25,7 @@@
  #include <linux/mtd/partitions.h>
  #include <linux/mtd/physmap.h>
  #include <linux/regulator/machine.h>
 +#include <linux/regulator/tps6507x.h>
  #include <linux/mfd/tps6507x.h>
  #include <linux/input/tps6507x-ts.h>
  
@@@ -343,7 -342,7 +343,7 @@@ static struct snd_platform_data da850_e
        .num_serializer = ARRAY_SIZE(da850_iis_serializer_direction),
        .tdm_slots      = 2,
        .serial_dir     = da850_iis_serializer_direction,
-       .eventq_no      = EVENTQ_1,
+       .asp_chan_q     = EVENTQ_1,
        .version        = MCASP_VERSION_2,
        .txnumevt       = 1,
        .rxnumevt       = 1,
@@@ -470,11 -469,6 +470,11 @@@ struct regulator_consumer_supply tps650
        },
  };
  
 +/* We take advantage of the fact that both defdcdc{2,3} are tied high */
 +static struct tps6507x_reg_platform_data tps6507x_platform_data = {
 +      .defdcdc_default = true,
 +};
 +
  struct regulator_init_data tps65070_regulator_data[] = {
        /* dcdc1 */
        {
@@@ -500,7 -494,6 +500,7 @@@
                },
                .num_consumer_supplies = ARRAY_SIZE(tps65070_dcdc2_consumers),
                .consumer_supplies = tps65070_dcdc2_consumers,
 +              .driver_data = &tps6507x_platform_data,
        },
  
        /* dcdc3 */
@@@ -514,7 -507,6 +514,7 @@@
                },
                .num_consumer_supplies = ARRAY_SIZE(tps65070_dcdc3_consumers),
                .consumer_supplies = tps65070_dcdc3_consumers,
 +              .driver_data = &tps6507x_platform_data,
        },
  
        /* ldo1 */