[GIT,PULL] the great <mach/gpio.h> purge

Message ID CACRpkdbPHn6bWdr8t9BrmE2JZZuuVnF7ujzEFdrM86WmrRS5Hw@mail.gmail.com
State New
Headers show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git

Message

Linus Walleij June 30, 2014, 8:06 p.m.
Hi ARM SoC guys,

please pull in this patch set removing <mach/gpio.h> for good.
I guess it could collide with some S5P deletion.
If you decide to pull the S5P purge first, tell me so I can rebase.

Yours,
Linus Walleij


The following changes since commit 4c834452aad01531db949414f94f817a86348d59:

  Linux 3.16-rc3 (2014-06-29 14:11:36 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git
tags/gpio-h-purge

for you to fetch changes up to 53430333c345c3531f9443d43c6fba1da693abe4:

  ARM: delete old reference to ARM_GPIOLIB_COMPLEX (2014-06-30 21:37:39 +0200)

----------------------------------------------------------------
This is a purge of all things <mach/gpio.h>, now I never
want to see it again.

- Remove the need for <mach/gpio.h> from S5P
- Kill CONFIG_NEED_MACH_GPIO_H
- Kill remnants of ARM_GPIOLIB_COMPLEX

----------------------------------------------------------------
Linus Walleij (4):
      ARM: s5p: cut the custom ARCH_NR_GPIOS definition
      ARM: mach-s5p: get rid of all <mach/gpio.h> headers
      ARM: kill CONFIG_NEED_MACH_GPIO_H
      ARM: delete old reference to ARM_GPIOLIB_COMPLEX

 arch/arm/Kconfig                                         | 10 ----------
 arch/arm/include/asm/gpio.h                              |  7 -------
 arch/arm/mach-s5p64x0/common.c                           |  2 +-
 arch/arm/mach-s5p64x0/dev-audio.c                        |  3 ++-
 .../mach-s5p64x0/include/mach/{gpio.h => gpio-samsung.h} |  7 +------
 arch/arm/mach-s5p64x0/mach-smdk6440.c                    |  1 +
 arch/arm/mach-s5p64x0/mach-smdk6450.c                    |  1 +
 arch/arm/mach-s5p64x0/setup-fb-24bpp.c                   |  2 +-
 arch/arm/mach-s5p64x0/setup-i2c0.c                       |  2 +-
 arch/arm/mach-s5p64x0/setup-i2c1.c                       |  2 +-
 arch/arm/mach-s5p64x0/setup-sdhci-gpio.c                 |  2 +-
 arch/arm/mach-s5p64x0/setup-spi.c                        |  2 +-
 arch/arm/mach-s5pc100/dev-audio.c                        |  2 +-
 .../mach-s5pc100/include/mach/{gpio.h => gpio-samsung.h} |  6 +-----
 arch/arm/mach-s5pc100/mach-smdkc100.c                    |  1 +
 arch/arm/mach-s5pc100/setup-fb-24bpp.c                   |  2 +-
 arch/arm/mach-s5pc100/setup-i2c0.c                       |  2 +-
 arch/arm/mach-s5pc100/setup-i2c1.c                       |  2 +-
 arch/arm/mach-s5pc100/setup-ide.c                        |  2 +-
 arch/arm/mach-s5pc100/setup-keypad.c                     |  2 +-
 arch/arm/mach-s5pc100/setup-sdhci-gpio.c                 |  2 +-
 arch/arm/mach-s5pc100/setup-spi.c                        |  2 +-
 arch/arm/mach-s5pv210/dev-audio.c                        |  2 +-
 .../mach-s5pv210/include/mach/{gpio.h => gpio-samsung.h} |  7 +------
 arch/arm/mach-s5pv210/mach-aquila.c                      |  1 +
 arch/arm/mach-s5pv210/mach-goni.c                        |  1 +
 arch/arm/mach-s5pv210/mach-smdkv210.c                    |  1 +
 arch/arm/mach-s5pv210/setup-fb-24bpp.c                   |  2 +-
 arch/arm/mach-s5pv210/setup-fimc.c                       |  3 ++-
 arch/arm/mach-s5pv210/setup-i2c0.c                       |  2 +-
 arch/arm/mach-s5pv210/setup-i2c1.c                       |  2 +-
 arch/arm/mach-s5pv210/setup-i2c2.c                       |  2 +-
 arch/arm/mach-s5pv210/setup-ide.c                        |  2 +-
 arch/arm/mach-s5pv210/setup-keypad.c                     |  2 +-
 arch/arm/mach-s5pv210/setup-sdhci-gpio.c                 |  2 +-
 arch/arm/mach-s5pv210/setup-spi.c                        |  2 +-
 arch/arm/plat-samsung/Kconfig                            | 16 ----------------
 arch/arm/plat-samsung/include/plat/gpio-core.h           |  3 +++
 arch/arm/plat-samsung/pm-gpio.c                          |  2 --
 arch/arm/plat-samsung/s5p-irq-eint.c                     |  2 +-
 drivers/gpio/gpio-samsung.c                              |  3 ---
 sound/soc/samsung/goni_wm8994.c                          |  2 +-
 42 files changed, 41 insertions(+), 82 deletions(-)
 rename arch/arm/mach-s5p64x0/include/mach/{gpio.h => gpio-samsung.h} (95%)
 rename arch/arm/mach-s5pc100/include/mach/{gpio.h => gpio-samsung.h} (97%)
 rename arch/arm/mach-s5pv210/include/mach/{gpio.h => gpio-samsung.h} (96%)
--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Kukjin Kim July 1, 2014, 2:13 a.m. | #1
Linus Walleij wrote:
> 
> Hi ARM SoC guys,
> 
Hi Linus,

> please pull in this patch set removing <mach/gpio.h> for good.
> I guess it could collide with some S5P deletion.

Yeah...

> If you decide to pull the S5P purge first, tell me so I can rebase.
> 
So, I think, would be better if we could remove S5P64X0 and S5PC100 then
<mach/gpio.h> in samsung stuff. But it's up to arm-soc maintainer? ;-)

Thanks,
Kukjin

> Yours,
> Linus Walleij
> 
> 
> The following changes since commit 4c834452aad01531db949414f94f817a86348d59:
> 
>   Linux 3.16-rc3 (2014-06-29 14:11:36 -0700)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git
> tags/gpio-h-purge
> 
> for you to fetch changes up to 53430333c345c3531f9443d43c6fba1da693abe4:
> 
>   ARM: delete old reference to ARM_GPIOLIB_COMPLEX (2014-06-30 21:37:39 +0200)
> 
> ----------------------------------------------------------------
> This is a purge of all things <mach/gpio.h>, now I never
> want to see it again.
> 
> - Remove the need for <mach/gpio.h> from S5P
> - Kill CONFIG_NEED_MACH_GPIO_H
> - Kill remnants of ARM_GPIOLIB_COMPLEX
> 
> ----------------------------------------------------------------
> Linus Walleij (4):
>       ARM: s5p: cut the custom ARCH_NR_GPIOS definition
>       ARM: mach-s5p: get rid of all <mach/gpio.h> headers
>       ARM: kill CONFIG_NEED_MACH_GPIO_H
>       ARM: delete old reference to ARM_GPIOLIB_COMPLEX
> 
>  arch/arm/Kconfig                                         | 10 ----------
>  arch/arm/include/asm/gpio.h                              |  7 -------
>  arch/arm/mach-s5p64x0/common.c                           |  2 +-
>  arch/arm/mach-s5p64x0/dev-audio.c                        |  3 ++-
>  .../mach-s5p64x0/include/mach/{gpio.h => gpio-samsung.h} |  7 +------
>  arch/arm/mach-s5p64x0/mach-smdk6440.c                    |  1 +
>  arch/arm/mach-s5p64x0/mach-smdk6450.c                    |  1 +
>  arch/arm/mach-s5p64x0/setup-fb-24bpp.c                   |  2 +-
>  arch/arm/mach-s5p64x0/setup-i2c0.c                       |  2 +-
>  arch/arm/mach-s5p64x0/setup-i2c1.c                       |  2 +-
>  arch/arm/mach-s5p64x0/setup-sdhci-gpio.c                 |  2 +-
>  arch/arm/mach-s5p64x0/setup-spi.c                        |  2 +-
>  arch/arm/mach-s5pc100/dev-audio.c                        |  2 +-
>  .../mach-s5pc100/include/mach/{gpio.h => gpio-samsung.h} |  6 +-----
>  arch/arm/mach-s5pc100/mach-smdkc100.c                    |  1 +
>  arch/arm/mach-s5pc100/setup-fb-24bpp.c                   |  2 +-
>  arch/arm/mach-s5pc100/setup-i2c0.c                       |  2 +-
>  arch/arm/mach-s5pc100/setup-i2c1.c                       |  2 +-
>  arch/arm/mach-s5pc100/setup-ide.c                        |  2 +-
>  arch/arm/mach-s5pc100/setup-keypad.c                     |  2 +-
>  arch/arm/mach-s5pc100/setup-sdhci-gpio.c                 |  2 +-
>  arch/arm/mach-s5pc100/setup-spi.c                        |  2 +-
>  arch/arm/mach-s5pv210/dev-audio.c                        |  2 +-
>  .../mach-s5pv210/include/mach/{gpio.h => gpio-samsung.h} |  7 +------
>  arch/arm/mach-s5pv210/mach-aquila.c                      |  1 +
>  arch/arm/mach-s5pv210/mach-goni.c                        |  1 +
>  arch/arm/mach-s5pv210/mach-smdkv210.c                    |  1 +
>  arch/arm/mach-s5pv210/setup-fb-24bpp.c                   |  2 +-
>  arch/arm/mach-s5pv210/setup-fimc.c                       |  3 ++-
>  arch/arm/mach-s5pv210/setup-i2c0.c                       |  2 +-
>  arch/arm/mach-s5pv210/setup-i2c1.c                       |  2 +-
>  arch/arm/mach-s5pv210/setup-i2c2.c                       |  2 +-
>  arch/arm/mach-s5pv210/setup-ide.c                        |  2 +-
>  arch/arm/mach-s5pv210/setup-keypad.c                     |  2 +-
>  arch/arm/mach-s5pv210/setup-sdhci-gpio.c                 |  2 +-
>  arch/arm/mach-s5pv210/setup-spi.c                        |  2 +-
>  arch/arm/plat-samsung/Kconfig                            | 16 ----------------
>  arch/arm/plat-samsung/include/plat/gpio-core.h           |  3 +++
>  arch/arm/plat-samsung/pm-gpio.c                          |  2 --
>  arch/arm/plat-samsung/s5p-irq-eint.c                     |  2 +-
>  drivers/gpio/gpio-samsung.c                              |  3 ---
>  sound/soc/samsung/goni_wm8994.c                          |  2 +-
>  42 files changed, 41 insertions(+), 82 deletions(-)
>  rename arch/arm/mach-s5p64x0/include/mach/{gpio.h => gpio-samsung.h} (95%)
>  rename arch/arm/mach-s5pc100/include/mach/{gpio.h => gpio-samsung.h} (97%)
>  rename arch/arm/mach-s5pv210/include/mach/{gpio.h => gpio-samsung.h} (96%)

--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Olof Johansson July 1, 2014, 3:31 a.m. | #2
On Mon, Jun 30, 2014 at 7:13 PM, Kukjin Kim <kgene.kim@samsung.com> wrote:
> Linus Walleij wrote:
>>
>> Hi ARM SoC guys,
>>
> Hi Linus,
>
>> please pull in this patch set removing <mach/gpio.h> for good.
>> I guess it could collide with some S5P deletion.
>
> Yeah...
>
>> If you decide to pull the S5P purge first, tell me so I can rebase.
>>
> So, I think, would be better if we could remove S5P64X0 and S5PC100 then
> <mach/gpio.h> in samsung stuff. But it's up to arm-soc maintainer? ;-)


As long as it's just deletion from both sides, I can happily resolve
that when merging.

Kukjin, I presume the removal would be in a cleanup branch as well?
Please try to send it soon so we can get some time in -next with it.

(I'll do merges in a couple of days, the backlog is building up. :)


-Olof
--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Kukjin Kim July 1, 2014, 11:35 a.m. | #3
Olof Johansson wrote:
> 
> On Mon, Jun 30, 2014 at 7:13 PM, Kukjin Kim <kgene.kim@samsung.com> wrote:
> > Linus Walleij wrote:
> >>
> >> Hi ARM SoC guys,
> >>
> > Hi Linus,
> >
> >> please pull in this patch set removing <mach/gpio.h> for good.
> >> I guess it could collide with some S5P deletion.
> >
> > Yeah...
> >
> >> If you decide to pull the S5P purge first, tell me so I can rebase.
> >>
> > So, I think, would be better if we could remove S5P64X0 and S5PC100 then
> > <mach/gpio.h> in samsung stuff. But it's up to arm-soc maintainer? ;-)
> 
> 
> As long as it's just deletion from both sides, I can happily resolve
> that when merging.
> 
Thanks :)

> Kukjin, I presume the removal would be in a cleanup branch as well?
> Please try to send it soon so we can get some time in -next with it.
> 
Yeah, I will send it soon if no objections.

> (I'll do merges in a couple of days, the backlog is building up. :)
> 
Sure, thanks.

- Kukjin

--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Linus Walleij July 15, 2014, 7:32 p.m. | #4
On Mon, Jun 30, 2014 at 10:06 PM, Linus Walleij
<linus.walleij@linaro.org> wrote:

> Hi ARM SoC guys,
>
> please pull in this patch set removing <mach/gpio.h> for good.
> I guess it could collide with some S5P deletion.
> If you decide to pull the S5P purge first, tell me so I can rebase.
>
> Yours,
> Linus Walleij
>
>
> The following changes since commit 4c834452aad01531db949414f94f817a86348d59:
>
>   Linux 3.16-rc3 (2014-06-29 14:11:36 -0700)
>
> are available in the git repository at:
>
>   git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git
> tags/gpio-h-purge
>
> for you to fetch changes up to 53430333c345c3531f9443d43c6fba1da693abe4:
>
>   ARM: delete old reference to ARM_GPIOLIB_COMPLEX (2014-06-30 21:37:39 +0200)
>
> ----------------------------------------------------------------
> This is a purge of all things <mach/gpio.h>, now I never
> want to see it again.
>
> - Remove the need for <mach/gpio.h> from S5P
> - Kill CONFIG_NEED_MACH_GPIO_H
> - Kill remnants of ARM_GPIOLIB_COMPLEX
>
> ----------------------------------------------------------------
> Linus Walleij (4):
>       ARM: s5p: cut the custom ARCH_NR_GPIOS definition
>       ARM: mach-s5p: get rid of all <mach/gpio.h> headers
>       ARM: kill CONFIG_NEED_MACH_GPIO_H
>       ARM: delete old reference to ARM_GPIOLIB_COMPLEX

So ARM SoC folks, what do we do about this?

Shall I rebase it or can you pull this in as-is?

Yours,
Linus Walleij
--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Olof Johansson July 15, 2014, 9:09 p.m. | #5
On Tue, Jul 15, 2014 at 12:32 PM, Linus Walleij
<linus.walleij@linaro.org> wrote:
> On Mon, Jun 30, 2014 at 10:06 PM, Linus Walleij
> <linus.walleij@linaro.org> wrote:
>
>> Hi ARM SoC guys,
>>
>> please pull in this patch set removing <mach/gpio.h> for good.
>> I guess it could collide with some S5P deletion.
>> If you decide to pull the S5P purge first, tell me so I can rebase.
>>
>> Yours,
>> Linus Walleij
>>
>>
>> The following changes since commit 4c834452aad01531db949414f94f817a86348d59:
>>
>>   Linux 3.16-rc3 (2014-06-29 14:11:36 -0700)
>>
>> are available in the git repository at:
>>
>>   git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git
>> tags/gpio-h-purge
>>
>> for you to fetch changes up to 53430333c345c3531f9443d43c6fba1da693abe4:
>>
>>   ARM: delete old reference to ARM_GPIOLIB_COMPLEX (2014-06-30 21:37:39 +0200)
>>
>> ----------------------------------------------------------------
>> This is a purge of all things <mach/gpio.h>, now I never
>> want to see it again.
>>
>> - Remove the need for <mach/gpio.h> from S5P
>> - Kill CONFIG_NEED_MACH_GPIO_H
>> - Kill remnants of ARM_GPIOLIB_COMPLEX
>>
>> ----------------------------------------------------------------
>> Linus Walleij (4):
>>       ARM: s5p: cut the custom ARCH_NR_GPIOS definition
>>       ARM: mach-s5p: get rid of all <mach/gpio.h> headers
>>       ARM: kill CONFIG_NEED_MACH_GPIO_H
>>       ARM: delete old reference to ARM_GPIOLIB_COMPLEX
>
> So ARM SoC folks, what do we do about this?
>
> Shall I rebase it or can you pull this in as-is?

I'll pull it in as-is. It fell off my list since the thread got marked
read by mistake. I'll likely get to it tonight or so.


-Olof
--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Olof Johansson July 16, 2014, 1:32 a.m. | #6
On Mon, Jun 30, 2014 at 1:06 PM, Linus Walleij <linus.walleij@linaro.org> wrote:
> Hi ARM SoC guys,
>
> please pull in this patch set removing <mach/gpio.h> for good.
> I guess it could collide with some S5P deletion.
> If you decide to pull the S5P purge first, tell me so I can rebase.
>
> Yours,
> Linus Walleij
>
>
> The following changes since commit 4c834452aad01531db949414f94f817a86348d59:
>
>   Linux 3.16-rc3 (2014-06-29 14:11:36 -0700)
>
> are available in the git repository at:
>
>   git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git
> tags/gpio-h-purge
>
> for you to fetch changes up to 53430333c345c3531f9443d43c6fba1da693abe4:
>
>   ARM: delete old reference to ARM_GPIOLIB_COMPLEX (2014-06-30 21:37:39 +0200)
>
> ----------------------------------------------------------------
> This is a purge of all things <mach/gpio.h>, now I never
> want to see it again.
>
> - Remove the need for <mach/gpio.h> from S5P
> - Kill CONFIG_NEED_MACH_GPIO_H
> - Kill remnants of ARM_GPIOLIB_COMPLEX

Merged. Fixups were trivial since it was just changes against files
that had been removed.


-Olof
--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html