All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tony Lindgren <tony@atomide.com>
To: Linus Walleij <linus.walleij@linaro.org>
Cc: "linux-arm-kernel@lists.infradead.org"
	<linux-arm-kernel@lists.infradead.org>,
	Grygorii Strashko <grygorii.strashko@ti.com>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	Peter Ujfalusi <peter.ujfalusi@ti.com>,
	Prakash Manjunathappa <prakash.pm@ti.com>,
	Haojian Zhuang <haojian.zhuang@linaro.org>,
	Linux-OMAP <linux-omap@vger.kernel.org>,
	Roger Quadros <rogerq@ti.com>
Subject: Re: [PATCH 3/6] pinctrl: single: Prepare for supporting SoC specific features
Date: Thu, 10 Oct 2013 15:41:57 -0700	[thread overview]
Message-ID: <20131010224157.GJ29913@atomide.com> (raw)
In-Reply-To: <CACRpkdbX6RqP=ikap_4pq3BOuEt_7ZWv4JwS2NfhDn2up841Pg@mail.gmail.com>

* Linus Walleij <linus.walleij@linaro.org> [131010 08:43]:
> On Wed, Oct 9, 2013 at 5:10 PM, Tony Lindgren <tony@atomide.com> wrote:
> 
> > I was thinking I'll set up an immutable branch for the three
> > pinctrl patches against -rc4 then both you and I can merge
> > them in as needed. Does that work for you?
> 
> Hm it's fair enough to have them in your tree if they do
> not collide ... especially if you want to do some of my
> suggested follow-up moving the ioring handling down into
> pinctrl-single on top of that.

OK, the PRM changes will have to wait until omap3 is DT only,
probably not until v3.14.
 
> > I can also do a test merge with pinctrl/for-next also to make
> > sure there are no conflicts.
> 
> Sure, as long as that works you should be safe.

Seems to merge with no conflicts and build just fine. Here's
the signed tag for the three pinctrl-single patches for you
to pull in too in case you are planning to make some pinctrl
wide changes. Let's consider those commits immutable now, if
I need to fix something I will post them as separate patches.

Regards,

Tony



The following changes since commit d0e639c9e06d44e713170031fe05fb60ebe680af:

  Linux 3.12-rc4 (2013-10-06 14:00:20 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/pinctrl-single-for-linus-for-v3.13-signed

for you to fetch changes up to dc7743aa3c49fabbc6dc9edbcf7df74d776ac32e:

  pinctrl: single: Add support for auxdata (2013-10-10 15:30:47 -0700)

----------------------------------------------------------------
Changes to pinctrl-single to allow handling the wake-up
interrupts that most omaps have in each pinctrl register.

As I need these merged also into the omap tree, it was
agreed that I set them up into a separate branch for
both pinctrl tree and linux-omap tree to merge as needed.

----------------------------------------------------------------
Tony Lindgren (3):
      pinctrl: single: Prepare for supporting SoC specific features
      pinctrl: single: Add support for wake-up interrupts
      pinctrl: single: Add support for auxdata

 .../devicetree/bindings/pinctrl/pinctrl-single.txt |  11 +
 drivers/pinctrl/pinctrl-single.c                   | 383 ++++++++++++++++++++-
 include/linux/platform_data/pinctrl-single.h       |  12 +
 3 files changed, 397 insertions(+), 9 deletions(-)
 create mode 100644 include/linux/platform_data/pinctrl-single.h

WARNING: multiple messages have this Message-ID (diff)
From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 3/6] pinctrl: single: Prepare for supporting SoC specific features
Date: Thu, 10 Oct 2013 15:41:57 -0700	[thread overview]
Message-ID: <20131010224157.GJ29913@atomide.com> (raw)
In-Reply-To: <CACRpkdbX6RqP=ikap_4pq3BOuEt_7ZWv4JwS2NfhDn2up841Pg@mail.gmail.com>

* Linus Walleij <linus.walleij@linaro.org> [131010 08:43]:
> On Wed, Oct 9, 2013 at 5:10 PM, Tony Lindgren <tony@atomide.com> wrote:
> 
> > I was thinking I'll set up an immutable branch for the three
> > pinctrl patches against -rc4 then both you and I can merge
> > them in as needed. Does that work for you?
> 
> Hm it's fair enough to have them in your tree if they do
> not collide ... especially if you want to do some of my
> suggested follow-up moving the ioring handling down into
> pinctrl-single on top of that.

OK, the PRM changes will have to wait until omap3 is DT only,
probably not until v3.14.
 
