diff for duplicates of <20100528063546.GV4720@trinity.fluff.org> diff --git a/a/1.txt b/N1/1.txt index 1e0c8cc..dac12ce 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -12,9 +12,9 @@ I'm not sure if that's really so much of a problem. > > > > Signed-off-by: Ben Dooks <ben-linux@fluff.org> > > --- -> > arch/arm/mach-s5p6442/dev-audio.c | 30 ++++++++++-------------------- -> > arch/arm/mach-s5p6442/dev-spi.c | 4 +--- -> > 2 files changed, 11 insertions(+), 23 deletions(-) +> > ?arch/arm/mach-s5p6442/dev-audio.c | ? 30 ++++++++++-------------------- +> > ?arch/arm/mach-s5p6442/dev-spi.c ? | ? ?4 +--- +> > ?2 files changed, 11 insertions(+), 23 deletions(-) > > > > diff --git a/arch/arm/mach-s5p6442/dev-audio.c b/arch/arm/mach-s5p6442/dev-audio.c > > index cb801e1..0e57caf 100644 @@ -22,85 +22,85 @@ I'm not sure if that's really so much of a problem. > > +++ b/arch/arm/mach-s5p6442/dev-audio.c > > @@ -21,22 +21,16 @@ > > -> > static int s5p6442_cfg_i2s(struct platform_device *pdev) -> > { -> > + unsigned int base; +> > ?static int s5p6442_cfg_i2s(struct platform_device *pdev) +> > ?{ +> > + ? ? ? unsigned int base; > > + -> > /* configure GPIO for i2s port */ -> > switch (pdev->id) { -> > case 1: -> > - s3c_gpio_cfgpin(S5P6442_GPC1(0), S3C_GPIO_SFN(2)); -> > - s3c_gpio_cfgpin(S5P6442_GPC1(1), S3C_GPIO_SFN(2)); -> > - s3c_gpio_cfgpin(S5P6442_GPC1(2), S3C_GPIO_SFN(2)); -> > - s3c_gpio_cfgpin(S5P6442_GPC1(3), S3C_GPIO_SFN(2)); -> > - s3c_gpio_cfgpin(S5P6442_GPC1(4), S3C_GPIO_SFN(2)); -> > + base = S5P6442_GPC1(0); -> > break; +> > ? ? ? ?/* configure GPIO for i2s port */ +> > ? ? ? ?switch (pdev->id) { +> > ? ? ? ?case 1: +> > - ? ? ? ? ? ? ? s3c_gpio_cfgpin(S5P6442_GPC1(0), S3C_GPIO_SFN(2)); +> > - ? ? ? ? ? ? ? s3c_gpio_cfgpin(S5P6442_GPC1(1), S3C_GPIO_SFN(2)); +> > - ? ? ? ? ? ? ? s3c_gpio_cfgpin(S5P6442_GPC1(2), S3C_GPIO_SFN(2)); +> > - ? ? ? ? ? ? ? s3c_gpio_cfgpin(S5P6442_GPC1(3), S3C_GPIO_SFN(2)); +> > - ? ? ? ? ? ? ? s3c_gpio_cfgpin(S5P6442_GPC1(4), S3C_GPIO_SFN(2)); +> > + ? ? ? ? ? ? ? base = S5P6442_GPC1(0); +> > ? ? ? ? ? ? ? ?break; > > -> > case -1: -> > - s3c_gpio_cfgpin(S5P6442_GPC0(0), S3C_GPIO_SFN(2)); -> > - s3c_gpio_cfgpin(S5P6442_GPC0(1), S3C_GPIO_SFN(2)); -> > - s3c_gpio_cfgpin(S5P6442_GPC0(2), S3C_GPIO_SFN(2)); -> > - s3c_gpio_cfgpin(S5P6442_GPC0(3), S3C_GPIO_SFN(2)); -> > - s3c_gpio_cfgpin(S5P6442_GPC0(4), S3C_GPIO_SFN(2)); -> > + base = S5P6442_GPC0(0); -> > break; +> > ? ? ? ?case -1: +> > - ? ? ? ? ? ? ? s3c_gpio_cfgpin(S5P6442_GPC0(0), S3C_GPIO_SFN(2)); +> > - ? ? ? ? ? ? ? s3c_gpio_cfgpin(S5P6442_GPC0(1), S3C_GPIO_SFN(2)); +> > - ? ? ? ? ? ? ? s3c_gpio_cfgpin(S5P6442_GPC0(2), S3C_GPIO_SFN(2)); +> > - ? ? ? ? ? ? ? s3c_gpio_cfgpin(S5P6442_GPC0(3), S3C_GPIO_SFN(2)); +> > - ? ? ? ? ? ? ? s3c_gpio_cfgpin(S5P6442_GPC0(4), S3C_GPIO_SFN(2)); +> > + ? ? ? ? ? ? ? base = S5P6442_GPC0(0); +> > ? ? ? ? ? ? ? ?break; > > -> > default: +> > ? ? ? ?default: > > @@ -44,6 +38,7 @@ static int s5p6442_cfg_i2s(struct platform_device *pdev) -> > return -EINVAL; -> > } +> > ? ? ? ? ? ? ? ?return -EINVAL; +> > ? ? ? ?} > > -> > + s3c_gpio_cfgpin_range(base, 5, S3C_GPIO_SFN(2)); -> > return 0; -> > } +> > + ? ? ? s3c_gpio_cfgpin_range(base, 5, S3C_GPIO_SFN(2)); +> > ? ? ? ?return 0; +> > ?} > > > > @@ -111,21 +106,15 @@ struct platform_device s5p6442_device_iis1 = { > > -> > static int s5p6442_pcm_cfg_gpio(struct platform_device *pdev) -> > { -> > + unsigned int base; +> > ?static int s5p6442_pcm_cfg_gpio(struct platform_device *pdev) +> > ?{ +> > + ? ? ? unsigned int base; > > + -> > switch (pdev->id) { -> > case 0: -> > - s3c_gpio_cfgpin(S5P6442_GPC0(0), S3C_GPIO_SFN(3)); -> > - s3c_gpio_cfgpin(S5P6442_GPC0(1), S3C_GPIO_SFN(3)); -> > - s3c_gpio_cfgpin(S5P6442_GPC0(2), S3C_GPIO_SFN(3)); -> > - s3c_gpio_cfgpin(S5P6442_GPC0(3), S3C_GPIO_SFN(3)); -> > - s3c_gpio_cfgpin(S5P6442_GPC0(4), S3C_GPIO_SFN(3)); -> > + base = S5P6442_GPC0(0); -> > break; +> > ? ? ? ?switch (pdev->id) { +> > ? ? ? ?case 0: +> > - ? ? ? ? ? ? ? s3c_gpio_cfgpin(S5P6442_GPC0(0), S3C_GPIO_SFN(3)); +> > - ? ? ? ? ? ? ? s3c_gpio_cfgpin(S5P6442_GPC0(1), S3C_GPIO_SFN(3)); +> > - ? ? ? ? ? ? ? s3c_gpio_cfgpin(S5P6442_GPC0(2), S3C_GPIO_SFN(3)); +> > - ? ? ? ? ? ? ? s3c_gpio_cfgpin(S5P6442_GPC0(3), S3C_GPIO_SFN(3)); +> > - ? ? ? ? ? ? ? s3c_gpio_cfgpin(S5P6442_GPC0(4), S3C_GPIO_SFN(3)); +> > + ? ? ? ? ? ? ? base = S5P6442_GPC0(0); +> > ? ? ? ? ? ? ? ?break; > > -> > case 1: -> > - s3c_gpio_cfgpin(S5P6442_GPC1(0), S3C_GPIO_SFN(3)); -> > - s3c_gpio_cfgpin(S5P6442_GPC1(1), S3C_GPIO_SFN(3)); -> > - s3c_gpio_cfgpin(S5P6442_GPC1(2), S3C_GPIO_SFN(3)); -> > - s3c_gpio_cfgpin(S5P6442_GPC1(3), S3C_GPIO_SFN(3)); -> > - s3c_gpio_cfgpin(S5P6442_GPC1(4), S3C_GPIO_SFN(3)); -> > + base = S5P6442_GPC1(0); -> > break; +> > ? ? ? ?case 1: +> > - ? ? ? ? ? ? ? s3c_gpio_cfgpin(S5P6442_GPC1(0), S3C_GPIO_SFN(3)); +> > - ? ? ? ? ? ? ? s3c_gpio_cfgpin(S5P6442_GPC1(1), S3C_GPIO_SFN(3)); +> > - ? ? ? ? ? ? ? s3c_gpio_cfgpin(S5P6442_GPC1(2), S3C_GPIO_SFN(3)); +> > - ? ? ? ? ? ? ? s3c_gpio_cfgpin(S5P6442_GPC1(3), S3C_GPIO_SFN(3)); +> > - ? ? ? ? ? ? ? s3c_gpio_cfgpin(S5P6442_GPC1(4), S3C_GPIO_SFN(3)); +> > + ? ? ? ? ? ? ? base = S5P6442_GPC1(0); +> > ? ? ? ? ? ? ? ?break; > > -> > default: +> > ? ? ? ?default: > > @@ -133,6 +122,7 @@ static int s5p6442_pcm_cfg_gpio(struct platform_device *pdev) -> > return -EINVAL; -> > } +> > ? ? ? ? ? ? ? ?return -EINVAL; +> > ? ? ? ?} > > -> > + s3c_gpio_cfgpin_range(base, 5, S3C_GPIO_SFN(3)); -> > return 0; -> > } +> > + ? ? ? s3c_gpio_cfgpin_range(base, 5, S3C_GPIO_SFN(3)); +> > ? ? ? ?return 0; +> > ?} > > > > diff --git a/arch/arm/mach-s5p6442/dev-spi.c b/arch/arm/mach-s5p6442/dev-spi.c > > index 3019952..1c5c170 100644 > > --- a/arch/arm/mach-s5p6442/dev-spi.c > > +++ b/arch/arm/mach-s5p6442/dev-spi.c > > @@ -37,9 +37,7 @@ static int s5p6442_spi_cfg_gpio(struct platform_device *pdev) -> > { -> > switch (pdev->id) { -> > case 0: -> > - s3c_gpio_cfgpin(S5P6442_GPB(0), S3C_GPIO_SFN(2)); -> > - s3c_gpio_cfgpin(S5P6442_GPB(2), S3C_GPIO_SFN(2)); -> > - s3c_gpio_cfgpin(S5P6442_GPB(3), S3C_GPIO_SFN(2)); -> > + s3c_gpio_cfgpin_range(S5P6442_GPB(0), 4, S3C_GPIO_SFN(2)); +> > ?{ +> > ? ? ? ?switch (pdev->id) { +> > ? ? ? ?case 0: +> > - ? ? ? ? ? ? ? s3c_gpio_cfgpin(S5P6442_GPB(0), S3C_GPIO_SFN(2)); +> > - ? ? ? ? ? ? ? s3c_gpio_cfgpin(S5P6442_GPB(2), S3C_GPIO_SFN(2)); +> > - ? ? ? ? ? ? ? s3c_gpio_cfgpin(S5P6442_GPB(3), S3C_GPIO_SFN(2)); +> > + ? ? ? ? ? ? ? s3c_gpio_cfgpin_range(S5P6442_GPB(0), 4, S3C_GPIO_SFN(2)); > > Where's the GPB(1)??? @@ -109,16 +109,16 @@ you're right, this is an invalid change. will back it out. > Thank you, > Kyungmin Park > -> > s3c_gpio_setpull(S5P6442_GPB(0), S3C_GPIO_PULL_UP); -> > s3c_gpio_setpull(S5P6442_GPB(2), S3C_GPIO_PULL_UP); -> > s3c_gpio_setpull(S5P6442_GPB(3), S3C_GPIO_PULL_UP); +> > ? ? ? ? ? ? ? ?s3c_gpio_setpull(S5P6442_GPB(0), S3C_GPIO_PULL_UP); +> > ? ? ? ? ? ? ? ?s3c_gpio_setpull(S5P6442_GPB(2), S3C_GPIO_PULL_UP); +> > ? ? ? ? ? ? ? ?s3c_gpio_setpull(S5P6442_GPB(3), S3C_GPIO_PULL_UP); > > -- > > 1.6.3.3 > > > > -- > > To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in -> > the body of a message to majordomo@vger.kernel.org -> > More majordomo info at http://vger.kernel.org/majordomo-info.html +> > the body of a message to majordomo at vger.kernel.org +> > More majordomo info at ?http://vger.kernel.org/majordomo-info.html > > -- diff --git a/a/content_digest b/N1/content_digest index f60a63b..0868f42 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,13 +1,10 @@ "ref\01275026212-27510-1-git-send-email-ben-linux@fluff.org\0" "ref\01275026212-27510-6-git-send-email-ben-linux@fluff.org\0" "ref\0AANLkTilPCk0NqJ7od6ZBorqPrlG0xCjdPaim1Q3WwZMH@mail.gmail.com\0" - "From\0Ben Dooks <ben-linux@fluff.org>\0" - "Subject\0Re: [PATCH 05/15] ARM: S5P6442: Change to using s3c_gpio_cfgpin_range()\0" + "From\0ben-linux@fluff.org (Ben Dooks)\0" + "Subject\0[PATCH 05/15] ARM: S5P6442: Change to using s3c_gpio_cfgpin_range()\0" "Date\0Fri, 28 May 2010 07:35:46 +0100\0" - "To\0Kyungmin Park <kmpark@infradead.org>\0" - "Cc\0Ben Dooks <ben-linux@fluff.org>" - linux-arm-kernel@lists.infradead.org - " linux-samsung-soc@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Fri, May 28, 2010 at 03:24:02PM +0900, Kyungmin Park wrote:\n" @@ -24,9 +21,9 @@ "> >\n" "> > Signed-off-by: Ben Dooks <ben-linux@fluff.org>\n" "> > ---\n" - "> > \302\240arch/arm/mach-s5p6442/dev-audio.c | \302\240 30 ++++++++++--------------------\n" - "> > \302\240arch/arm/mach-s5p6442/dev-spi.c \302\240 | \302\240 \302\2404 +---\n" - "> > \302\2402 files changed, 11 insertions(+), 23 deletions(-)\n" + "> > ?arch/arm/mach-s5p6442/dev-audio.c | ? 30 ++++++++++--------------------\n" + "> > ?arch/arm/mach-s5p6442/dev-spi.c ? | ? ?4 +---\n" + "> > ?2 files changed, 11 insertions(+), 23 deletions(-)\n" "> >\n" "> > diff --git a/arch/arm/mach-s5p6442/dev-audio.c b/arch/arm/mach-s5p6442/dev-audio.c\n" "> > index cb801e1..0e57caf 100644\n" @@ -34,85 +31,85 @@ "> > +++ b/arch/arm/mach-s5p6442/dev-audio.c\n" "> > @@ -21,22 +21,16 @@\n" "> >\n" - "> > \302\240static int s5p6442_cfg_i2s(struct platform_device *pdev)\n" - "> > \302\240{\n" - "> > + \302\240 \302\240 \302\240 unsigned int base;\n" + "> > ?static int s5p6442_cfg_i2s(struct platform_device *pdev)\n" + "> > ?{\n" + "> > + ? ? ? unsigned int base;\n" "> > +\n" - "> > \302\240 \302\240 \302\240 \302\240/* configure GPIO for i2s port */\n" - "> > \302\240 \302\240 \302\240 \302\240switch (pdev->id) {\n" - "> > \302\240 \302\240 \302\240 \302\240case 1:\n" - "> > - \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 s3c_gpio_cfgpin(S5P6442_GPC1(0), S3C_GPIO_SFN(2));\n" - "> > - \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 s3c_gpio_cfgpin(S5P6442_GPC1(1), S3C_GPIO_SFN(2));\n" - "> > - \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 s3c_gpio_cfgpin(S5P6442_GPC1(2), S3C_GPIO_SFN(2));\n" - "> > - \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 s3c_gpio_cfgpin(S5P6442_GPC1(3), S3C_GPIO_SFN(2));\n" - "> > - \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 s3c_gpio_cfgpin(S5P6442_GPC1(4), S3C_GPIO_SFN(2));\n" - "> > + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 base = S5P6442_GPC1(0);\n" - "> > \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240break;\n" + "> > ? ? ? ?/* configure GPIO for i2s port */\n" + "> > ? ? ? ?switch (pdev->id) {\n" + "> > ? ? ? ?case 1:\n" + "> > - ? ? ? ? ? ? ? s3c_gpio_cfgpin(S5P6442_GPC1(0), S3C_GPIO_SFN(2));\n" + "> > - ? ? ? ? ? ? ? s3c_gpio_cfgpin(S5P6442_GPC1(1), S3C_GPIO_SFN(2));\n" + "> > - ? ? ? ? ? ? ? s3c_gpio_cfgpin(S5P6442_GPC1(2), S3C_GPIO_SFN(2));\n" + "> > - ? ? ? ? ? ? ? s3c_gpio_cfgpin(S5P6442_GPC1(3), S3C_GPIO_SFN(2));\n" + "> > - ? ? ? ? ? ? ? s3c_gpio_cfgpin(S5P6442_GPC1(4), S3C_GPIO_SFN(2));\n" + "> > + ? ? ? ? ? ? ? base = S5P6442_GPC1(0);\n" + "> > ? ? ? ? ? ? ? ?break;\n" "> >\n" - "> > \302\240 \302\240 \302\240 \302\240case -1:\n" - "> > - \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 s3c_gpio_cfgpin(S5P6442_GPC0(0), S3C_GPIO_SFN(2));\n" - "> > - \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 s3c_gpio_cfgpin(S5P6442_GPC0(1), S3C_GPIO_SFN(2));\n" - "> > - \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 s3c_gpio_cfgpin(S5P6442_GPC0(2), S3C_GPIO_SFN(2));\n" - "> > - \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 s3c_gpio_cfgpin(S5P6442_GPC0(3), S3C_GPIO_SFN(2));\n" - "> > - \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 s3c_gpio_cfgpin(S5P6442_GPC0(4), S3C_GPIO_SFN(2));\n" - "> > + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 base = S5P6442_GPC0(0);\n" - "> > \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240break;\n" + "> > ? ? ? ?case -1:\n" + "> > - ? ? ? ? ? ? ? s3c_gpio_cfgpin(S5P6442_GPC0(0), S3C_GPIO_SFN(2));\n" + "> > - ? ? ? ? ? ? ? s3c_gpio_cfgpin(S5P6442_GPC0(1), S3C_GPIO_SFN(2));\n" + "> > - ? ? ? ? ? ? ? s3c_gpio_cfgpin(S5P6442_GPC0(2), S3C_GPIO_SFN(2));\n" + "> > - ? ? ? ? ? ? ? s3c_gpio_cfgpin(S5P6442_GPC0(3), S3C_GPIO_SFN(2));\n" + "> > - ? ? ? ? ? ? ? s3c_gpio_cfgpin(S5P6442_GPC0(4), S3C_GPIO_SFN(2));\n" + "> > + ? ? ? ? ? ? ? base = S5P6442_GPC0(0);\n" + "> > ? ? ? ? ? ? ? ?break;\n" "> >\n" - "> > \302\240 \302\240 \302\240 \302\240default:\n" + "> > ? ? ? ?default:\n" "> > @@ -44,6 +38,7 @@ static int s5p6442_cfg_i2s(struct platform_device *pdev)\n" - "> > \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240return -EINVAL;\n" - "> > \302\240 \302\240 \302\240 \302\240}\n" + "> > ? ? ? ? ? ? ? ?return -EINVAL;\n" + "> > ? ? ? ?}\n" "> >\n" - "> > + \302\240 \302\240 \302\240 s3c_gpio_cfgpin_range(base, 5, S3C_GPIO_SFN(2));\n" - "> > \302\240 \302\240 \302\240 \302\240return 0;\n" - "> > \302\240}\n" + "> > + ? ? ? s3c_gpio_cfgpin_range(base, 5, S3C_GPIO_SFN(2));\n" + "> > ? ? ? ?return 0;\n" + "> > ?}\n" "> >\n" "> > @@ -111,21 +106,15 @@ struct platform_device s5p6442_device_iis1 = {\n" "> >\n" - "> > \302\240static int s5p6442_pcm_cfg_gpio(struct platform_device *pdev)\n" - "> > \302\240{\n" - "> > + \302\240 \302\240 \302\240 unsigned int base;\n" + "> > ?static int s5p6442_pcm_cfg_gpio(struct platform_device *pdev)\n" + "> > ?{\n" + "> > + ? ? ? unsigned int base;\n" "> > +\n" - "> > \302\240 \302\240 \302\240 \302\240switch (pdev->id) {\n" - "> > \302\240 \302\240 \302\240 \302\240case 0:\n" - "> > - \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 s3c_gpio_cfgpin(S5P6442_GPC0(0), S3C_GPIO_SFN(3));\n" - "> > - \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 s3c_gpio_cfgpin(S5P6442_GPC0(1), S3C_GPIO_SFN(3));\n" - "> > - \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 s3c_gpio_cfgpin(S5P6442_GPC0(2), S3C_GPIO_SFN(3));\n" - "> > - \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 s3c_gpio_cfgpin(S5P6442_GPC0(3), S3C_GPIO_SFN(3));\n" - "> > - \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 s3c_gpio_cfgpin(S5P6442_GPC0(4), S3C_GPIO_SFN(3));\n" - "> > + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 base = S5P6442_GPC0(0);\n" - "> > \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240break;\n" + "> > ? ? ? ?switch (pdev->id) {\n" + "> > ? ? ? ?case 0:\n" + "> > - ? ? ? ? ? ? ? s3c_gpio_cfgpin(S5P6442_GPC0(0), S3C_GPIO_SFN(3));\n" + "> > - ? ? ? ? ? ? ? s3c_gpio_cfgpin(S5P6442_GPC0(1), S3C_GPIO_SFN(3));\n" + "> > - ? ? ? ? ? ? ? s3c_gpio_cfgpin(S5P6442_GPC0(2), S3C_GPIO_SFN(3));\n" + "> > - ? ? ? ? ? ? ? s3c_gpio_cfgpin(S5P6442_GPC0(3), S3C_GPIO_SFN(3));\n" + "> > - ? ? ? ? ? ? ? s3c_gpio_cfgpin(S5P6442_GPC0(4), S3C_GPIO_SFN(3));\n" + "> > + ? ? ? ? ? ? ? base = S5P6442_GPC0(0);\n" + "> > ? ? ? ? ? ? ? ?break;\n" "> >\n" - "> > \302\240 \302\240 \302\240 \302\240case 1:\n" - "> > - \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 s3c_gpio_cfgpin(S5P6442_GPC1(0), S3C_GPIO_SFN(3));\n" - "> > - \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 s3c_gpio_cfgpin(S5P6442_GPC1(1), S3C_GPIO_SFN(3));\n" - "> > - \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 s3c_gpio_cfgpin(S5P6442_GPC1(2), S3C_GPIO_SFN(3));\n" - "> > - \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 s3c_gpio_cfgpin(S5P6442_GPC1(3), S3C_GPIO_SFN(3));\n" - "> > - \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 s3c_gpio_cfgpin(S5P6442_GPC1(4), S3C_GPIO_SFN(3));\n" - "> > + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 base = S5P6442_GPC1(0);\n" - "> > \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240break;\n" + "> > ? ? ? ?case 1:\n" + "> > - ? ? ? ? ? ? ? s3c_gpio_cfgpin(S5P6442_GPC1(0), S3C_GPIO_SFN(3));\n" + "> > - ? ? ? ? ? ? ? s3c_gpio_cfgpin(S5P6442_GPC1(1), S3C_GPIO_SFN(3));\n" + "> > - ? ? ? ? ? ? ? s3c_gpio_cfgpin(S5P6442_GPC1(2), S3C_GPIO_SFN(3));\n" + "> > - ? ? ? ? ? ? ? s3c_gpio_cfgpin(S5P6442_GPC1(3), S3C_GPIO_SFN(3));\n" + "> > - ? ? ? ? ? ? ? s3c_gpio_cfgpin(S5P6442_GPC1(4), S3C_GPIO_SFN(3));\n" + "> > + ? ? ? ? ? ? ? base = S5P6442_GPC1(0);\n" + "> > ? ? ? ? ? ? ? ?break;\n" "> >\n" - "> > \302\240 \302\240 \302\240 \302\240default:\n" + "> > ? ? ? ?default:\n" "> > @@ -133,6 +122,7 @@ static int s5p6442_pcm_cfg_gpio(struct platform_device *pdev)\n" - "> > \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240return -EINVAL;\n" - "> > \302\240 \302\240 \302\240 \302\240}\n" + "> > ? ? ? ? ? ? ? ?return -EINVAL;\n" + "> > ? ? ? ?}\n" "> >\n" - "> > + \302\240 \302\240 \302\240 s3c_gpio_cfgpin_range(base, 5, S3C_GPIO_SFN(3));\n" - "> > \302\240 \302\240 \302\240 \302\240return 0;\n" - "> > \302\240}\n" + "> > + ? ? ? s3c_gpio_cfgpin_range(base, 5, S3C_GPIO_SFN(3));\n" + "> > ? ? ? ?return 0;\n" + "> > ?}\n" "> >\n" "> > diff --git a/arch/arm/mach-s5p6442/dev-spi.c b/arch/arm/mach-s5p6442/dev-spi.c\n" "> > index 3019952..1c5c170 100644\n" "> > --- a/arch/arm/mach-s5p6442/dev-spi.c\n" "> > +++ b/arch/arm/mach-s5p6442/dev-spi.c\n" "> > @@ -37,9 +37,7 @@ static int s5p6442_spi_cfg_gpio(struct platform_device *pdev)\n" - "> > \302\240{\n" - "> > \302\240 \302\240 \302\240 \302\240switch (pdev->id) {\n" - "> > \302\240 \302\240 \302\240 \302\240case 0:\n" - "> > - \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 s3c_gpio_cfgpin(S5P6442_GPB(0), S3C_GPIO_SFN(2));\n" - "> > - \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 s3c_gpio_cfgpin(S5P6442_GPB(2), S3C_GPIO_SFN(2));\n" - "> > - \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 s3c_gpio_cfgpin(S5P6442_GPB(3), S3C_GPIO_SFN(2));\n" - "> > + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 s3c_gpio_cfgpin_range(S5P6442_GPB(0), 4, S3C_GPIO_SFN(2));\n" + "> > ?{\n" + "> > ? ? ? ?switch (pdev->id) {\n" + "> > ? ? ? ?case 0:\n" + "> > - ? ? ? ? ? ? ? s3c_gpio_cfgpin(S5P6442_GPB(0), S3C_GPIO_SFN(2));\n" + "> > - ? ? ? ? ? ? ? s3c_gpio_cfgpin(S5P6442_GPB(2), S3C_GPIO_SFN(2));\n" + "> > - ? ? ? ? ? ? ? s3c_gpio_cfgpin(S5P6442_GPB(3), S3C_GPIO_SFN(2));\n" + "> > + ? ? ? ? ? ? ? s3c_gpio_cfgpin_range(S5P6442_GPB(0), 4, S3C_GPIO_SFN(2));\n" "> \n" "> Where's the GPB(1)???\n" "\n" @@ -121,16 +118,16 @@ "> Thank you,\n" "> Kyungmin Park\n" "> \n" - "> > \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240s3c_gpio_setpull(S5P6442_GPB(0), S3C_GPIO_PULL_UP);\n" - "> > \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240s3c_gpio_setpull(S5P6442_GPB(2), S3C_GPIO_PULL_UP);\n" - "> > \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240s3c_gpio_setpull(S5P6442_GPB(3), S3C_GPIO_PULL_UP);\n" + "> > ? ? ? ? ? ? ? ?s3c_gpio_setpull(S5P6442_GPB(0), S3C_GPIO_PULL_UP);\n" + "> > ? ? ? ? ? ? ? ?s3c_gpio_setpull(S5P6442_GPB(2), S3C_GPIO_PULL_UP);\n" + "> > ? ? ? ? ? ? ? ?s3c_gpio_setpull(S5P6442_GPB(3), S3C_GPIO_PULL_UP);\n" "> > --\n" "> > 1.6.3.3\n" "> >\n" "> > --\n" "> > To unsubscribe from this list: send the line \"unsubscribe linux-samsung-soc\" in\n" - "> > the body of a message to majordomo@vger.kernel.org\n" - "> > More majordomo info at \302\240http://vger.kernel.org/majordomo-info.html\n" + "> > the body of a message to majordomo at vger.kernel.org\n" + "> > More majordomo info at ?http://vger.kernel.org/majordomo-info.html\n" "> >\n" "\n" "-- \n" @@ -140,4 +137,4 @@ "Q: What's a light-year?\n" A: One-third less calories than a regular year. -ad4131e607ad31d8417a72c66e1cc0313ce1c671cadaf53cab4c3415cf09667d +fa41c5a8d02dff848c985d1ad1fcbcacb032446101c50bf4623fa5d2a89fe9fa
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.