* linux-next: manual merge of the sound-asoc tree with the s5p tree
@ 2010-10-11 2:35 Stephen Rothwell
2010-10-11 7:33 ` Kukjin Kim
0 siblings, 1 reply; 8+ messages in thread
From: Stephen Rothwell @ 2010-10-11 2:35 UTC (permalink / raw)
To: Mark Brown, Liam Girdwood
Cc: linux-next, linux-kernel, Dimitris Papastamos, Kukjin Kim
Hi all,
Today's linux-next merge of the sound-asoc tree got a conflict in
arch/arm/mach-s3c64xx/dev-audio.c between commit
f08269d850e4ee0cd028cf5279cc08259d0469df ("ARM: S3C64XX: Change to using
s3c_gpio_cfgpin_range()") from the s5p tree and commit
e4b6b74ffd32d114227a5dcfe814e2cecd80554b ("ARM: S3C64XX: Fix fallthrough
bug in i2sv3 gpio configuration, improve logging") from the sound-asoc
tree.
Both patches added the needed "break". I fixed it up (see below) and can
carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-s3c64xx/dev-audio.c
index e4bb023,3838335..0000000
--- a/arch/arm/mach-s3c64xx/dev-audio.c
+++ b/arch/arm/mach-s3c64xx/dev-audio.c
@@@ -22,19 -22,31 +22,20 @@@
#include <plat/audio.h>
#include <plat/gpio-cfg.h>
-#include <mach/gpio-bank-c.h>
-#include <mach/gpio-bank-d.h>
-#include <mach/gpio-bank-e.h>
-#include <mach/gpio-bank-h.h>
-
static int s3c64xx_i2sv3_cfg_gpio(struct platform_device *pdev)
{
+ unsigned int base;
+
switch (pdev->id) {
case 0:
- s3c_gpio_cfgpin(S3C64XX_GPD(0), S3C64XX_GPD0_I2S0_CLK);
- s3c_gpio_cfgpin(S3C64XX_GPD(1), S3C64XX_GPD1_I2S0_CDCLK);
- s3c_gpio_cfgpin(S3C64XX_GPD(2), S3C64XX_GPD2_I2S0_LRCLK);
- s3c_gpio_cfgpin(S3C64XX_GPD(3), S3C64XX_GPD3_I2S0_DI);
- s3c_gpio_cfgpin(S3C64XX_GPD(4), S3C64XX_GPD4_I2S0_D0);
+ base = S3C64XX_GPD(0);
break;
case 1:
- s3c_gpio_cfgpin(S3C64XX_GPE(0), S3C64XX_GPE0_I2S1_CLK);
- s3c_gpio_cfgpin(S3C64XX_GPE(1), S3C64XX_GPE1_I2S1_CDCLK);
- s3c_gpio_cfgpin(S3C64XX_GPE(2), S3C64XX_GPE2_I2S1_LRCLK);
- s3c_gpio_cfgpin(S3C64XX_GPE(3), S3C64XX_GPE3_I2S1_DI);
- s3c_gpio_cfgpin(S3C64XX_GPE(4), S3C64XX_GPE4_I2S1_D0);
+ base = S3C64XX_GPE(0);
break;
default:
- printk(KERN_DEBUG "Invalid I2S Controller number!");
+ printk(KERN_DEBUG "Invalid I2S Controller number: %d\n",
+ pdev->id);
return -EINVAL;
}
@@@ -157,17 -170,24 +158,18 @@@ EXPORT_SYMBOL(s3c64xx_device_iisv4)
static int s3c64xx_pcm_cfg_gpio(struct platform_device *pdev)
{
+ unsigned int base;
+
switch (pdev->id) {
case 0:
- s3c_gpio_cfgpin(S3C64XX_GPD(0), S3C64XX_GPD0_PCM0_SCLK);
- s3c_gpio_cfgpin(S3C64XX_GPD(1), S3C64XX_GPD1_PCM0_EXTCLK);
- s3c_gpio_cfgpin(S3C64XX_GPD(2), S3C64XX_GPD2_PCM0_FSYNC);
- s3c_gpio_cfgpin(S3C64XX_GPD(3), S3C64XX_GPD3_PCM0_SIN);
- s3c_gpio_cfgpin(S3C64XX_GPD(4), S3C64XX_GPD4_PCM0_SOUT);
+ base = S3C64XX_GPD(0);
break;
case 1:
- s3c_gpio_cfgpin(S3C64XX_GPE(0), S3C64XX_GPE0_PCM1_SCLK);
- s3c_gpio_cfgpin(S3C64XX_GPE(1), S3C64XX_GPE1_PCM1_EXTCLK);
- s3c_gpio_cfgpin(S3C64XX_GPE(2), S3C64XX_GPE2_PCM1_FSYNC);
- s3c_gpio_cfgpin(S3C64XX_GPE(3), S3C64XX_GPE3_PCM1_SIN);
- s3c_gpio_cfgpin(S3C64XX_GPE(4), S3C64XX_GPE4_PCM1_SOUT);
+ base = S3C64XX_GPE(0);
break;
default:
- printk(KERN_DEBUG "Invalid PCM Controller number!");
+ printk(KERN_DEBUG "Invalid PCM Controller number: %d\n",
+ pdev->id);
return -EINVAL;
}
^ permalink raw reply [flat|nested] 8+ messages in thread
* RE: linux-next: manual merge of the sound-asoc tree with the s5p tree
2010-10-11 2:35 linux-next: manual merge of the sound-asoc tree with the s5p tree Stephen Rothwell
@ 2010-10-11 7:33 ` Kukjin Kim
2010-10-11 8:33 ` Stephen Rothwell
0 siblings, 1 reply; 8+ messages in thread
From: Kukjin Kim @ 2010-10-11 7:33 UTC (permalink / raw)
To: 'Stephen Rothwell', 'Mark Brown',
'Liam Girdwood'
Cc: linux-next, linux-kernel, 'Dimitris Papastamos'
Stephen Rothwell wrote:
>
> Hi all,
>
Hi...
Thank you for your information :-)
> Today's linux-next merge of the sound-asoc tree got a conflict in
> arch/arm/mach-s3c64xx/dev-audio.c between commit
> f08269d850e4ee0cd028cf5279cc08259d0469df ("ARM: S3C64XX: Change to using
> s3c_gpio_cfgpin_range()") from the s5p tree and commit
> e4b6b74ffd32d114227a5dcfe814e2cecd80554b ("ARM: S3C64XX: Fix fallthrough
> bug in i2sv3 gpio configuration, improve logging") from the sound-asoc
> tree.
>
Hmm...how can/should I handle for it?
> Both patches added the needed "break". I fixed it up (see below) and can
> carry the fix as necessary.
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc arch/arm/mach-s3c64xx/dev-audio.c
> index e4bb023,3838335..0000000
> --- a/arch/arm/mach-s3c64xx/dev-audio.c
> +++ b/arch/arm/mach-s3c64xx/dev-audio.c
> @@@ -22,19 -22,31 +22,20 @@@
> #include <plat/audio.h>
> #include <plat/gpio-cfg.h>
>
> -#include <mach/gpio-bank-c.h>
> -#include <mach/gpio-bank-d.h>
> -#include <mach/gpio-bank-e.h>
> -#include <mach/gpio-bank-h.h>
> -
> static int s3c64xx_i2sv3_cfg_gpio(struct platform_device *pdev)
> {
> + unsigned int base;
> +
> switch (pdev->id) {
> case 0:
> - s3c_gpio_cfgpin(S3C64XX_GPD(0),
> S3C64XX_GPD0_I2S0_CLK);
> - s3c_gpio_cfgpin(S3C64XX_GPD(1),
> S3C64XX_GPD1_I2S0_CDCLK);
> - s3c_gpio_cfgpin(S3C64XX_GPD(2),
> S3C64XX_GPD2_I2S0_LRCLK);
> - s3c_gpio_cfgpin(S3C64XX_GPD(3), S3C64XX_GPD3_I2S0_DI);
> - s3c_gpio_cfgpin(S3C64XX_GPD(4), S3C64XX_GPD4_I2S0_D0);
> + base = S3C64XX_GPD(0);
> break;
> case 1:
> - s3c_gpio_cfgpin(S3C64XX_GPE(0), S3C64XX_GPE0_I2S1_CLK);
> - s3c_gpio_cfgpin(S3C64XX_GPE(1),
> S3C64XX_GPE1_I2S1_CDCLK);
> - s3c_gpio_cfgpin(S3C64XX_GPE(2),
> S3C64XX_GPE2_I2S1_LRCLK);
> - s3c_gpio_cfgpin(S3C64XX_GPE(3), S3C64XX_GPE3_I2S1_DI);
> - s3c_gpio_cfgpin(S3C64XX_GPE(4), S3C64XX_GPE4_I2S1_D0);
> + base = S3C64XX_GPE(0);
> break;
> default:
> - printk(KERN_DEBUG "Invalid I2S Controller number!");
> + printk(KERN_DEBUG "Invalid I2S Controller number: %d\n",
> + pdev->id);
> return -EINVAL;
> }
>
> @@@ -157,17 -170,24 +158,18 @@@ EXPORT_SYMBOL(s3c64xx_device_iisv4)
>
> static int s3c64xx_pcm_cfg_gpio(struct platform_device *pdev)
> {
> + unsigned int base;
> +
> switch (pdev->id) {
> case 0:
> - s3c_gpio_cfgpin(S3C64XX_GPD(0),
> S3C64XX_GPD0_PCM0_SCLK);
> - s3c_gpio_cfgpin(S3C64XX_GPD(1),
> S3C64XX_GPD1_PCM0_EXTCLK);
> - s3c_gpio_cfgpin(S3C64XX_GPD(2),
> S3C64XX_GPD2_PCM0_FSYNC);
> - s3c_gpio_cfgpin(S3C64XX_GPD(3),
> S3C64XX_GPD3_PCM0_SIN);
> - s3c_gpio_cfgpin(S3C64XX_GPD(4),
> S3C64XX_GPD4_PCM0_SOUT);
> + base = S3C64XX_GPD(0);
> break;
> case 1:
> - s3c_gpio_cfgpin(S3C64XX_GPE(0),
> S3C64XX_GPE0_PCM1_SCLK);
> - s3c_gpio_cfgpin(S3C64XX_GPE(1),
> S3C64XX_GPE1_PCM1_EXTCLK);
> - s3c_gpio_cfgpin(S3C64XX_GPE(2),
> S3C64XX_GPE2_PCM1_FSYNC);
> - s3c_gpio_cfgpin(S3C64XX_GPE(3),
> S3C64XX_GPE3_PCM1_SIN);
> - s3c_gpio_cfgpin(S3C64XX_GPE(4),
> S3C64XX_GPE4_PCM1_SOUT);
> + base = S3C64XX_GPE(0);
> break;
> default:
> - printk(KERN_DEBUG "Invalid PCM Controller number!");
> + printk(KERN_DEBUG "Invalid PCM Controller number: %d\n",
> + pdev->id);
> return -EINVAL;
> }
>
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: linux-next: manual merge of the sound-asoc tree with the s5p tree
2010-10-11 7:33 ` Kukjin Kim
@ 2010-10-11 8:33 ` Stephen Rothwell
2010-10-11 22:26 ` Kukjin Kim
0 siblings, 1 reply; 8+ messages in thread
From: Stephen Rothwell @ 2010-10-11 8:33 UTC (permalink / raw)
To: Kukjin Kim
Cc: 'Mark Brown', 'Liam Girdwood',
linux-next, linux-kernel, 'Dimitris Papastamos'
[-- Attachment #1: Type: text/plain, Size: 761 bytes --]
Hi Kgene,
On Mon, 11 Oct 2010 16:33:48 +0900 Kukjin Kim <kgene.kim@samsung.com> wrote:
>
> > Today's linux-next merge of the sound-asoc tree got a conflict in
> > arch/arm/mach-s3c64xx/dev-audio.c between commit
> > f08269d850e4ee0cd028cf5279cc08259d0469df ("ARM: S3C64XX: Change to using
> > s3c_gpio_cfgpin_range()") from the s5p tree and commit
> > e4b6b74ffd32d114227a5dcfe814e2cecd80554b ("ARM: S3C64XX: Fix fallthrough
> > bug in i2sv3 gpio configuration, improve logging") from the sound-asoc
> > tree.
> >
> Hmm...how can/should I handle for it?
Don't worry about it. It is trivial and both I and Linus can take care
of it.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* RE: linux-next: manual merge of the sound-asoc tree with the s5p tree
2010-10-11 8:33 ` Stephen Rothwell
@ 2010-10-11 22:26 ` Kukjin Kim
0 siblings, 0 replies; 8+ messages in thread
From: Kukjin Kim @ 2010-10-11 22:26 UTC (permalink / raw)
To: 'Stephen Rothwell'
Cc: 'Mark Brown', 'Liam Girdwood',
linux-next, linux-kernel, 'Dimitris Papastamos'
Stephen Rothwell wrote:
>
> Hi Kgene,
>
> On Mon, 11 Oct 2010 16:33:48 +0900 Kukjin Kim <kgene.kim@samsung.com>
> wrote:
> >
> > > Today's linux-next merge of the sound-asoc tree got a conflict in
> > > arch/arm/mach-s3c64xx/dev-audio.c between commit
> > > f08269d850e4ee0cd028cf5279cc08259d0469df ("ARM: S3C64XX: Change to
> using
> > > s3c_gpio_cfgpin_range()") from the s5p tree and commit
> > > e4b6b74ffd32d114227a5dcfe814e2cecd80554b ("ARM: S3C64XX: Fix
> fallthrough
> > > bug in i2sv3 gpio configuration, improve logging") from the sound-asoc
> > > tree.
> > >
> > Hmm...how can/should I handle for it?
>
> Don't worry about it. It is trivial and both I and Linus can take care
> of it.
>
Hi Stephen :-)
Thank you so much.
Have a nice day ;-)
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: linux-next: manual merge of the sound-asoc tree with the s5p tree
2011-12-05 2:01 Stephen Rothwell
@ 2011-12-05 10:28 ` Mark Brown
0 siblings, 0 replies; 8+ messages in thread
From: Mark Brown @ 2011-12-05 10:28 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Liam Girdwood, linux-next, linux-kernel, Kukjin Kim
On Mon, Dec 05, 2011 at 01:01:02PM +1100, Stephen Rothwell wrote:
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Thanks!
^ permalink raw reply [flat|nested] 8+ messages in thread
* linux-next: manual merge of the sound-asoc tree with the s5p tree
@ 2011-12-05 2:01 Stephen Rothwell
2011-12-05 10:28 ` Mark Brown
0 siblings, 1 reply; 8+ messages in thread
From: Stephen Rothwell @ 2011-12-05 2:01 UTC (permalink / raw)
To: Mark Brown, Liam Girdwood; +Cc: linux-next, linux-kernel, Kukjin Kim
[-- Attachment #1: Type: text/plain, Size: 935 bytes --]
Hi all,
Today's linux-next merge of the sound-asoc tree got a conflict in
arch/arm/mach-s3c64xx/mach-crag6410.c between commit c5c32c965dad ("ARM:
S3C64XX: Hook up Littlemill audio card on Cragganmore") from the s5p tree
and commit 6414261f0a2a ("ASoC: Rename Speyside WM8962 to Tobermory")
from the sound-asoc tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-s3c64xx/mach-crag6410.c
index 6ff76c0,55c0e75..0000000
--- a/arch/arm/mach-s3c64xx/mach-crag6410.c
+++ b/arch/arm/mach-s3c64xx/mach-crag6410.c
@@@ -346,8 -338,7 +346,8 @@@ static struct platform_device *crag6410
&crag6410_lcd_powerdev,
&crag6410_backlight_device,
&speyside_device,
- &speyside_wm8962_device,
+ &tobermory_device,
+ &littlemill_device,
&lowland_device,
&wallvdd_device,
};
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* RE: linux-next: manual merge of the sound-asoc tree with the s5p tree
2010-12-31 0:56 Stephen Rothwell
@ 2010-12-31 1:59 ` Kukjin Kim
0 siblings, 0 replies; 8+ messages in thread
From: Kukjin Kim @ 2010-12-31 1:59 UTC (permalink / raw)
To: 'Stephen Rothwell', 'Mark Brown',
'Liam Girdwood'
Cc: linux-next, linux-kernel, 'Jassi Brar'
Stephen Rothwell wrote:
>
> Hi all,
>
Hi :-)
> Today's linux-next merge of the sound-asoc tree got a conflict in
> arch/arm/plat-samsung/include/plat/devs.h between commit
> 1b6e8eda6f0e7cd4f28e522a5e77e76f6985af9d ("Merge branch 'next-s5pv310'
> into for-next") from the s5p tree and commit
> 83e37b8e400ca51cc97946815b3055daacd92fa8 ("ARM: Samsung: Define common
> audio-dma device") from the sound-asoc tree.
>
Oops, sorry for bothering again :-(
I will re-merge it in my for-next for avoiding conflict.
> I fixed it up (see below) and can carry the fix as necessary.
Thanks for your information and Happy New year!
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
^ permalink raw reply [flat|nested] 8+ messages in thread
* linux-next: manual merge of the sound-asoc tree with the s5p tree
@ 2010-12-31 0:56 Stephen Rothwell
2010-12-31 1:59 ` Kukjin Kim
0 siblings, 1 reply; 8+ messages in thread
From: Stephen Rothwell @ 2010-12-31 0:56 UTC (permalink / raw)
To: Mark Brown, Liam Girdwood
Cc: linux-next, linux-kernel, Jassi Brar, Kukjin Kim
Hi all,
Today's linux-next merge of the sound-asoc tree got a conflict in
arch/arm/plat-samsung/include/plat/devs.h between commit
1b6e8eda6f0e7cd4f28e522a5e77e76f6985af9d ("Merge branch 'next-s5pv310'
into for-next") from the s5p tree and commit
83e37b8e400ca51cc97946815b3055daacd92fa8 ("ARM: Samsung: Define common
audio-dma device") from the sound-asoc tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/plat-samsung/include/plat/devs.h
index 7aba430,e9e3b6e..0000000
--- a/arch/arm/plat-samsung/include/plat/devs.h
+++ b/arch/arm/plat-samsung/include/plat/devs.h
@@@ -49,59 -53,44 +49,58 @@@ extern struct platform_device s3c_devic
extern struct platform_device s3c_device_i2c5;
extern struct platform_device s3c_device_i2c6;
extern struct platform_device s3c_device_i2c7;
+extern struct platform_device s3c_device_iis;
+extern struct platform_device s3c_device_lcd;
+extern struct platform_device s3c_device_nand;
+extern struct platform_device s3c_device_ohci;
+extern struct platform_device s3c_device_onenand;
- extern struct platform_device s3c_device_pcm;
extern struct platform_device s3c_device_rtc;
-extern struct platform_device s3c_device_adc;
extern struct platform_device s3c_device_sdi;
-extern struct platform_device s3c_device_iis;
-extern struct platform_device s3c_device_hwmon;
-extern struct platform_device s3c_device_hsmmc0;
-extern struct platform_device s3c_device_hsmmc1;
-extern struct platform_device s3c_device_hsmmc2;
-extern struct platform_device s3c_device_hsmmc3;
-extern struct platform_device s3c_device_cfcon;
-
extern struct platform_device s3c_device_spi0;
extern struct platform_device s3c_device_spi1;
+extern struct platform_device s3c_device_ts;
+extern struct platform_device s3c_device_timer[];
+extern struct platform_device s3c_device_usbgadget;
+extern struct platform_device s3c_device_usb_hsotg;
+extern struct platform_device s3c_device_wdt;
-extern struct platform_device s5pc100_device_spi0;
-extern struct platform_device s5pc100_device_spi1;
-extern struct platform_device s5pc100_device_spi2;
-extern struct platform_device s5pv210_device_spi0;
-extern struct platform_device s5pv210_device_spi1;
+extern struct platform_device s5p_device_fimc0;
+extern struct platform_device s5p_device_fimc1;
+extern struct platform_device s5p_device_fimc2;
+extern struct platform_device s5p_device_mipi_csis0;
+extern struct platform_device s5p_device_mipi_csis1;
+extern struct platform_device s5p_device_onenand;
+
+extern struct platform_device s5p6440_device_iis;
+extern struct platform_device s5p6440_device_pcm;
extern struct platform_device s5p6440_device_spi0;
extern struct platform_device s5p6440_device_spi1;
-extern struct platform_device s5p6450_device_spi0;
-extern struct platform_device s5p6450_device_spi1;
-extern struct platform_device s3c_device_hwmon;
+extern struct platform_device s5p6442_device_iis0;
+extern struct platform_device s5p6442_device_iis1;
+extern struct platform_device s5p6442_device_pcm0;
+extern struct platform_device s5p6442_device_pcm1;
+extern struct platform_device s5p6442_device_spi;
-extern struct platform_device s3c_device_nand;
-extern struct platform_device s3c_device_onenand;
-extern struct platform_device s3c64xx_device_onenand1;
-extern struct platform_device s5p_device_onenand;
+extern struct platform_device s5p6450_device_iis0;
+extern struct platform_device s5p6450_device_iis1;
+extern struct platform_device s5p6450_device_iis2;
+extern struct platform_device s5p6450_device_pcm0;
+extern struct platform_device s5p6450_device_spi0;
+extern struct platform_device s5p6450_device_spi1;
-extern struct platform_device s3c_device_usbgadget;
-extern struct platform_device s3c_device_usb_hsotg;
+extern struct platform_device s5pc100_device_ac97;
+extern struct platform_device s5pc100_device_iis0;
+extern struct platform_device s5pc100_device_iis1;
+extern struct platform_device s5pc100_device_iis2;
+extern struct platform_device s5pc100_device_pcm0;
+extern struct platform_device s5pc100_device_pcm1;
+extern struct platform_device s5pc100_device_spdif;
+extern struct platform_device s5pc100_device_spi0;
+extern struct platform_device s5pc100_device_spi1;
+extern struct platform_device s5pc100_device_spi2;
extern struct platform_device s5pv210_device_ac97;
-extern struct platform_device s5pv210_device_pcm0;
-extern struct platform_device s5pv210_device_pcm1;
-extern struct platform_device s5pv210_device_pcm2;
extern struct platform_device s5pv210_device_iis0;
extern struct platform_device s5pv210_device_iis1;
extern struct platform_device s5pv210_device_iis2;
@@@ -116,13 -100,36 +115,14 @@@ extern struct platform_device s5pv310_d
extern struct platform_device s5pv310_device_i2s0;
extern struct platform_device s5pv310_device_i2s1;
extern struct platform_device s5pv310_device_i2s2;
+extern struct platform_device s5pv310_device_pcm0;
+extern struct platform_device s5pv310_device_pcm1;
+extern struct platform_device s5pv310_device_pcm2;
+extern struct platform_device s5pv310_device_pd[];
extern struct platform_device s5pv310_device_spdif;
-extern struct platform_device s5p6442_device_pcm0;
-extern struct platform_device s5p6442_device_pcm1;
-extern struct platform_device s5p6442_device_iis0;
-extern struct platform_device s5p6442_device_iis1;
-extern struct platform_device s5p6442_device_spi;
-
-extern struct platform_device s5p6440_device_pcm;
-extern struct platform_device s5p6440_device_iis;
-
-extern struct platform_device s5p6450_device_iis0;
-extern struct platform_device s5p6450_device_pcm0;
-
-extern struct platform_device s5pc100_device_ac97;
-extern struct platform_device s5pc100_device_pcm0;
-extern struct platform_device s5pc100_device_pcm1;
-extern struct platform_device s5pc100_device_iis0;
-extern struct platform_device s5pc100_device_iis1;
-extern struct platform_device s5pc100_device_iis2;
-extern struct platform_device s5pc100_device_spdif;
-
extern struct platform_device samsung_device_keypad;
-
-extern struct platform_device s5p_device_fimc0;
-extern struct platform_device s5p_device_fimc1;
-extern struct platform_device s5p_device_fimc2;
++extern struct platform_device samsung_asoc_dma;
/* s3c2440 specific devices */
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2011-12-05 10:28 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-10-11 2:35 linux-next: manual merge of the sound-asoc tree with the s5p tree Stephen Rothwell
2010-10-11 7:33 ` Kukjin Kim
2010-10-11 8:33 ` Stephen Rothwell
2010-10-11 22:26 ` Kukjin Kim
2010-12-31 0:56 Stephen Rothwell
2010-12-31 1:59 ` Kukjin Kim
2011-12-05 2:01 Stephen Rothwell
2011-12-05 10:28 ` Mark Brown
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).