> > I can also do a test merge with pinctrl/for-next also to make
> > sure there are no conflicts.
> 
> Sure, as long as that works you should be safe.

Seems to merge with no conflicts and build just fine. Here's
the signed tag for the three pinctrl-single patches for you
to pull in too in case you are planning to make some pinctrl
wide changes. Let's consider those commits immutable now, if
I need to fix something I will post them as separate patches.

Regards,

Tony



The following changes since commit d0e639c9e06d44e713170031fe05fb60ebe680af:

  Linux 3.12-rc4 (2013-10-06 14:00:20 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/pinctrl-single-for-linus-for-v3.13-signed

for you to fetch changes up to dc7743aa3c49fabbc6dc9edbcf7df74d776ac32e:

  pinctrl: single: Add support for auxdata (2013-10-10 15:30:47 -0700)

----------------------------------------------------------------
Changes to pinctrl-single to allow handling the wake-up
interrupts that most omaps have in each pinctrl register.

As I need these merged also into the omap tree, it was
agreed that I set them up into a separate branch for
both pinctrl tree and linux-omap tree to merge as needed.

----------------------------------------------------------------
Tony Lindgren (3):
      pinctrl: single: Prepare for supporting SoC specific features
      pinctrl: single: Add support for wake-up interrupts
      pinctrl: single: Add support for auxdata

 .../devicetree/bindings/pinctrl/pinctrl-single.txt |  11 +
 drivers/pinctrl/pinctrl-single.c                   | 383 ++++++++++++++++++++-
 include/linux/platform_data/pinctrl-single.h       |  12 +
 3 files changed, 397 insertions(+), 9 deletions(-)
 create mode 100644 include/linux/platform_data/pinctrl-single.h

  reply	other threads:[~2013-10-10 22:42 UTC|newest]

Thread overview: 105+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-03  5:42 [PATCH 0/6] add support for omap wake-up interrupts via pinctrl-single, take2 Tony Lindgren
2013-10-03  5:42 ` Tony Lindgren
2013-10-03  5:42 ` [PATCH 1/6] ARM: dts: Fix pinctrl mask for omap3 Tony Lindgren
2013-10-03  5:42   ` Tony Lindgren
2013-10-03  5:42 ` [PATCH 2/6] ARM: OMAP2+: Add support for auxdata Tony Lindgren
2013-10-03  5:42   ` Tony Lindgren
2013-10-03  5:42 ` [PATCH 3/6] pinctrl: single: Prepare for supporting SoC specific features Tony Lindgren
2013-10-03  5:42   ` Tony Lindgren
2013-10-07 17:35   ` Tony Lindgren
2013-10-07 17:35     ` Tony Lindgren
2013-10-08 11:55     ` Linus Walleij
2013-10-08 11:55       ` Linus Walleij
2013-10-08 16:21       ` Tony Lindgren
2013-10-08 16:21         ` Tony Lindgren
2013-10-09  5:03       ` Haojian Zhuang
2013-10-09  5:03         ` Haojian Zhuang
2013-10-09 13:43     ` Linus Walleij
2013-10-09 13:43       ` Linus Walleij
2013-10-09 15:10       ` Tony Lindgren
2013-10-09 15:10         ` Tony Lindgren
2013-10-10 15:35         ` Linus Walleij
2013-10-10 15:35           ` Linus Walleij
2013-10-10 22:41           ` Tony Lindgren [this message]
2013-10-10 22:41             ` Tony Lindgren
2013-10-03  5:42 ` [PATCH 4/6] pinctrl: single: Add support for wake-up interrupts Tony Lindgren
2013-10-03  5:42   ` Tony Lindgren
2013-10-03  5:42   ` Tony Lindgren
2013-10-03 17:50   ` Tony Lindgren
2013-10-03 17:50     ` Tony Lindgren
2013-10-03 17:50     ` Tony Lindgren
2013-10-08 12:10   ` Linus Walleij
2013-10-08 12:10     ` Linus Walleij
2013-10-08 16:05     ` Tony Lindgren
2013-10-08 16:05       ` Tony Lindgren
2013-10-10 13:24   ` Roger Quadros
2013-10-10 13:24     ` Roger Quadros
2013-10-10 13:24     ` Roger Quadros
     [not found]     ` <5256AA7F.8030005-l0cyMroinI0@public.gmane.org>
2013-10-10 14:04       ` Linus Walleij
2013-10-10 14:04         ` Linus Walleij
2013-10-10 14:04         ` Linus Walleij
     [not found]         ` <CACRpkdZx5+OCcQytkpjd7_nz4hw6VXoXOS0LByKgJ8_cQjbA4g-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2013-10-10 14:35           ` Roger Quadros
2013-10-10 14:35             ` Roger Quadros
2013-10-10 14:35             ` Roger Quadros
2013-10-10 15:32             ` Linus Walleij
2013-10-10 15:32               ` Linus Walleij
     [not found]               ` <CACRpkdY6NSR7gSc6=_nEr_BdTiEM0Mt9t4GoBSoP26ceVphDhA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2013-10-10 16:15                 ` Tony Lindgren
2013-10-10 16:15                   ` Tony Lindgren
2013-10-10 16:15                   ` Tony Lindgren
2013-10-10 16:00     ` Tony Lindgren
2013-10-10 16:00       ` Tony Lindgren
2013-10-10 16:11       ` Linus Walleij
2013-10-10 16:11         ` Linus Walleij
2013-10-10 16:20         ` Tony Lindgren
2013-10-10 16:20           ` Tony Lindgren
2013-10-11  8:00           ` Linus Walleij
2013-10-11  8:00             ` Linus Walleij
2013-10-11  8:56             ` Roger Quadros
2013-10-11  8:56               ` Roger Quadros
2013-10-11  8:56               ` Roger Quadros
2013-10-11 10:32               ` Linus Walleij
2013-10-11 10:32                 ` Linus Walleij
2013-10-11 15:43                 ` Tony Lindgren
2013-10-11 15:43                   ` Tony Lindgren
2013-10-11 15:56                   ` Linus Walleij
2013-10-11 15:56                     ` Linus Walleij
2013-10-11 16:01                     ` Tony Lindgren
2013-10-11 16:01                       ` Tony Lindgren
2013-10-18  7:40                       ` Balaji T K
2013-10-18  7:40                         ` Balaji T K
2013-10-18 15:35                         ` Tony Lindgren
2013-10-18 15:35                           ` Tony Lindgren
2013-10-18 15:59                           ` Balaji T K
2013-10-18 15:59                             ` Balaji T K
2013-10-18 15:59                             ` Balaji T K
     [not found]                             ` <52615AD4.7040306-l0cyMroinI0@public.gmane.org>
2013-10-18 16:06                               ` Tony Lindgren
2013-10-18 16:06                                 ` Tony Lindgren
2013-10-18 16:06                                 ` Tony Lindgren
2013-10-11 15:36               ` Tony Lindgren
2013-10-11 15:36                 ` Tony Lindgren
2013-10-11 15:43                 ` Balaji T K
2013-10-11 15:43                   ` Balaji T K
2013-10-11 15:43                   ` Balaji T K
2013-10-11 15:48                   ` Tony Lindgren
2013-10-11 15:48                     ` Tony Lindgren
2013-10-10 16:23       ` Tony Lindgren
2013-10-10 16:23         ` Tony Lindgren
2013-10-11  8:45         ` Roger Quadros
2013-10-11  8:45           ` Roger Quadros
2013-10-11  8:49       ` Roger Quadros
2013-10-11  8:49         ` Roger Quadros
2013-10-11  8:49         ` Roger Quadros
     [not found]         ` <5257BB8C.5080001-l0cyMroinI0@public.gmane.org>
2013-10-11 13:59           ` Roger Quadros
2013-10-11 13:59             ` Roger Quadros
2013-10-11 13:59             ` Roger Quadros
     [not found]             ` <52580438.4040002-l0cyMroinI0@public.gmane.org>
2013-10-11 15:18               ` Tony Lindgren
2013-10-11 15:18                 ` Tony Lindgren
2013-10-11 15:18                 ` Tony Lindgren
2013-10-03  5:42 ` [PATCH 5/6] pinctrl: single: Add support for auxdata Tony Lindgren
2013-10-03  5:42   ` Tony Lindgren
2013-10-03  5:42 ` [PATCH 6/6] ARM: OMAP: Move DT wake-up event handling over to use pinctrl-single-omap Tony Lindgren
2013-10-03  5:42   ` Tony Lindgren
2013-10-10 21:47 ` [PATCH 0/6] add support for omap wake-up interrupts via pinctrl-single, take2 Kevin Hilman
2013-10-10 21:47   ` Kevin Hilman
2013-10-10 22:47   ` Tony Lindgren
2013-10-10 22:47     ` Tony Lindgren

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=20131010224157.GJ29913@atomide.com \
    --to=tony@atomide.com \
    --cc=grygorii.strashko@ti.com \
    --cc=haojian.zhuang@linaro.org \
    --cc=linus.walleij@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=peter.ujfalusi@ti.com \
    --cc=prakash.pm@ti.com \
    --cc=rogerq@ti.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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.