linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: jassisinghbrar@gmail.com (Jassi Brar)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 16/17] ARM: SMDKV310: Enable I2S device
Date: Fri, 17 Dec 2010 14:00:16 +0900	[thread overview]
Message-ID: <1292562016-20100-1-git-send-email-jassisinghbrar@gmail.com> (raw)
In-Reply-To: <1292561925-19586-1-git-send-email-jassisinghbrar@gmail.com>

From: Jassi Brar <jassi.brar@samsung.com>

Enable I2S_0 device on the SMDK.
Also, add the dependency I2C_1 device.

Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
---
 arch/arm/mach-s5pv310/mach-smdkv310.c |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-s5pv310/mach-smdkv310.c b/arch/arm/mach-s5pv310/mach-smdkv310.c
index da79f7f..d56133f 100644
--- a/arch/arm/mach-s5pv310/mach-smdkv310.c
+++ b/arch/arm/mach-s5pv310/mach-smdkv310.c
@@ -14,6 +14,7 @@
 #include <linux/platform_device.h>
 #include <linux/smsc911x.h>
 #include <linux/io.h>
+#include <linux/i2c.h>
 
 #include <asm/mach/arch.h>
 #include <asm/mach-types.h>
@@ -23,6 +24,7 @@
 #include <plat/cpu.h>
 #include <plat/devs.h>
 #include <plat/sdhci.h>
+#include <plat/iic.h>
 
 #include <mach/map.h>
 #include <mach/regs-srom.h>
@@ -139,7 +141,12 @@ static struct platform_device smdkv310_smsc911x = {
 	},
 };
 
+static struct i2c_board_info i2c_devs1[] __initdata = {
+	{I2C_BOARD_INFO("wm8994", 0x1a),},
+};
+
 static struct platform_device *smdkv310_devices[] __initdata = {
+	&s3c_device_i2c1,
 	&s3c_device_hsmmc0,
 	&s3c_device_hsmmc1,
 	&s3c_device_hsmmc2,
@@ -149,6 +156,7 @@ static struct platform_device *smdkv310_devices[] __initdata = {
 	&smdkv310_smsc911x,
 	&samsung_asoc_dma,
 	&s5pv310_device_ac97,
+	&s5pv310_device_i2s0,
 };
 
 static void __init smdkv310_smsc911x_init(void)
@@ -184,6 +192,9 @@ static void __init smdkv310_map_io(void)
 
 static void __init smdkv310_machine_init(void)
 {
+	s3c_i2c1_set_platdata(NULL);
+	i2c_register_board_info(1, i2c_devs1, ARRAY_SIZE(i2c_devs1));
+
 	smdkv310_smsc911x_init();
 
 	s3c_sdhci0_set_platdata(&smdkv310_hsmmc0_pdata);
-- 
1.6.2.5

  parent reply	other threads:[~2010-12-17  5:00 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-12-17  4:58 [PATCH 00/17] Samsung: Enable Audio Devices Jassi Brar
2010-12-17  5:00 ` [PATCH 01/17] ARM: S5P6442: Implement i2c-gpio config Jassi Brar
2010-12-17  5:00 ` [PATCH 02/17] ARM: SMDK6442: Enable I2C0 device on board Jassi Brar
2010-12-17  5:00 ` [PATCH 03/17] ARM: SMDK6442: Enable I2S device to work Jassi Brar
2010-12-17  5:00 ` [PATCH 04/17] ARM: S5P6450: Define clocks for I2S Jassi Brar
2010-12-21  0:55   ` Kukjin Kim
2010-12-21  1:43     ` Jassi Brar
2010-12-17  5:00 ` [PATCH 05/17] ARM: S5P6450: Define base addresses " Jassi Brar
2010-12-17  5:00 ` [PATCH 06/17] ARM: S5P64X0: Segregate audio devices Jassi Brar
2010-12-21  0:39   ` Kukjin Kim
2010-12-21  1:41     ` Jassi Brar
2010-12-17  5:00 ` [PATCH 07/17] ARM: SMDK6440: Enable I2S device to work Jassi Brar
2010-12-17  5:00 ` [PATCH 08/17] ARM: SMDK6450: " Jassi Brar
2010-12-17  5:00 ` [PATCH 09/17] ARM: SMDKC110: " Jassi Brar
2010-12-17  5:00 ` [PATCH 10/17] ARM: SMDKV210: " Jassi Brar
2010-12-17  5:00 ` [PATCH 11/17] ARM: SMDKV310: Enable I2C1 device Jassi Brar
2010-12-17  5:00 ` [PATCH 12/17] ARM: S5PV310: Add PDMA clocks Jassi Brar
2010-12-17  5:00 ` [PATCH 13/17] ARM: S5PV310: Add AC97 clocks Jassi Brar
2010-12-17  5:00 ` [PATCH 14/17] ARM: S5PV310: Define I2S clocks Jassi Brar
2010-12-17  5:44   ` Kyungmin Park
2010-12-17  5:51     ` Jassi Brar
2010-12-17  6:02       ` Kyungmin Park
2010-12-17  6:14         ` Jassi Brar
2010-12-17  5:00 ` [PATCH 15/17] ARM: S5PV310: Add AC97 support for SMDK Jassi Brar
2010-12-17  5:00 ` Jassi Brar [this message]
2010-12-17  5:00 ` [PATCH 17/17] ARM: SMDKC210: Enable I2S device Jassi Brar
2010-12-17 11:55 ` [PATCH 00/17] Samsung: Enable Audio Devices Mark Brown
2010-12-20 22:27   ` Kukjin Kim
2010-12-20 23:35     ` Mark Brown
2010-12-21  1:26 ` Kukjin Kim
2010-12-21  2:52   ` Jassi Brar
2010-12-22  4:39     ` Kukjin Kim

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=1292562016-20100-1-git-send-email-jassisinghbrar@gmail.com \
    --to=jassisinghbrar@gmail.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).