From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 03/11] omap: n8x0: Register i2c2 and add board info with tlv320aic3xfor N810
Date: Thu, 23 Sep 2010 18:50:51 -0700 [thread overview]
Message-ID: <20100924015051.10325.55550.stgit@baageli.muru.com> (raw)
In-Reply-To: <20100924014938.10325.35279.stgit@baageli.muru.com>
From: Jarkko Nikula <jhnikula@gmail.com>
Second i2c bus on Nokia N800 and N810 shares both common and hw specific
peripherals. Register now this bus and add board info with tlv320aic3x for
N810. Common peripherals may be added as an additional board info to
omap_register_i2c_bus(2, ...);
Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
arch/arm/mach-omap2/board-n8x0.c | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
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 <linux/i2c.h>
#include <linux/spi/spi.h>
#include <linux/usb/musb.h>
+#include <sound/tlv320aic3x.h>
#include <asm/mach/arch.h>
#include <asm/mach-types.h>
@@ -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();
next prev parent reply other threads:[~2010-09-24 1:50 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-24 1:50 [PATCH 00/11] omap patches for review for v2.6.37 merge window Tony Lindgren
2010-09-24 1:50 ` [PATCH 01/11] omap2: fix assorted compiler warnings Tony Lindgren
2010-09-24 1:50 ` [PATCH 02/11] omap: n8x0: Cleanup i2c1 and menelaus registration Tony Lindgren
2010-09-24 1:50 ` Tony Lindgren [this message]
2010-09-24 1:50 ` [PATCH 04/11] omap: n8x0: Mux i2s codec port pins for McBSP block Tony Lindgren
2010-09-24 1:50 ` [PATCH 05/11] omap3: Remove non-existent config option Tony Lindgren
2010-09-24 10:00 ` Felipe Contreras
2010-09-24 15:17 ` Premi, Sanjeev
2010-09-25 15:42 ` Felipe Contreras
2010-09-27 11:02 ` Marathe, Yogesh
2010-09-27 15:56 ` Felipe Contreras
2010-09-27 16:24 ` Tony Lindgren
2010-09-27 16:28 ` Kanigeri, Hari
2010-09-29 11:34 ` Felipe Contreras
2010-09-29 13:28 ` Marathe, Yogesh
2010-09-29 19:12 ` Felipe Contreras
2010-10-01 11:29 ` Marathe, Yogesh
2010-10-06 0:14 ` Guzman Lugo, Fernando
2010-10-06 8:31 ` Marathe, Yogesh
2010-10-10 14:07 ` Felipe Contreras
2010-10-11 5:10 ` Marathe, Yogesh
2010-09-24 1:50 ` [PATCH 06/11] omap: usb: fix build warning Tony Lindgren
2010-09-24 1:51 ` [PATCH 07/11] omap: crypto: updates to enable omap aes Tony Lindgren
2010-09-24 1:51 ` [PATCH 08/11] omap: i2c: Avoid compilation error in case the header is included multiple times Tony Lindgren
2010-09-24 1:51 ` [PATCH 09/11] omap: McBSP: Do not enable SRG in slave mode Tony Lindgren
2010-09-24 1:51 ` [PATCH 10/11] omap2: McBSP: Remove mux code for OMAP2420 McBSP2 and docleanups Tony Lindgren
2010-09-24 1:51 ` [PATCH 11/11] omap: mmc: extended to pass host capabilities from board file Tony Lindgren
2010-09-24 5:53 ` [PATCH 00/11] omap patches for review for v2.6.37 merge window Jarkko Nikula
2010-09-24 18:12 ` Tony Lindgren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100924015051.10325.55550.stgit@baageli.muru.com \
--to=tony@atomide.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).