Merge branch 'davinci-next' into davinci-for-linus

Conflicts:
	arch/arm/mach-davinci/board-da830-evm.c
	arch/arm/mach-davinci/board-da850-evm.c

1 files changed, 5 insertions, 6 deletions

diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c
index 944a0cbaf5cb..c67f684ee3e5 100644
--- a/arch/arm/mach-davinci/board-dm365-evm.c
+++ b/arch/arm/mach-davinci/board-dm365-evm.c
@@ -54,9 +54,7 @@ static inline int have_tvp7002(void)
         return 0;
 }
 
-#define DM365_EVM_PHY_MASK              (0x2)
-#define DM365_EVM_MDIO_FREQUENCY        (2200000) /* PHY bus frequency */
-
+#define DM365_EVM_PHY_ID                "0:01"
 /*
  * A MAX-II CPLD is used for various board control functions.
  */
@@ -175,7 +173,9 @@ static struct at24_platform_data eeprom_info = {
         .context        = (void *)0x7f00,
 };
 
-static struct snd_platform_data dm365_evm_snd_data;
+static struct snd_platform_data dm365_evm_snd_data = {
+        .asp_chan_q = EVENTQ_3,
+};
 
 static struct i2c_board_info i2c_info[] = {
         {
@@ -533,8 +533,7 @@ fail:
 
                 /* ... and ENET ... */
                 dm365evm_emac_configure();
-                soc_info->emac_pdata->phy_mask = DM365_EVM_PHY_MASK;
-                soc_info->emac_pdata->mdio_max_freq = DM365_EVM_MDIO_FREQUENCY;
+                soc_info->emac_pdata->phy_id = DM365_EVM_PHY_ID;
                 resets &= ~BIT(3);
 
                 /* ... and AIC33 */