From: Ben Dooks <ben@simtec.co.uk>
To: alsa-devel@alsa-project.org
Cc: broonie@opensource.wolfsonmicro.com
Subject: [patch 3/4] tlv320aic3x: fixup board device changes
Date: Thu, 20 Aug 2009 22:50:42 +0100 [thread overview]
Message-ID: <20090820215121.950753888@fluff.org> (raw)
In-Reply-To: 20090820215039.380849394@fluff.org
[-- Attachment #1: asoc-simtec-tlv320aic33-dev-tmp-board.patch --]
[-- Type: text/plain, Size: 3595 bytes --]
Fixup the device changes by modifying the files that we just removed the
explicit device creation from with i2c_register_board_info() until this
can be moved into the relevant board files.
Signed-off-by: Ben Dooks <ben@simtec.co.uk>
---
sound/soc/davinci/davinci-evm.c | 10 ++++++++++
sound/soc/omap/n810.c | 10 ++++++++++
sound/soc/s6000/s6105-ipcam.c | 10 ++++++++++
3 files changed, 30 insertions(+)
Index: b/sound/soc/s6000/s6105-ipcam.c
===================================================================
--- a/sound/soc/s6000/s6105-ipcam.c 2009-08-20 08:38:01.000000000 +0100
+++ b/sound/soc/s6000/s6105-ipcam.c 2009-08-20 08:45:26.000000000 +0100
@@ -14,6 +14,7 @@
#include <linux/timer.h>
#include <linux/interrupt.h>
#include <linux/platform_device.h>
+#include <linux/i2c.h>
#include <sound/core.h>
#include <sound/pcm.h>
#include <sound/soc.h>
@@ -209,10 +210,19 @@ static struct s6000_snd_platform_data __
static struct platform_device *s6105_snd_device;
+/* temporary i2c device creation until this can be moved into the machine
+ * support file.
+*/
+static struct i2c_board_info i2c_device[] = {
+ { I2C_BOARD_INFO("tlv320aic33", 0x18), }
+};
+
static int __init s6105_init(void)
{
int ret;
+ i2c_register_board_info(0, i2c_device, ARRAY_SIZE(i2c_device));
+
s6105_snd_device = platform_device_alloc("soc-audio", -1);
if (!s6105_snd_device)
return -ENOMEM;
Index: b/sound/soc/davinci/davinci-evm.c
===================================================================
--- a/sound/soc/davinci/davinci-evm.c 2009-08-20 08:38:01.000000000 +0100
+++ b/sound/soc/davinci/davinci-evm.c 2009-08-20 08:45:26.000000000 +0100
@@ -14,6 +14,7 @@
#include <linux/timer.h>
#include <linux/interrupt.h>
#include <linux/platform_device.h>
+#include <linux/i2c.h>
#include <sound/core.h>
#include <sound/pcm.h>
#include <sound/soc.h>
@@ -249,6 +250,13 @@ static struct snd_soc_device da850_evm_s
static struct platform_device *evm_snd_device;
+/* temporary i2c device creation until this can be moved into the machine
+ * support file.
+*/
+static struct i2c_board_info i2c_device[] = {
+ { I2C_BOARD_INFO("tlv320aic33", 0x1b), }
+};
+
static int __init evm_init(void)
{
struct snd_soc_device *evm_snd_dev_data;
@@ -273,6 +281,8 @@ static int __init evm_init(void)
} else
return -EINVAL;
+ i2c_register_board_info(1, i2c_device, ARRAY_SIZE(i2c_device));
+
evm_snd_device = platform_device_alloc("soc-audio", index);
if (!evm_snd_device)
return -ENOMEM;
Index: b/sound/soc/omap/n810.c
===================================================================
--- a/sound/soc/omap/n810.c 2009-08-20 08:38:01.000000000 +0100
+++ b/sound/soc/omap/n810.c 2009-08-20 08:45:26.000000000 +0100
@@ -22,6 +22,7 @@
*/
#include <linux/clk.h>
+#include <linux/i2c.h>
#include <linux/platform_device.h>
#include <sound/core.h>
#include <sound/pcm.h>
@@ -335,6 +336,13 @@ static struct snd_soc_device n810_snd_de
static struct platform_device *n810_snd_device;
+/* temporary i2c device creation until this can be moved into the machine
+ * support file.
+*/
+static struct i2c_board_info i2c_device[] = {
+ { I2C_BOARD_INFO("tlv320aic3x", 0x1b), }
+};
+
static int __init n810_soc_init(void)
{
int err;
@@ -343,6 +351,8 @@ static int __init n810_soc_init(void)
if (!(machine_is_nokia_n810() || machine_is_nokia_n810_wimax()))
return -ENODEV;
+ i2c_register_board_info(1, i2c_device, ARRAY_SIZE(i2c_device));
+
n810_snd_device = platform_device_alloc("soc-audio", -1);
if (!n810_snd_device)
return -ENOMEM;
--
next prev parent reply other threads:[~2009-08-20 21:52 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-20 21:50 [patch 0/4] ASoC S3C24XX/Simtec support Ben Dooks
2009-08-20 21:50 ` [patch 1/4] S3C24XX: Add audio core and tlv320aic23 for Simtec boards Ben Dooks
2009-08-20 21:50 ` [patch 2/4] tlv320aic3x: Change to use device model Ben Dooks
2009-08-21 9:49 ` Mark Brown
2009-08-20 21:50 ` Ben Dooks [this message]
2009-08-20 21:50 ` [patch 4/4] S3C24XX: Support for Simtec Hermes boards Ben Dooks
2009-08-21 9:53 ` [patch 0/4] ASoC S3C24XX/Simtec support Mark Brown
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=20090820215121.950753888@fluff.org \
--to=ben@simtec.co.uk \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@opensource.wolfsonmicro.com \
/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