[PATCH 1/2] omap: zoom2: Fix ASoC multi-component build breakage by removing dead code

[PATCH 1/2] omap: zoom2: Fix ASoC multi-component build breakage by removing dead code

[Jarkko Nikula]

ASoC Multi-Component Support patch removes #if 0 in board-zoom2.c that was
used to protect some uncompiling dead code. Remove that code as it seems to
be here quite some time since commit 479f12c.

Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Cc: Vikram Pandita <vikram.pandita@ti.com>
Cc: Tony Lindgren <tony@atomide.com>
---
Sorry for not noticing this before. Somehow my own test config didn't include
zoom2 like omap3_defconfig does.
---
 arch/arm/mach-omap2/board-zoom2.c |   12 ------------
 1 files changed, 0 insertions(+), 12 deletions(-)

diff --git a/arch/arm/mach-omap2/board-zoom2.c b/arch/arm/mach-omap2/board-zoom2.c
index efbcd8f..86d4515 100644
--- a/arch/arm/mach-omap2/board-zoom2.c
+++ b/arch/arm/mach-omap2/board-zoom2.c
@@ -41,10 +41,6 @@ void zoom2_set_hs_extmute(int mute)
 	gpio_set_value(ZOOM2_HEADSET_EXTMUTE_GPIO, mute);
 }
 
