From patchwork Mon Aug 9 07:58:59 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarkko Nikula X-Patchwork-Id: 118337 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o797vojY006350 for ; Mon, 9 Aug 2010 07:57:58 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755602Ab0HIH55 (ORCPT ); Mon, 9 Aug 2010 03:57:57 -0400 Received: from mail-ew0-f46.google.com ([209.85.215.46]:54985 "EHLO mail-ew0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751484Ab0HIH54 (ORCPT ); Mon, 9 Aug 2010 03:57:56 -0400 Received: by mail-ew0-f46.google.com with SMTP id 23so3345279ewy.19 for ; Mon, 09 Aug 2010 00:57:55 -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=xPqnHz++BjY9EbpBcEdlxlNg3ps8zgbDwuMNo+MSNp4=; b=wjY+snNJXfx3Tlf115A6dFfm/LOme0/HtS8ERlUZKhUA6b8vs0OohLopUsgK2EMV9z tc56MFR8Ka10+zCU81HhGn7VcScC1A3/O5kOYTDXX0C4OgKtccZ3uGVADAdQiVGRWcW5 xdyf9u24pq5GwQWOVg3S7h9U9yKLzlPzoWFng= 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=vrjyjSq5tRtIdpGrVxXKXny+rdqOAZDeeMHBp/Wq3a7aLJyVYbfC8Dn1/7m/fpSjsZ CS25bN98teqOV2Q8mQmUbRC5/8sdnmZz6CqIvbm2EYTY6SnlAN7+9k5BighDx5uIVU+2 1gqxKZDyBBzH2vk9/R2vV8uEYlKT9S6DwrZSQ= Received: by 10.213.25.143 with SMTP id z15mr2570957ebb.6.1281340675613; Mon, 09 Aug 2010 00:57:55 -0700 (PDT) Received: from localhost (host-94-101-4-66.igua.fi [94.101.4.66]) by mx.google.com with ESMTPS id v59sm7392675eeh.10.2010.08.09.00.57.53 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 09 Aug 2010 00:57:54 -0700 (PDT) From: Jarkko Nikula To: linux-omap@vger.kernel.org Cc: Tony Lindgren , Jarkko Nikula Subject: [PATCH 2/3] omap: n8x0: Register i2c2 and add board info with tlv320aic3x for N810 Date: Mon, 9 Aug 2010 10:58:59 +0300 Message-Id: <1281340740-10823-3-git-send-email-jhnikula@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1281340740-10823-1-git-send-email-jhnikula@gmail.com> References: <1281340740-10823-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 (demeter.kernel.org [140.211.167.41]); Mon, 09 Aug 2010 07:57:58 +0000 (UTC) diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c index 313ce5e..7863633 100644 --- a/arch/arm/mach-omap2/board-n8x0.c +++ b/arch/arm/mach-omap2/board-n8x0.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include @@ -633,6 +634,17 @@ static struct i2c_board_info __initdata n8x0_i2c_board_info_1[] __initdata = { }, }; +static struct aic3x_pdata n810_aic33_data __initdata = { + .gpio_reset = 118, +}; + +static struct i2c_board_info n810_i2c_board_info_2[] __initdata = { + { + I2C_BOARD_INFO("tlv320aic3x", 0x18), + .platform_data = &n810_aic33_data, + }, +}; + static void __init n8x0_map_io(void) { omap2_set_globals_242x(); @@ -662,6 +674,10 @@ static void __init n8x0_init_machine(void) ARRAY_SIZE(n800_spi_board_info)); omap_register_i2c_bus(1, 400, n8x0_i2c_board_info_1, ARRAY_SIZE(n8x0_i2c_board_info_1)); + omap_register_i2c_bus(2, 400, NULL, 0); + if (machine_is_nokia_n810()) + i2c_register_board_info(2, n810_i2c_board_info_2, + ARRAY_SIZE(n810_i2c_board_info_2)); omap_serial_init(); n8x0_onenand_init();