From patchwork Thu Sep 23 16:11:54 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarkko Nikula X-Patchwork-Id: 202332 X-Patchwork-Delegate: tony@atomide.com 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 o8NGEZas000556 for ; Thu, 23 Sep 2010 16:14:35 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753905Ab0IWQOX (ORCPT ); Thu, 23 Sep 2010 12:14:23 -0400 Received: from mail-ew0-f46.google.com ([209.85.215.46]:60869 "EHLO mail-ew0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753270Ab0IWQOW (ORCPT ); Thu, 23 Sep 2010 12:14:22 -0400 Received: by mail-ew0-f46.google.com with SMTP id 23so511609ewy.19 for ; Thu, 23 Sep 2010 09:14:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=ymcyKXlp//AnATQ7d/fEbTEOU3kuDoFdUk/x53a74q0=; b=V4qs3W9Iiw5wlkTaTB9VRXrh8hwTIM/uyQyTykzy8G/PVyHEphSYL1GRNir6uwO3Fd bFUkUYBLF2F0aDWMFEMuc1pIKdAFw5KQ6K8z0vPz86g/lbaM+xRi9PrzRESiYtpHpuLF JN+2TsezaXIR3QuWthS9+uGS/lyq3vkPM37mA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=cs/6EC3U/P4Ri/LwqcyFPJvbKGjkXzbeNojLq2eQtZTxYLmbY7no/HWSMn9oFJzwJ7 7JjM/o6Wh4PeFO3WQ1cam7GCYJn5iM7FvMH2v7v8rx2omtZj7d+hfScrSd4JLLventXC Mu2SHGwxXXRPiiirW0D1thc/Dei2m6j1fmkwU= Received: by 10.213.33.194 with SMTP id i2mr6701985ebd.10.1285258461806; Thu, 23 Sep 2010 09:14:21 -0700 (PDT) Received: from localhost (host-94-101-4-66.igua.fi [94.101.4.66]) by mx.google.com with ESMTPS id z55sm1442075eeh.21.2010.09.23.09.14.19 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 23 Sep 2010 09:14:20 -0700 (PDT) From: Jarkko Nikula To: alsa-devel@alsa-project.org Cc: Liam Girdwood , Mark Brown , linux-omap@vger.kernel.org, Jarkko Nikula , Vikram Pandita , "Lopez Cruz, Misael" , Jorge Eduardo Candelaria , Tony Lindgren Subject: [PATCH 2/2] omap: zoom: Move new code introduced by ASoC m-c to board-zoom-peripherals Date: Thu, 23 Sep 2010 19:11:54 +0300 Message-Id: <1285258314-23721-2-git-send-email-jhnikula@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1285258314-23721-1-git-send-email-jhnikula@gmail.com> References: <1285258314-23721-1-git-send-email-jhnikula@gmail.com> 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]); Thu, 23 Sep 2010 16:14:35 +0000 (UTC) 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 #include +#include + #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();