linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [GIT PULL] gpio changes for v3.9; second round
@ 2013-03-02 14:24 Grant Likely
  2013-03-03 18:50 ` Linus Torvalds
  0 siblings, 1 reply; 4+ messages in thread
From: Grant Likely @ 2013-03-02 14:24 UTC (permalink / raw)
  To: Linus Torvalds, Linus Walleij, Linux Kernel Mailing List

Hi Linus,

Please pull, I missed a few things in the first gpio request I sent.

Thanks,
g.

The following changes since commit b0af9cd9aab60ceb17d3ebabb9fdf4ff0a99cf50:

  Merge tag 'lzo-update-signature-20130226' of
git://github.com/markus-oberhumer/linux (2013-02-28 20:45:52 -0800)

are available in the git repository at:


  git://git.secretlab.ca/git/linux tags/gpio-for-linus

for you to fetch changes up to 4710e74246a6496b65c8d28ef4a3144a7958264b:

  gpio/tegra: assume CONFIG_OF (2013-03-02 13:20:22 +0000)

----------------------------------------------------------------
2nd round of GPIO changes for Linux 3.9

This branch contains a few bug fixes that I missed the first time around
and updates to the gpio_desc series included in the first pull request.

----------------------------------------------------------------
Alexandre Courbot (3):
      gpiolib: check descriptors validity before use
      gpiolib: use const parameters when possible
      gpiolib: move comment to right function

Gabriel Fernandez (1):
      gpio/stmpe: pass DT node to irqdomain

Mika Westerberg (1):
      gpio/gpio-ich: fix ichx_gpio_check_available() return what callers expect

Stephen Warren (1):
      gpio/tegra: assume CONFIG_OF

 drivers/gpio/gpio-ich.c   |    4 +-
 drivers/gpio/gpio-stmpe.c |    7 ++-
 drivers/gpio/gpio-tegra.c |   11 ++--
 drivers/gpio/gpiolib.c    |  143 ++++++++++++++++++++++++++-------------------
 4 files changed, 94 insertions(+), 71 deletions(-)


--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [GIT PULL] gpio changes for v3.9; second round
  2013-03-02 14:24 [GIT PULL] gpio changes for v3.9; second round Grant Likely
@ 2013-03-03 18:50 ` Linus Torvalds
  2013-03-03 21:32   ` Grant Likely
  0 siblings, 1 reply; 4+ messages in thread
From: Linus Torvalds @ 2013-03-03 18:50 UTC (permalink / raw)
  To: Grant Likely; +Cc: Linus Walleij, Linux Kernel Mailing List

On Sat, Mar 2, 2013 at 6:24 AM, Grant Likely <grant.likely@secretlab.ca> wrote:
>
> 2nd round of GPIO changes for Linux 3.9
>
> This branch contains a few bug fixes that I missed the first time around
> and updates to the gpio_desc series included in the first pull request.
>
> ----------------------------------------------------------------
> Gabriel Fernandez (1):
>       gpio/stmpe: pass DT node to irqdomain

This breaks the build for me. I get

  drivers/gpio/gpio-stmpe.c: In function ‘stmpe_gpio_irq_init’:
  drivers/gpio/gpio-stmpe.c:313:23: error: ‘struct gpio_chip’ has no
member named ‘of_node’
  drivers/gpio/gpio-stmpe.c:316:61: error: ‘struct gpio_chip’ has no
member named ‘of_node’
  drivers/gpio/gpio-stmpe.c: In function ‘stmpe_gpio_probe’:
  drivers/gpio/gpio-stmpe.c:351:18: error: ‘struct gpio_chip’ has no
member named ‘of_node’

and I don't think this is a merge error.

Should this driver depend on CONFIG_OF_GPIO, or should it have
#ifdef's? Regardless, it's clearly broken right now.

Unpulled.

                Linus

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [GIT PULL] gpio changes for v3.9; second round
  2013-03-03 18:50 ` Linus Torvalds
@ 2013-03-03 21:32   ` Grant Likely
  2013-03-04  1:48     ` Grant Likely
  0 siblings, 1 reply; 4+ messages in thread
From: Grant Likely @ 2013-03-03 21:32 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: Linus Walleij, Linux Kernel Mailing List

