From patchwork Fri Oct 1 20:30:11 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Gadiyar X-Patchwork-Id: 224812 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o91KUWH3016859 for ; Fri, 1 Oct 2010 20:30:32 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753090Ab0JAUab (ORCPT ); Fri, 1 Oct 2010 16:30:31 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:43051 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752870Ab0JAUaa (ORCPT ); Fri, 1 Oct 2010 16:30:30 -0400 Received: from dbdp31.itg.ti.com ([172.24.170.98]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id o91KUKWW006413 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 1 Oct 2010 15:30:22 -0500 Received: from linfarm476.india.ti.com (localhost [127.0.0.1]) by dbdp31.itg.ti.com (8.13.8/8.13.8) with ESMTP id o91KUDMw027037; Sat, 2 Oct 2010 02:00:14 +0530 (IST) Received: from linfarm476.india.ti.com (localhost [127.0.0.1]) by linfarm476.india.ti.com (8.12.11/8.12.11) with ESMTP id o91KUDNp017436; Sat, 2 Oct 2010 02:00:13 +0530 Received: (from a0393673@localhost) by linfarm476.india.ti.com (8.12.11/8.12.11/Submit) id o91KUBDw017429; Sat, 2 Oct 2010 02:00:11 +0530 From: Anand Gadiyar To: linux-omap@vger.kernel.org, alsa-devel@alsa-project.org Cc: Anand Gadiyar , Tony Lindgren , Liam Girdwood , Mark Brown Subject: [PATCH] omap: zoom2: fix build break due to ASoC changes Date: Sat, 2 Oct 2010 02:00:11 +0530 Message-Id: <1285965011-17384-1-git-send-email-gadiyar@ti.com> X-Mailer: git-send-email 1.5.6.6 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Fri, 01 Oct 2010 20:30:32 +0000 (UTC) Index: linux-2.6/arch/arm/mach-omap2/board-zoom2.c =================================================================== --- linux-2.6.orig/arch/arm/mach-omap2/board-zoom2.c +++ linux-2.6/arch/arm/mach-omap2/board-zoom2.c @@ -14,7 +14,6 @@ #include #include #include -#include #include #include @@ -35,11 +34,8 @@ static void __init omap_zoom2_init_irq(v omap_gpio_init(); } -/* EXTMUTE callback function */ -void zoom2_set_hs_extmute(int mute) -{ - gpio_set_value(ZOOM2_HEADSET_EXTMUTE_GPIO, mute); -} +/* REVISIT: These audio entries can be removed once MFD code is merged */ +#if 0 static struct twl4030_madc_platform_data zoom2_madc_data = { .irq_line = 1, @@ -47,9 +43,6 @@ static struct twl4030_madc_platform_data 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 = { @@ -71,24 +64,10 @@ static struct twl4030_platform_data zoom .vmmc1 = &zoom2_vmmc1, .vmmc2 = &zoom2_vmmc2, .vsim = &zoom2_vsim, -}; -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; -} - +#endif #ifdef CONFIG_OMAP_MUX static struct omap_board_mux board_mux[] __initdata = { @@ -156,7 +135,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();