| Message ID | 20110615193734.23641.8004.stgit@ponder (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Jun 15, 2011 at 12:37 PM, Grant Likely <grant.likely@secretlab.ca> wrote: > As part of the gpio driver consolidation, this patch moves the Tegra driver > into drivers/gpio > > Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Acked-by: Olof Johansson <olof@lixom.net> Colin said he had plans to do it, or I would already have sent this out. Thanks for doing it! :) -Olof
On Wed, Jun 15, 2011 at 12:37 PM, Grant Likely <grant.likely@secretlab.ca> wrote: > As part of the gpio driver consolidation, this patch moves the Tegra driver > into drivers/gpio > > Signed-off-by: Grant Likely <grant.likely@secretlab.ca> > --- > > If there are no objections, I'll merge this via gpio/next I have this patch as part of a series that should get posted later this week, as well as a patch on top of it that depends on this change and another change in my tree, but I'm pessimistic that my series will get in to 3.1 since it depends on some common consolidation that hasn't been agreed upon yet. So, Acked-by: Colin Cross <ccross@android.com> Put it in gpio/next, and I'll make sure any other Tegra patches with dependencies get pulled after yours.
On Wed, Jun 15, 2011 at 2:21 PM, Colin Cross <ccross@android.com> wrote: > On Wed, Jun 15, 2011 at 12:37 PM, Grant Likely > <grant.likely@secretlab.ca> wrote: >> As part of the gpio driver consolidation, this patch moves the Tegra driver >> into drivers/gpio >> >> Signed-off-by: Grant Likely <grant.likely@secretlab.ca> >> --- >> >> If there are no objections, I'll merge this via gpio/next > > I have this patch as part of a series that should get posted later > this week, as well as a patch on top of it that depends on this change > and another change in my tree, but I'm pessimistic that my series will > get in to 3.1 since it depends on some common consolidation that > hasn't been agreed upon yet. So, > Acked-by: Colin Cross <ccross@android.com> > > Put it in gpio/next, and I'll make sure any other Tegra patches with > dependencies get pulled after yours. How about I put it in a separate branch so that if you need to pull it for dependencies then you can do so without pulling in all the gpio/next commits. g.
On Wed, Jun 15, 2011 at 2:48 PM, Grant Likely <grant.likely@secretlab.ca> wrote: > On Wed, Jun 15, 2011 at 2:21 PM, Colin Cross <ccross@android.com> wrote: >> On Wed, Jun 15, 2011 at 12:37 PM, Grant Likely >> <grant.likely@secretlab.ca> wrote: >>> As part of the gpio driver consolidation, this patch moves the Tegra driver >>> into drivers/gpio >>> >>> Signed-off-by: Grant Likely <grant.likely@secretlab.ca> >>> --- >>> >>> If there are no objections, I'll merge this via gpio/next >> >> I have this patch as part of a series that should get posted later >> this week, as well as a patch on top of it that depends on this change >> and another change in my tree, but I'm pessimistic that my series will >> get in to 3.1 since it depends on some common consolidation that >> hasn't been agreed upon yet. So, >> Acked-by: Colin Cross <ccross@android.com> >> >> Put it in gpio/next, and I'll make sure any other Tegra patches with >> dependencies get pulled after yours. > > How about I put it in a separate branch so that if you need to pull it > for dependencies then you can do so without pulling in all the > gpio/next commits. I've pushed it out to the following branch. If everything looks okay to you, then I'll merge it into gpio/next and push it out. The following changes since commit 2c53b436a30867eb6b47dd7bab23ba638d1fb0d2: Linux 3.0-rc3 (2011-06-13 15:29:59 -0700) are available in the git repository at: git://git.secretlab.ca/git/linux-2.6 gpio/next-tegra Grant Likely (2): gpio/tegra: Move Tegra gpio driver to drivers/gpio gpio/tegra: add devicetree support .../devicetree/bindings/gpio/gpio_nvidia.txt | 7 +++++++ arch/arm/mach-tegra/Makefile | 1 - drivers/gpio/Makefile | 1 + .../mach-tegra/gpio.c => drivers/gpio/gpio-tegra.c | 10 ++++++++++ 4 files changed, 18 insertions(+), 1 deletions(-) create mode 100644 Documentation/devicetree/bindings/gpio/gpio_nvidia.txt rename arch/arm/mach-tegra/gpio.c => drivers/gpio/gpio-tegra.c (97%)
On Wed, Jun 15, 2011 at 2:00 PM, Grant Likely <grant.likely@secretlab.ca> wrote: > On Wed, Jun 15, 2011 at 2:48 PM, Grant Likely <grant.likely@secretlab.ca> wrote: >> On Wed, Jun 15, 2011 at 2:21 PM, Colin Cross <ccross@android.com> wrote: >>> On Wed, Jun 15, 2011 at 12:37 PM, Grant Likely >>> <grant.likely@secretlab.ca> wrote: >>>> As part of the gpio driver consolidation, this patch moves the Tegra driver >>>> into drivers/gpio >>>> >>>> Signed-off-by: Grant Likely <grant.likely@secretlab.ca> >>>> --- >>>> >>>> If there are no objections, I'll merge this via gpio/next >>> >>> I have this patch as part of a series that should get posted later >>> this week, as well as a patch on top of it that depends on this change >>> and another change in my tree, but I'm pessimistic that my series will >>> get in to 3.1 since it depends on some common consolidation that >>> hasn't been agreed upon yet. So, >>> Acked-by: Colin Cross <ccross@android.com> >>> >>> Put it in gpio/next, and I'll make sure any other Tegra patches with >>> dependencies get pulled after yours. >> >> How about I put it in a separate branch so that if you need to pull it >> for dependencies then you can do so without pulling in all the >> gpio/next commits. > > I've pushed it out to the following branch. If everything looks okay > to you, then I'll merge it into gpio/next and push it out. > > The following changes since commit 2c53b436a30867eb6b47dd7bab23ba638d1fb0d2: > > Linux 3.0-rc3 (2011-06-13 15:29:59 -0700) > > are available in the git repository at: > git://git.secretlab.ca/git/linux-2.6 gpio/next-tegra > > Grant Likely (2): > gpio/tegra: Move Tegra gpio driver to drivers/gpio > gpio/tegra: add devicetree support > > .../devicetree/bindings/gpio/gpio_nvidia.txt | 7 +++++++ > arch/arm/mach-tegra/Makefile | 1 - > drivers/gpio/Makefile | 1 + > .../mach-tegra/gpio.c => drivers/gpio/gpio-tegra.c | 10 ++++++++++ > 4 files changed, 18 insertions(+), 1 deletions(-) > create mode 100644 Documentation/devicetree/bindings/gpio/gpio_nvidia.txt > rename arch/arm/mach-tegra/gpio.c => drivers/gpio/gpio-tegra.c (97%) > Thanks, that sounds good.
diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile index 823c703..ed58ef9 100644 --- a/arch/arm/mach-tegra/Makefile +++ b/arch/arm/mach-tegra/Makefile @@ -4,7 +4,6 @@ obj-y += io.o obj-y += irq.o obj-y += clock.o obj-y += timer.o -obj-y += gpio.o obj-y += pinmux.o obj-y += powergate.o obj-y += fuse.o diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile index 68e3bfd..0fbdd75 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -43,6 +43,7 @@ obj-$(CONFIG_GPIO_SCH) += gpio-sch.o obj-$(CONFIG_GPIO_STMPE) += gpio-stmpe.o obj-$(CONFIG_GPIO_SX150X) += gpio-sx150x.o obj-$(CONFIG_GPIO_TC3589X) += gpio-tc3589x.o +obj-$(CONFIG_ARCH_TEGRA) += gpio-tegra.o obj-$(CONFIG_GPIO_TIMBERDALE) += gpio-timberdale.o obj-$(CONFIG_GPIO_TPS65910) += gpio-tps65910.o obj-$(CONFIG_GPIO_TWL4030) += gpio-twl4030.o
As part of the gpio driver consolidation, this patch moves the Tegra driver into drivers/gpio Signed-off-by: Grant Likely <grant.likely@secretlab.ca> --- If there are no objections, I'll merge this via gpio/next g. arch/arm/mach-tegra/Makefile | 1 - drivers/gpio/Makefile | 1 + drivers/gpio/gpio-tegra.c | 0 3 files changed, 1 insertions(+), 1 deletions(-) rename arch/arm/mach-tegra/gpio.c => drivers/gpio/gpio-tegra.c (100%) diff --git a/arch/arm/mach-tegra/gpio.c b/drivers/gpio/gpio-tegra.c similarity index 100% rename from arch/arm/mach-tegra/gpio.c rename to drivers/gpio/gpio-tegra.c