* Register WM8750 @ 2010-05-28 2:42 Marek Vasut 2010-05-28 2:42 ` [PATCH 1/2] pxa/spitz: Correctly register WM8750 Marek Vasut 2010-05-28 2:43 ` [PATCH 2/2] pxa/z2: Register WM8750 Marek Vasut 0 siblings, 2 replies; 4+ messages in thread From: Marek Vasut @ 2010-05-28 2:42 UTC (permalink / raw) To: linux-arm-kernel Properly register WM8750 codec on affected machines now that the WM8750 codec was converted to new API. This is not even compile-tested, but should work, please test. Cheers! ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/2] pxa/spitz: Correctly register WM8750 2010-05-28 2:42 Register WM8750 Marek Vasut @ 2010-05-28 2:42 ` Marek Vasut 2010-05-31 4:24 ` Eric Miao 2010-05-28 2:43 ` [PATCH 2/2] pxa/z2: Register WM8750 Marek Vasut 1 sibling, 1 reply; 4+ messages in thread From: Marek Vasut @ 2010-05-28 2:42 UTC (permalink / raw) To: linux-arm-kernel This patch registers the WM8750 codec on a proper place on the SPITZ machine after the WM8750 driver was converted to new API. Signed-off-by: Marek Vasut <marek.vasut@gmail.com> --- arch/arm/mach-pxa/spitz.c | 3 +++ sound/soc/pxa/spitz.c | 36 ------------------------------------ 2 files changed, 3 insertions(+), 36 deletions(-) diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c index 4d2413e..c1048a3 100644 --- a/arch/arm/mach-pxa/spitz.c +++ b/arch/arm/mach-pxa/spitz.c @@ -818,6 +818,9 @@ static struct i2c_board_info akita_i2c_board_info[] = { .type = "max7310", .addr = 0x18, .platform_data = &akita_ioexp, + }, { + .type = "wm8750", + .addr = 0x1b, }, }; diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c index 1941a35..d256f5f 100644 --- a/sound/soc/pxa/spitz.c +++ b/sound/soc/pxa/spitz.c @@ -328,38 +328,6 @@ static struct snd_soc_device spitz_snd_devdata = { .codec_dev = &soc_codec_dev_wm8750, }; -/* - * FIXME: This is a temporary bodge to avoid cross-tree merge issues. - * New drivers should register the wm8750 I2C device in the machine - * setup code (under arch/arm for ARM systems). - */ -static int wm8750_i2c_register(void) -{ - struct i2c_board_info info; - struct i2c_adapter *adapter; - struct i2c_client *client; - - memset(&info, 0, sizeof(struct i2c_board_info)); - info.addr = 0x1b; - strlcpy(info.type, "wm8750", I2C_NAME_SIZE); - - adapter = i2c_get_adapter(0); - if (!adapter) { - printk(KERN_ERR "can't get i2c adapter 0\n"); - return -ENODEV; - } - - client = i2c_new_device(adapter, &info); - i2c_put_adapter(adapter); - if (!client) { - printk(KERN_ERR "can't add i2c device at 0x%x\n", - (unsigned int)info.addr); - return -ENODEV; - } - - return 0; -} - static struct platform_device *spitz_snd_device; static int __init spitz_init(void) @@ -369,10 +337,6 @@ static int __init spitz_init(void) if (!(machine_is_spitz() || machine_is_borzoi() || machine_is_akita())) return -ENODEV; - ret = wm8750_i2c_setup(); - if (ret != 0) - return ret; - spitz_snd_device = platform_device_alloc("soc-audio", -1); if (!spitz_snd_device) return -ENOMEM; -- 1.7.0 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 1/2] pxa/spitz: Correctly register WM8750 2010-05-28 2:42 ` [PATCH 1/2] pxa/spitz: Correctly register WM8750 Marek Vasut @ 2010-05-31 4:24 ` Eric Miao 0 siblings, 0 replies; 4+ messages in thread From: Eric Miao @ 2010-05-31 4:24 UTC (permalink / raw) To: linux-arm-kernel On Fri, May 28, 2010 at 10:42 AM, Marek Vasut <marek.vasut@gmail.com> wrote: > This patch registers the WM8750 codec on a proper place on the SPITZ machine > after the WM8750 driver was converted to new API. > > Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Applied to 'fix'. > --- > ?arch/arm/mach-pxa/spitz.c | ? ?3 +++ > ?sound/soc/pxa/spitz.c ? ? | ? 36 ------------------------------------ > ?2 files changed, 3 insertions(+), 36 deletions(-) > > diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c > index 4d2413e..c1048a3 100644 > --- a/arch/arm/mach-pxa/spitz.c > +++ b/arch/arm/mach-pxa/spitz.c > @@ -818,6 +818,9 @@ static struct i2c_board_info akita_i2c_board_info[] = { > ? ? ? ? ? ? ? ?.type ? ? ? ? ? = "max7310", > ? ? ? ? ? ? ? ?.addr ? ? ? ? ? = 0x18, > ? ? ? ? ? ? ? ?.platform_data ?= &akita_ioexp, > + ? ? ? }, { > + ? ? ? ? ? ? ? .type ? ? ? ? ? = "wm8750", > + ? ? ? ? ? ? ? .addr ? ? ? ? ? = 0x1b, > ? ? ? ?}, > ?}; > > diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c > index 1941a35..d256f5f 100644 > --- a/sound/soc/pxa/spitz.c > +++ b/sound/soc/pxa/spitz.c > @@ -328,38 +328,6 @@ static struct snd_soc_device spitz_snd_devdata = { > ? ? ? ?.codec_dev = &soc_codec_dev_wm8750, > ?}; > > -/* > - * FIXME: This is a temporary bodge to avoid cross-tree merge issues. > - * New drivers should register the wm8750 I2C device in the machine > - * setup code (under arch/arm for ARM systems). > - */ > -static int wm8750_i2c_register(void) > -{ > - ? ? ? struct i2c_board_info info; > - ? ? ? struct i2c_adapter *adapter; > - ? ? ? struct i2c_client *client; > - > - ? ? ? memset(&info, 0, sizeof(struct i2c_board_info)); > - ? ? ? info.addr = 0x1b; > - ? ? ? strlcpy(info.type, "wm8750", I2C_NAME_SIZE); > - > - ? ? ? adapter = i2c_get_adapter(0); > - ? ? ? if (!adapter) { > - ? ? ? ? ? ? ? printk(KERN_ERR "can't get i2c adapter 0\n"); > - ? ? ? ? ? ? ? return -ENODEV; > - ? ? ? } > - > - ? ? ? client = i2c_new_device(adapter, &info); > - ? ? ? i2c_put_adapter(adapter); > - ? ? ? if (!client) { > - ? ? ? ? ? ? ? printk(KERN_ERR "can't add i2c device at 0x%x\n", > - ? ? ? ? ? ? ? (unsigned int)info.addr); > - ? ? ? ? ? ? ? return -ENODEV; > - ? ? ? } > - > - ? ? ? return 0; > -} > - > ?static struct platform_device *spitz_snd_device; > > ?static int __init spitz_init(void) > @@ -369,10 +337,6 @@ static int __init spitz_init(void) > ? ? ? ?if (!(machine_is_spitz() || machine_is_borzoi() || machine_is_akita())) > ? ? ? ? ? ? ? ?return -ENODEV; > > - ? ? ? ret = wm8750_i2c_setup(); > - ? ? ? if (ret != 0) > - ? ? ? ? ? ? ? return ret; > - > ? ? ? ?spitz_snd_device = platform_device_alloc("soc-audio", -1); > ? ? ? ?if (!spitz_snd_device) > ? ? ? ? ? ? ? ?return -ENOMEM; > -- > 1.7.0 > > ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 2/2] pxa/z2: Register WM8750 2010-05-28 2:42 Register WM8750 Marek Vasut 2010-05-28 2:42 ` [PATCH 1/2] pxa/spitz: Correctly register WM8750 Marek Vasut @ 2010-05-28 2:43 ` Marek Vasut 1 sibling, 0 replies; 4+ messages in thread From: Marek Vasut @ 2010-05-28 2:43 UTC (permalink / raw) To: linux-arm-kernel This patch registers the WM8750 codec on a proper place on the ZipitZ2 machine after the WM8750 driver was converted to new API. Signed-off-by: Marek Vasut <marek.vasut@gmail.com> --- arch/arm/mach-pxa/z2.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-pxa/z2.c b/arch/arm/mach-pxa/z2.c index 194865e..3976d24 100644 --- a/arch/arm/mach-pxa/z2.c +++ b/arch/arm/mach-pxa/z2.c @@ -479,7 +479,10 @@ static struct i2c_board_info __initdata z2_i2c_board_info[] = { { I2C_BOARD_INFO("aer915", 0x55), .platform_data = &batt_chip_info, - } + }, { + I2C_BOARD_INFO("wm8750", 0x1a), + }, + }; static void __init z2_i2c_init(void) -- 1.7.0 ^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-05-31 4:24 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2010-05-28 2:42 Register WM8750 Marek Vasut 2010-05-28 2:42 ` [PATCH 1/2] pxa/spitz: Correctly register WM8750 Marek Vasut 2010-05-31 4:24 ` Eric Miao 2010-05-28 2:43 ` [PATCH 2/2] pxa/z2: Register WM8750 Marek Vasut
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).