From: Kukjin Kim <kgene.kim@samsung•com>
To: 'Stephen Rothwell' <sfr@canb•auug.org.au>,
'Mark Brown' <broonie@opensource•wolfsonmicro.com>,
'Liam Girdwood' <lrg@slimlogic•co.uk>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
'Dimitris Papastamos' <dp@opensource•wolfsonmicro.com>
Subject: RE: linux-next: manual merge of the sound-asoc tree with the s5p tree
Date: Mon, 11 Oct 2010 16:33:48 +0900 [thread overview]
Message-ID: <009201cb6916$a9441740$fbcc45c0$%kim@samsung.com> (raw)
In-Reply-To: <20101011133519.cf4fcaa8.sfr@canb.auug.org.au>
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.
next prev parent reply other threads:[~2010-10-11 7:33 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2010-10-11 8:33 ` Stephen Rothwell
2010-10-11 22:26 ` Kukjin Kim
-- strict thread matches above, loose matches on Subject: below --
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
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='009201cb6916$a9441740$fbcc45c0$%kim@samsung.com' \
--to=kgene.kim@samsung$(echo .)com \
--cc=broonie@opensource$(echo .)wolfsonmicro.com \
--cc=dp@opensource$(echo .)wolfsonmicro.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=lrg@slimlogic$(echo .)co.uk \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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