On Mon, Mar 4, 2013 at 2:50 AM, Linus Torvalds
<torvalds@linux-foundation.org> wrote:
> On Sat, Mar 2, 2013 at 6:24 AM, Grant Likely <grant.likely@secretlab.ca> wrote:
>>
>> 2nd round of GPIO changes for Linux 3.9
>>
>> This branch contains a few bug fixes that I missed the first time around
>> and updates to the gpio_desc series included in the first pull request.
>>
>> ----------------------------------------------------------------
>> Gabriel Fernandez (1):
>>       gpio/stmpe: pass DT node to irqdomain
>
> This breaks the build for me. I get
>
>   drivers/gpio/gpio-stmpe.c: In function ‘stmpe_gpio_irq_init’:
>   drivers/gpio/gpio-stmpe.c:313:23: error: ‘struct gpio_chip’ has no
> member named ‘of_node’
>   drivers/gpio/gpio-stmpe.c:316:61: error: ‘struct gpio_chip’ has no
> member named ‘of_node’
>   drivers/gpio/gpio-stmpe.c: In function ‘stmpe_gpio_probe’:
>   drivers/gpio/gpio-stmpe.c:351:18: error: ‘struct gpio_chip’ has no
> member named ‘of_node’
>
> and I don't think this is a merge error.
>
> Should this driver depend on CONFIG_OF_GPIO, or should it have
> #ifdef's? Regardless, it's clearly broken right now.
>
> Unpulled.

Ugh. Well I clearly screwed that up. Sorry. I'll fix that right away.

g.

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [GIT PULL] gpio changes for v3.9; second round
  2013-03-03 21:32   ` Grant Likely
@ 2013-03-04  1:48     ` Grant Likely
  0 siblings, 0 replies; 4+ messages in thread
From: Grant Likely @ 2013-03-04  1:48 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: Linus Walleij, Linux Kernel Mailing List

On Mon, Mar 4, 2013 at 5:32 AM, Grant Likely <grant.likely@secretlab.ca> wrote:
> On Mon, Mar 4, 2013 at 2:50 AM, Linus Torvalds
> <torvalds@linux-foundation.org> wrote:
>> Should this driver depend on CONFIG_OF_GPIO, or should it have
>> #ifdef's? Regardless, it's clearly broken right now.
>>
>> Unpulled.
>
> Ugh. Well I clearly screwed that up. Sorry. I'll fix that right away.

Okay, I've dropped the top two commits from that tag. The broken
commit and the one above it were certainly not critical. They can wait
until v3.10. Here's a new pull request.

g.

The following changes since commit b0af9cd9aab60ceb17d3ebabb9fdf4ff0a99cf50:

  Merge tag 'lzo-update-signature-20130226' of
git://github.com/markus-oberhumer/linux (2013-02-28 20:45:52 -0800)

are available in the git repository at:


  git://git.secretlab.ca/git/linux tags/gpio-for-linus

for you to fetch changes up to e97f9b5277afeabb54892ebc6f68500098467ba1:

  gpio/gpio-ich: fix ichx_gpio_check_available() return what callers
expect (2013-03-02 13:20:21 +0000)

----------------------------------------------------------------
2nd round of GPIO changes for Linux 3.9

This branch contains a few bug fixes that I missed the first time around
and updates to the gpio_desc series included in the first pull request.
This tag has been retagged to drop the 2 head commits because the one of
them caused a build failure.

----------------------------------------------------------------
Alexandre Courbot (3):
      gpiolib: check descriptors validity before use
      gpiolib: use const parameters when possible
      gpiolib: move comment to right function

Mika Westerberg (1):
      gpio/gpio-ich: fix ichx_gpio_check_available() return what callers expect

 drivers/gpio/gpio-ich.c |    4 +-
 drivers/gpio/gpiolib.c  |  143 +++++++++++++++++++++++++++--------------------
 2 files changed, 84 insertions(+), 63 deletions(-)

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2013-03-04  1:48 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-03-02 14:24 [GIT PULL] gpio changes for v3.9; second round Grant Likely
2013-03-03 18:50 ` Linus Torvalds
2013-03-03 21:32   ` Grant Likely
2013-03-04  1:48     ` Grant Likely

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).