diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c
index c3a3e3e..5422fae 100644
--- a/arch/arm/mach-omap2/board-omap4panda.c
+++ b/arch/arm/mach-omap2/board-omap4panda.c
@@ -357,15 +357,15 @@
 		.platform_data = &synaptics_dsx_pdata,
 		.irq = OMAP_GPIO_IRQ(SYNAPTICS_DSX_GPIO_IRQ),
 	},
+	{
+		I2C_BOARD_INFO("tlv320aic23", 0x1B),
+	},
 };
 
 static struct i2c_board_info __initdata tonka_i2c3_info[] = {
 	{
 		I2C_BOARD_INFO("tlv320aic23", 0x1A),
 	},
-	{
-		I2C_BOARD_INFO("tlv320aic23", 0x1B),
-	},
 };
 
 static struct i2c_board_info __initdata tonka_i2c4_info[] = {
diff --git a/sound/soc/omap/tonka.c b/sound/soc/omap/tonka.c
index b26779d..8188eca 100644
--- a/sound/soc/omap/tonka.c
+++ b/sound/soc/omap/tonka.c
@@ -303,7 +303,6 @@
  * Matched to above interfaces at runtime, based upon use case.
  */
 
-#if 0
 	{
 		.name = OMAP_ABE_BE_BT_VX_UL,
 		.stream_name = "BT Capture",
@@ -314,7 +313,7 @@
 
 		/* Bluetooth */
 		.codec_dai_name = "tlv320aic23-hifi",
-		.codec_name = "tlv320aic23-codec.3-001b",
+		.codec_name = "tlv320aic23-codec.2-001b",
 		.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
 			   SND_SOC_DAIFMT_CBS_CFS,
 		.init = tonka_display_init,
@@ -334,7 +333,7 @@
 
 		/* Bluetooth */
 		.codec_dai_name = "tlv320aic23-hifi",
-		.codec_name = "tlv320aic23-codec.3-001b",
+		.codec_name = "tlv320aic23-codec.2-001b",
 		.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
 			   SND_SOC_DAIFMT_CBS_CFS,
 		//.init = tonka_display_init,
@@ -344,7 +343,6 @@
 		.ops = &tonka_mcbsp_ops,
 		.be_id = OMAP_ABE_DAI_BT_VX,
 	},
-#endif
 	{
 		.name = "MM-EXT-UL",
 		.stream_name = "FM Capture",
@@ -388,12 +386,10 @@
 };
 
 static struct snd_soc_codec_conf tonka_codec_conf[] = {
-#if 0
 	{
-		.dev_name = "tlv320aic23-codec.3-001b",
+		.dev_name = "tlv320aic23-codec.2-001b",
 		.name_prefix = "Display",
 	},
-#endif
 	{
 		.dev_name = "tlv320aic23-codec.3-001a",
 		.name_prefix = "Speaker",