-static struct twl4030_madc_platform_data zoom2_madc_data = {
-	.irq_line	= 1,
-};
-
 static struct twl4030_codec_audio_data zoom2_audio_data = {
 	.audio_mclk = 26000000,
 	.ramp_delay_value = 3,	/* 161 ms */
@@ -62,15 +58,7 @@ static struct twl4030_platform_data zoom2_twldata = {
 	.irq_end	= TWL4030_IRQ_END,
 
 	/* platform_data for children goes here */
-	.bci		= &zoom2_bci_data,
-	.madc		= &zoom2_madc_data,
-	.usb		= &zoom2_usb_data,
-	.gpio		= &zoom2_gpio_data,
-	.keypad		= &zoom2_kp_twl4030_data,
 	.codec		= &zoom2_codec_data,
-	.vmmc1          = &zoom2_vmmc1,
-	.vmmc2          = &zoom2_vmmc2,
-	.vsim           = &zoom2_vsim,
 };
 
 static struct i2c_board_info __initdata zoom2_i2c_boardinfo[] = {
-- 
1.7.1

[PATCH 2/2] omap: zoom: Move new code introduced by ASoC m-c to board-zoom-peripherals

[Jarkko Nikula]

ASoC Multi-Component Support moves some code from sound/soc/omap/zoom2.c into
arch/arm/mach-omap2/board-zoom2.c. However, that code should go to
board-zoom-peripherals.c instead as there is common code and registration
for zoom boards.

Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Cc: Vikram Pandita <vikram.pandita@ti.com>
Cc: Lopez Cruz, Misael <x0052729@ti.com>
Cc: Jorge Eduardo Candelaria <jorge.candelaria@ti.com>
Cc: Tony Lindgren <tony@atomide.com>
---
I don't have this HW so not tested. This is omap architecture patch but I
think this should go together with ASoC Multi-Component.
---
 arch/arm/mach-omap2/board-zoom-peripherals.c |   12 +++++++
 arch/arm/mach-omap2/board-zoom2.c            |   44 --------------------------
 2 files changed, 12 insertions(+), 44 deletions(-)

diff --git a/arch/arm/mach-omap2/board-zoom-peripherals.c b/arch/arm/mach-omap2/board-zoom-peripherals.c
index 6b39849..3c65304 100644
--- a/arch/arm/mach-omap2/board-zoom-peripherals.c
+++ b/arch/arm/mach-omap2/board-zoom-peripherals.c
@@ -24,6 +24,8 @@
 #include <plat/common.h>
 #include <plat/usb.h>
 
+#include <mach/board-zoom.h>
+
 #include "mux.h"
 #include "hsmmc.h"
 
@@ -188,6 +190,11 @@ static int zoom_twl_gpio_setup(struct device *dev,
 	return 0;
 }
 
+/* EXTMUTE callback function */
+void zoom2_set_hs_extmute(int mute)
+{
+	gpio_set_value(ZOOM2_HEADSET_EXTMUTE_GPIO, mute);
+}
 
 static int zoom_batt_table[] = {
 /* 0 C*/
@@ -257,6 +264,11 @@ static struct i2c_board_info __initdata zoom_i2c_boardinfo[] = {
 
 static int __init omap_i2c_init(void)
 {
+	if (machine_is_omap_zoom2()) {
+		zoom_audio_data.ramp_delay_value = 3;	/* 161 ms */
+		zoom_audio_data.hs_extmute = 1;
+		zoom_audio_data.set_hs_extmute = zoom2_set_hs_extmute;
+	}
 	omap_register_i2c_bus(1, 2400, zoom_i2c_boardinfo,
 			ARRAY_SIZE(zoom_i2c_boardinfo));
 	omap_register_i2c_bus(2, 400, NULL, 0);
diff --git a/arch/arm/mach-omap2/board-zoom2.c b/arch/arm/mach-omap2/board-zoom2.c
index 86d4515..00c8f83 100644
--- a/arch/arm/mach-omap2/board-zoom2.c
+++ b/arch/arm/mach-omap2/board-zoom2.c
@@ -35,49 +35,6 @@ static void __init omap_zoom2_init_irq(void)
 	omap_gpio_init();
 }
 
-/* EXTMUTE callback function */
-void zoom2_set_hs_extmute(int mute)
-{
-	gpio_set_value(ZOOM2_HEADSET_EXTMUTE_GPIO, mute);
-}
-
-static struct twl4030_codec_audio_data zoom2_audio_data = {
-	.audio_mclk = 26000000,
-	.ramp_delay_value = 3,	/* 161 ms */
-	.hs_extmute = 1,
-	.set_hs_extmute = zoom2_set_hs_extmute,
-};
-
-static struct twl4030_codec_data zoom2_codec_data = {
-	.audio_mclk = 26000000,
-	.audio = &zoom2_audio_data,
-};
-
-static struct twl4030_platform_data zoom2_twldata = {
-	.irq_base	= TWL4030_IRQ_BASE,
-	.irq_end	= TWL4030_IRQ_END,
-
-	/* platform_data for children goes here */
-	.codec		= &zoom2_codec_data,
-};
-
-static struct i2c_board_info __initdata zoom2_i2c_boardinfo[] = {
-	{
-		I2C_BOARD_INFO("twl4030", 0x48),
-		.flags = I2C_CLIENT_WAKE,
-		.irq = INT_34XX_SYS_NIRQ,
-		.platform_data = &zoom2_twldata,
-	},
-};
-
-static int __init omap3_zoom2_i2c_init(void)
-{
-	omap_register_i2c_bus(1, 2600, zoom2_i2c_boardinfo,
-			ARRAY_SIZE(zoom2_i2c_boardinfo));
-	return 0;
-}
-
-
 #ifdef CONFIG_OMAP_MUX
 static struct omap_board_mux board_mux[] __initdata = {
 	/* WLAN IRQ - GPIO 162 */
@@ -144,7 +101,6 @@ static void __init omap_zoom2_init(void)
 {
 	omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
 	zoom_peripherals_init();
-	omap3_zoom2_i2c_init();
 	board_nand_init(zoom_nand_partitions,
 			ARRAY_SIZE(zoom_nand_partitions), ZOOM_NAND_CS);
 	zoom_debugboard_init();
-- 
1.7.1

Re: [PATCH 1/2] omap: zoom2: Fix ASoC multi-component build breakage by removing dead code

[Mark Brown]

On Thu, Sep 23, 2010 at 07:11:53PM +0300, Jarkko Nikula wrote:
> ASoC Multi-Component Support patch removes #if 0 in board-zoom2.c that was
> used to protect some uncompiling dead code. Remove that code as it seems to
> be here quite some time since commit 479f12c.
> 
> Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>

Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

Re: [PATCH 2/2] omap: zoom: Move new code introduced by ASoC m-c to board-zoom-peripherals

[Mark Brown]

On Thu, Sep 23, 2010 at 07:11:54PM +0300, Jarkko Nikula wrote:
> ASoC Multi-Component Support moves some code from sound/soc/omap/zoom2.c into
> arch/arm/mach-omap2/board-zoom2.c. However, that code should go to
> board-zoom-peripherals.c instead as there is common code and registration
> for zoom boards.
> 
> Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>

Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

RE: [PATCH 2/2] omap: zoom: Move new code introduced by ASoC m-c to board-zoom-peripherals

[Lopez Cruz, Misael]

Hi Jarkko,

> ASoC Multi-Component Support moves some code from sound/soc/omap/zoom2.c
> into
> arch/arm/mach-omap2/board-zoom2.c. However, that code should go to
> board-zoom-peripherals.c instead as there is common code and registration
> for zoom boards.
> 
> Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
> Cc: Vikram Pandita <vikram.pandita@ti.com>
> Cc: Lopez Cruz, Misael <x0052729@ti.com>
> Cc: Jorge Eduardo Candelaria <jorge.candelaria@ti.com>
> Cc: Tony Lindgren <tony@atomide.com>
> ---
> I don't have this HW so not tested.
Tested on zoom2 using the 2 patches of your series, compilation break is
gone and audio works fine.

Thanks,
-Misael

Re: [PATCH 2/2] omap: zoom: Move new code introduced by ASoC m-c to board-zoom-peripherals

[Liam Girdwood]

On Fri, 2010-09-24 at 11:31 -0500, Lopez Cruz, Misael wrote:
> Hi Jarkko,
> 
> > ASoC Multi-Component Support moves some code from sound/soc/omap/zoom2.c
> > into
> > arch/arm/mach-omap2/board-zoom2.c. However, that code should go to
> > board-zoom-peripherals.c instead as there is common code and registration
> > for zoom boards.
> > 
> > Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
> > Cc: Vikram Pandita <vikram.pandita@ti.com>
> > Cc: Lopez Cruz, Misael <x0052729@ti.com>
> > Cc: Jorge Eduardo Candelaria <jorge.candelaria@ti.com>
> > Cc: Tony Lindgren <tony@atomide.com>
> > ---
> > I don't have this HW so not tested.
> Tested on zoom2 using the 2 patches of your series, compilation break is
> gone and audio works fine.
> 
> Thanks,
> -Misael

Applied, and manually added your Tested-by:

Thanks

Liam
-- 
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk

Re: [PATCH 1/2] omap: zoom2: Fix ASoC multi-component build breakage by removing dead code

[Tony Lindgren]

* Jarkko Nikula <jhnikula@gmail.com> [100923 09:05]:
> ASoC Multi-Component Support patch removes #if 0 in board-zoom2.c that was
> used to protect some uncompiling dead code. Remove that code as it seems to
> be here quite some time since commit 479f12c.
> 
> Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
> Cc: Vikram Pandita <vikram.pandita@ti.com>

I assume you guys want to merge this via ASoC patches.

Acked-by: Tony Lindgren <tony@atomide.com>

RE: [PATCH 2/2] omap: zoom: Move new code introduced by ASoC m-c to board-zoom-peripherals

[Anand Gadiyar]

Liam Girdwood wrote:
> On Fri, 2010-09-24 at 11:31 -0500, Lopez Cruz, Misael wrote:
> > Hi Jarkko,
> >
> > > ASoC Multi-Component Support moves some code from
> > > sound/soc/omap/zoom2.c
> > > into
> > > arch/arm/mach-omap2/board-zoom2.c. However, that code should go to
> > > board-zoom-peripherals.c instead as there is common code and
> > > registration
> > > for zoom boards.
> > >
> > > Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
> > > Cc: Vikram Pandita <vikram.pandita@ti.com>
> > > Cc: Lopez Cruz, Misael <x0052729@ti.com>
> > > Cc: Jorge Eduardo Candelaria <jorge.candelaria@ti.com>
> > > Cc: Tony Lindgren <tony@atomide.com>
> > > ---
> > > I don't have this HW so not tested.
> > Tested on zoom2 using the 2 patches of your series, compilation break is
> > gone and audio works fine.
> >
> > Thanks,
> > -Misael
>
> Applied, and manually added your Tested-by:
>
> Thanks
>
> Liam

Misael, Liam,

Sorry I noticed this patch only now. I have a minor comment on the patch:

Specifically, the part below

+	if (machine_is_omap_zoom2()) {
+		zoom_audio_data.ramp_delay_value = 3;	/* 161 ms */
+		zoom_audio_data.hs_extmute = 1;
+		zoom_audio_data.set_hs_extmute = zoom2_set_hs_extmute;
+	}

Isn't the audio on a zoom2/zoom3/3630 SDP the same? (Or at least the
same on a zoom2 and zoom3)? If so, we could probably get rid of the
machine_is_omap_zoom2() check, right?

- Anand

RE: [PATCH 2/2] omap: zoom: Move new code introduced by ASoC m-c to board-zoom-peripherals

[Lopez Cruz, Misael]

> Liam Girdwood wrote:
> > On Fri, 2010-09-24 at 11:31 -0500, Lopez Cruz, Misael wrote:
> > > Hi Jarkko,
> > >
> > > > ASoC Multi-Component Support moves some code from
> > > > sound/soc/omap/zoom2.c
> > > > into
> > > > arch/arm/mach-omap2/board-zoom2.c. However, that code should go to
> > > > board-zoom-peripherals.c instead as there is common code and
> > > > registration
> > > > for zoom boards.
> > > >
> > > > Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
> > > > Cc: Vikram Pandita <vikram.pandita@ti.com>
> > > > Cc: Lopez Cruz, Misael <x0052729@ti.com>
> > > > Cc: Jorge Eduardo Candelaria <jorge.candelaria@ti.com>
> > > > Cc: Tony Lindgren <tony@atomide.com>
> > > > ---
> > > > I don't have this HW so not tested.
> > > Tested on zoom2 using the 2 patches of your series, compilation break
> is
> > > gone and audio works fine.
> > >
> > > Thanks,
> > > -Misael
> >
> > Applied, and manually added your Tested-by:
> >
> > Thanks
> >
> > Liam
> 
> Misael, Liam,
> 
> Sorry I noticed this patch only now. I have a minor comment on the patch:
> 
> Specifically, the part below
> 
> +	if (machine_is_omap_zoom2()) {
> +		zoom_audio_data.ramp_delay_value = 3;	/* 161 ms */
> +		zoom_audio_data.hs_extmute = 1;
> +		zoom_audio_data.set_hs_extmute = zoom2_set_hs_extmute;
> +	}
> 
> Isn't the audio on a zoom2/zoom3/3630 SDP the same? (Or at least the
> same on a zoom2 and zoom3)?
Yes, at least zoom2 and zoom3 are the same for audio. 

> If so, we could probably get rid of the
> machine_is_omap_zoom2() check, right?
I think it'd better to add checks for the machines supported by the
driver, so it fails nicely with unsupported ones. I'll go thru the
differences between our boards and send a patch soon.

> - Anand

Thanks,
-Misa