* [GIT PULL] Initial Tegra ARM support
@ 2010-08-05 21:10 Erik Gilling
2010-08-05 21:45 ` Daniel Walker
2010-08-10 21:44 ` Daniel Walker
0 siblings, 2 replies; 8+ messages in thread
From: Erik Gilling @ 2010-08-05 21:10 UTC (permalink / raw)
To: linux-arm-kernel
Hi Linus,
The following changes since commit 9fe6206f400646a2322096b56c59891d530e8d51:
Linus Torvalds (1):
Linux 2.6.35
are available in the git repository at:
git://android.kernel.org/kernel/tegra.git for-linus
This code has received review on linux-arm-kernel and has been in
for-next since June 18th. No subsystems were harmed out side of
mach-tegra.
Colin Cross (4):
[ARM] tegra: Add clock support
[ARM] tegra: SMP support
[ARM] tegra: Add timer support
[ARM] tegra: harmony: Add harmony board file
Erik Gilling (5):
[ARM] tegra: initial tegra support
[ARM] tegra: Add IRQ support
[ARM] tegra: add GPIO support
[ARM] tegra: add pinmux support
[ARM] tegra: add MAINTAINERS entry
MAINTAINERS | 9 +
arch/arm/Kconfig | 25 +-
arch/arm/Makefile | 1 +
arch/arm/mach-tegra/Kconfig | 50 +
arch/arm/mach-tegra/Makefile | 14 +
arch/arm/mach-tegra/Makefile.boot | 3 +
arch/arm/mach-tegra/board-harmony-pinmux.c | 144 +++
arch/arm/mach-tegra/board-harmony.c | 127 +++
arch/arm/mach-tegra/board-harmony.h | 22 +
arch/arm/mach-tegra/board.h | 32 +
arch/arm/mach-tegra/clock.c | 488 +++++++++
arch/arm/mach-tegra/clock.h | 147 +++
arch/arm/mach-tegra/common.c | 61 ++
arch/arm/mach-tegra/gpio-names.h | 247 +++++
arch/arm/mach-tegra/gpio.c | 348 ++++++
arch/arm/mach-tegra/headsmp.S | 61 ++
arch/arm/mach-tegra/hotplug.c | 140 +++
arch/arm/mach-tegra/include/mach/barriers.h | 30 +
arch/arm/mach-tegra/include/mach/clk.h | 26 +
arch/arm/mach-tegra/include/mach/clkdev.h | 32 +
arch/arm/mach-tegra/include/mach/debug-macro.S | 46 +
arch/arm/mach-tegra/include/mach/entry-macro.S | 118 ++
arch/arm/mach-tegra/include/mach/gpio.h | 53 +
arch/arm/mach-tegra/include/mach/hardware.h | 24 +
arch/arm/mach-tegra/include/mach/io.h | 79 ++
arch/arm/mach-tegra/include/mach/iomap.h | 203 ++++
arch/arm/mach-tegra/include/mach/irqs.h | 173 +++
arch/arm/mach-tegra/include/mach/memory.h | 28 +
arch/arm/mach-tegra/include/mach/pinmux.h | 348 ++++++
arch/arm/mach-tegra/include/mach/smp.h | 30 +
arch/arm/mach-tegra/include/mach/system.h | 39 +
arch/arm/mach-tegra/include/mach/timex.h | 26 +
arch/arm/mach-tegra/include/mach/uncompress.h | 78 ++
arch/arm/mach-tegra/include/mach/vmalloc.h | 28 +
arch/arm/mach-tegra/io.c | 78 ++
arch/arm/mach-tegra/irq.c | 34 +
arch/arm/mach-tegra/localtimer.c | 25 +
arch/arm/mach-tegra/pinmux.c | 945 ++++++++++++++++
arch/arm/mach-tegra/platsmp.c | 156 +++
arch/arm/mach-tegra/tegra2_clocks.c | 1359 ++++++++++++++++++++++++
arch/arm/mach-tegra/timer.c | 187 ++++
arch/arm/mm/Kconfig | 3 +-
42 files changed, 6062 insertions(+), 5 deletions(-)
create mode 100644 arch/arm/mach-tegra/Kconfig
create mode 100644 arch/arm/mach-tegra/Makefile
create mode 100644 arch/arm/mach-tegra/Makefile.boot
create mode 100644 arch/arm/mach-tegra/board-harmony-pinmux.c
create mode 100644 arch/arm/mach-tegra/board-harmony.c
create mode 100644 arch/arm/mach-tegra/board-harmony.h
create mode 100644 arch/arm/mach-tegra/board.h
create mode 100644 arch/arm/mach-tegra/clock.c
create mode 100644 arch/arm/mach-tegra/clock.h
create mode 100644 arch/arm/mach-tegra/common.c
create mode 100644 arch/arm/mach-tegra/gpio-names.h
create mode 100644 arch/arm/mach-tegra/gpio.c
create mode 100644 arch/arm/mach-tegra/headsmp.S
create mode 100644 arch/arm/mach-tegra/hotplug.c
create mode 100644 arch/arm/mach-tegra/include/mach/barriers.h
create mode 100644 arch/arm/mach-tegra/include/mach/clk.h
create mode 100644 arch/arm/mach-tegra/include/mach/clkdev.h
create mode 100644 arch/arm/mach-tegra/include/mach/debug-macro.S
create mode 100644 arch/arm/mach-tegra/include/mach/entry-macro.S
create mode 100644 arch/arm/mach-tegra/include/mach/gpio.h
create mode 100644 arch/arm/mach-tegra/include/mach/hardware.h
create mode 100644 arch/arm/mach-tegra/include/mach/io.h
create mode 100644 arch/arm/mach-tegra/include/mach/iomap.h
create mode 100644 arch/arm/mach-tegra/include/mach/irqs.h
create mode 100644 arch/arm/mach-tegra/include/mach/memory.h
create mode 100644 arch/arm/mach-tegra/include/mach/pinmux.h
create mode 100644 arch/arm/mach-tegra/include/mach/smp.h
create mode 100644 arch/arm/mach-tegra/include/mach/system.h
create mode 100644 arch/arm/mach-tegra/include/mach/timex.h
create mode 100644 arch/arm/mach-tegra/include/mach/uncompress.h
create mode 100644 arch/arm/mach-tegra/include/mach/vmalloc.h
create mode 100644 arch/arm/mach-tegra/io.c
create mode 100644 arch/arm/mach-tegra/irq.c
create mode 100644 arch/arm/mach-tegra/localtimer.c
create mode 100644 arch/arm/mach-tegra/pinmux.c
create mode 100644 arch/arm/mach-tegra/platsmp.c
create mode 100644 arch/arm/mach-tegra/tegra2_clocks.c
create mode 100644 arch/arm/mach-tegra/timer.c
^ permalink raw reply [flat|nested] 8+ messages in thread
* [GIT PULL] Initial Tegra ARM support
2010-08-05 21:10 [GIT PULL] Initial Tegra ARM support Erik Gilling
@ 2010-08-05 21:45 ` Daniel Walker
2010-08-05 22:01 ` Erik Gilling
2010-08-10 21:44 ` Daniel Walker
1 sibling, 1 reply; 8+ messages in thread
From: Daniel Walker @ 2010-08-05 21:45 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, 2010-08-05 at 14:10 -0700, Erik Gilling wrote:
> arch/arm/Kconfig | 25 +-
> arch/arm/Makefile | 1 +
In the future could you please send changes to arch/arm/Kconfig and
arch/arm/Makefile to Russell .. That way there's no chance for conflicts
with other -next trees.
Daniel
--
Sent by an consultant of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
^ permalink raw reply [flat|nested] 8+ messages in thread
* [GIT PULL] Initial Tegra ARM support
2010-08-05 21:45 ` Daniel Walker
@ 2010-08-05 22:01 ` Erik Gilling
2010-08-05 22:06 ` Erik Gilling
2010-08-05 22:14 ` Daniel Walker
0 siblings, 2 replies; 8+ messages in thread
From: Erik Gilling @ 2010-08-05 22:01 UTC (permalink / raw)
To: linux-arm-kernel
If these changes went through Russell's tree there would be
dependancies on arch/arm/mach-tegra/(Makefile|Kconfig) in
arch/arm/(Makefile|Kconfig) breaking Russell's tree until it was
merged with the tegra tree. That sounds wrong to me. Additionally
these patches have received review on LAKML including some by Russell
and nothing was mentioned about this being a problem.
There is a conflict on these against linux/master. I'm rebasing now for Linus.
-Erik
On Thu, Aug 5, 2010 at 2:45 PM, Daniel Walker <dwalker@codeaurora.org> wrote:
> On Thu, 2010-08-05 at 14:10 -0700, Erik Gilling wrote:
>> ?arch/arm/Kconfig ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? | ? 25 +-
>> ?arch/arm/Makefile ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?| ? ?1 +
>
> In the future could you please send changes to arch/arm/Kconfig and
> arch/arm/Makefile to Russell .. That way there's no chance for conflicts
> with other -next trees.
>
> Daniel
> --
> Sent by an consultant of the Qualcomm Innovation Center, Inc.
> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
>
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [GIT PULL] Initial Tegra ARM support
2010-08-05 22:01 ` Erik Gilling
@ 2010-08-05 22:06 ` Erik Gilling
2010-08-05 22:14 ` Daniel Walker
1 sibling, 0 replies; 8+ messages in thread
From: Erik Gilling @ 2010-08-05 22:06 UTC (permalink / raw)
To: linux-arm-kernel
Linus,
I rebased my for-linus tree on top of master and resolved the merge
conflict with arch/arm/Kconfig
The following changes since commit cdd854bc42b5e6c79bbbc40c6600d995ffe6e747:
Linus Torvalds (1):
Merge branch 'next' of git://git.kernel.org/.../benh/powerpc
are available in the git repository at:
git://android.kernel.org/kernel/tegra.git for-linus
Cheers,
Erik
Colin Cross (4):
[ARM] tegra: Add clock support
[ARM] tegra: SMP support
[ARM] tegra: Add timer support
[ARM] tegra: harmony: Add harmony board file
Erik Gilling (5):
[ARM] tegra: initial tegra support
[ARM] tegra: Add IRQ support
[ARM] tegra: add GPIO support
[ARM] tegra: add pinmux support
[ARM] tegra: add MAINTAINERS entry
MAINTAINERS | 9 +
arch/arm/Kconfig | 24 +-
arch/arm/Makefile | 1 +
arch/arm/mach-tegra/Kconfig | 50 +
arch/arm/mach-tegra/Makefile | 14 +
arch/arm/mach-tegra/Makefile.boot | 3 +
arch/arm/mach-tegra/board-harmony-pinmux.c | 144 +++
arch/arm/mach-tegra/board-harmony.c | 127 +++
arch/arm/mach-tegra/board-harmony.h | 22 +
arch/arm/mach-tegra/board.h | 32 +
arch/arm/mach-tegra/clock.c | 488 +++++++++
arch/arm/mach-tegra/clock.h | 147 +++
arch/arm/mach-tegra/common.c | 61 ++
arch/arm/mach-tegra/gpio-names.h | 247 +++++
arch/arm/mach-tegra/gpio.c | 348 ++++++
arch/arm/mach-tegra/headsmp.S | 61 ++
arch/arm/mach-tegra/hotplug.c | 140 +++
arch/arm/mach-tegra/include/mach/barriers.h | 30 +
arch/arm/mach-tegra/include/mach/clk.h | 26 +
arch/arm/mach-tegra/include/mach/clkdev.h | 32 +
arch/arm/mach-tegra/include/mach/debug-macro.S | 46 +
arch/arm/mach-tegra/include/mach/entry-macro.S | 118 ++
arch/arm/mach-tegra/include/mach/gpio.h | 53 +
arch/arm/mach-tegra/include/mach/hardware.h | 24 +
arch/arm/mach-tegra/include/mach/io.h | 79 ++
arch/arm/mach-tegra/include/mach/iomap.h | 203 ++++
arch/arm/mach-tegra/include/mach/irqs.h | 173 +++
arch/arm/mach-tegra/include/mach/memory.h | 28 +
arch/arm/mach-tegra/include/mach/pinmux.h | 348 ++++++
arch/arm/mach-tegra/include/mach/smp.h | 30 +
arch/arm/mach-tegra/include/mach/system.h | 39 +
arch/arm/mach-tegra/include/mach/timex.h | 26 +
arch/arm/mach-tegra/include/mach/uncompress.h | 78 ++
arch/arm/mach-tegra/include/mach/vmalloc.h | 28 +
arch/arm/mach-tegra/io.c | 78 ++
arch/arm/mach-tegra/irq.c | 34 +
arch/arm/mach-tegra/localtimer.c | 25 +
arch/arm/mach-tegra/pinmux.c | 945 ++++++++++++++++
arch/arm/mach-tegra/platsmp.c | 156 +++
arch/arm/mach-tegra/tegra2_clocks.c | 1359 ++++++++++++++++++++++++
arch/arm/mach-tegra/timer.c | 187 ++++
arch/arm/mm/Kconfig | 3 +-
42 files changed, 6061 insertions(+), 5 deletions(-)
create mode 100644 arch/arm/mach-tegra/Kconfig
create mode 100644 arch/arm/mach-tegra/Makefile
create mode 100644 arch/arm/mach-tegra/Makefile.boot
create mode 100644 arch/arm/mach-tegra/board-harmony-pinmux.c
create mode 100644 arch/arm/mach-tegra/board-harmony.c
create mode 100644 arch/arm/mach-tegra/board-harmony.h
create mode 100644 arch/arm/mach-tegra/board.h
create mode 100644 arch/arm/mach-tegra/clock.c
create mode 100644 arch/arm/mach-tegra/clock.h
create mode 100644 arch/arm/mach-tegra/common.c
create mode 100644 arch/arm/mach-tegra/gpio-names.h
create mode 100644 arch/arm/mach-tegra/gpio.c
create mode 100644 arch/arm/mach-tegra/headsmp.S
create mode 100644 arch/arm/mach-tegra/hotplug.c
create mode 100644 arch/arm/mach-tegra/include/mach/barriers.h
create mode 100644 arch/arm/mach-tegra/include/mach/clk.h
create mode 100644 arch/arm/mach-tegra/include/mach/clkdev.h
create mode 100644 arch/arm/mach-tegra/include/mach/debug-macro.S
create mode 100644 arch/arm/mach-tegra/include/mach/entry-macro.S
create mode 100644 arch/arm/mach-tegra/include/mach/gpio.h
create mode 100644 arch/arm/mach-tegra/include/mach/hardware.h
create mode 100644 arch/arm/mach-tegra/include/mach/io.h
create mode 100644 arch/arm/mach-tegra/include/mach/iomap.h
create mode 100644 arch/arm/mach-tegra/include/mach/irqs.h
create mode 100644 arch/arm/mach-tegra/include/mach/memory.h
create mode 100644 arch/arm/mach-tegra/include/mach/pinmux.h
create mode 100644 arch/arm/mach-tegra/include/mach/smp.h
create mode 100644 arch/arm/mach-tegra/include/mach/system.h
create mode 100644 arch/arm/mach-tegra/include/mach/timex.h
create mode 100644 arch/arm/mach-tegra/include/mach/uncompress.h
create mode 100644 arch/arm/mach-tegra/include/mach/vmalloc.h
create mode 100644 arch/arm/mach-tegra/io.c
create mode 100644 arch/arm/mach-tegra/irq.c
create mode 100644 arch/arm/mach-tegra/localtimer.c
create mode 100644 arch/arm/mach-tegra/pinmux.c
create mode 100644 arch/arm/mach-tegra/platsmp.c
create mode 100644 arch/arm/mach-tegra/tegra2_clocks.c
create mode 100644 arch/arm/mach-tegra/timer.c
^ permalink raw reply [flat|nested] 8+ messages in thread
* [GIT PULL] Initial Tegra ARM support
2010-08-05 22:01 ` Erik Gilling
2010-08-05 22:06 ` Erik Gilling
@ 2010-08-05 22:14 ` Daniel Walker
1 sibling, 0 replies; 8+ messages in thread
From: Daniel Walker @ 2010-08-05 22:14 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, 2010-08-05 at 15:01 -0700, Erik Gilling wrote:
> If these changes went through Russell's tree there would be
> dependancies on arch/arm/mach-tegra/(Makefile|Kconfig) in
> arch/arm/(Makefile|Kconfig) breaking Russell's tree until it was
> merged with the tegra tree. That sounds wrong to me. Additionally
> these patches have received review on LAKML including some by Russell
> and nothing was mentioned about this being a problem.
It's wrong to do it the way your suggesting .. You don't need to create
conflicts when you send stuff to Russell.. It takes some skill to break
things up by maintainer, but you need to learn how to do that in order
to play nice with the other ARM sub-architecture maintainers ..
If you have some questions on how to break stuff up feel free to ask me,
or send questions to the linux-arm-kernel list ..
Daniel
--
Sent by an consultant of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
^ permalink raw reply [flat|nested] 8+ messages in thread
* [GIT PULL] Initial Tegra ARM support
2010-08-05 21:10 [GIT PULL] Initial Tegra ARM support Erik Gilling
2010-08-05 21:45 ` Daniel Walker
@ 2010-08-10 21:44 ` Daniel Walker
2010-08-10 22:06 ` Russell King - ARM Linux
1 sibling, 1 reply; 8+ messages in thread
From: Daniel Walker @ 2010-08-10 21:44 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, 2010-08-05 at 14:10 -0700, Erik Gilling wrote:
> Hi Linus,
>
> The following changes since commit 9fe6206f400646a2322096b56c59891d530e8d51:
> Linus Torvalds (1):
> Linux 2.6.35
>
> are available in the git repository at:
>
> git://android.kernel.org/kernel/tegra.git for-linus
>
> This code has received review on linux-arm-kernel and has been in
> for-next since June 18th. No subsystems were harmed out side of
> mach-tegra.
>
> Colin Cross (4):
> [ARM] tegra: Add clock support
> [ARM] tegra: SMP support
This fixes some typos in the Tegra tree which caused build failures in
all ARM compiles.
Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
---
arch/arm/Kconfig | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 0ca4a94..a5d4dae 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1188,8 +1188,8 @@ config LOCAL_TIMERS
REALVIEW_EB_A9MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \
ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_TEGRA)
default y
- select HAVE_ARM_TWD if (ARCH_REALVIEW || ARCH_VEXPRESS || ARCH_OMAP4 || \\
- ARCH_U8500 || ARCH_TEGRA
+ select HAVE_ARM_TWD if (ARCH_REALVIEW || ARCH_VEXPRESS || ARCH_OMAP4 || \
+ ARCH_U8500 || ARCH_TEGRA)
help
Enable support for local timers on SMP platforms, rather then the
legacy IPI broadcast method. Local timers allows the system
--
1.7.0.4
--
Sent by an consultant of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [GIT PULL] Initial Tegra ARM support
2010-08-10 21:44 ` Daniel Walker
@ 2010-08-10 22:06 ` Russell King - ARM Linux
2010-08-10 22:10 ` Daniel Walker
0 siblings, 1 reply; 8+ messages in thread
From: Russell King - ARM Linux @ 2010-08-10 22:06 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Aug 10, 2010 at 02:44:24PM -0700, Daniel Walker wrote:
> On Thu, 2010-08-05 at 14:10 -0700, Erik Gilling wrote:
> > Hi Linus,
> >
> > The following changes since commit 9fe6206f400646a2322096b56c59891d530e8d51:
> > Linus Torvalds (1):
> > Linux 2.6.35
> >
> > are available in the git repository at:
> >
> > git://android.kernel.org/kernel/tegra.git for-linus
> >
> > This code has received review on linux-arm-kernel and has been in
> > for-next since June 18th. No subsystems were harmed out side of
> > mach-tegra.
> >
> > Colin Cross (4):
> > [ARM] tegra: Add clock support
> > [ARM] tegra: SMP support
>
>
> This fixes some typos in the Tegra tree which caused build failures in
> all ARM compiles.
Argh, no, not another patch doing this the wrong way. I've fixed this
already, just preparing the pull request for this evening.
^ permalink raw reply [flat|nested] 8+ messages in thread
* [GIT PULL] Initial Tegra ARM support
2010-08-10 22:06 ` Russell King - ARM Linux
@ 2010-08-10 22:10 ` Daniel Walker
0 siblings, 0 replies; 8+ messages in thread
From: Daniel Walker @ 2010-08-10 22:10 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, 2010-08-10 at 23:06 +0100, Russell King - ARM Linux wrote:
> On Tue, Aug 10, 2010 at 02:44:24PM -0700, Daniel Walker wrote:
> > On Thu, 2010-08-05 at 14:10 -0700, Erik Gilling wrote:
> > > Hi Linus,
> > >
> > > The following changes since commit 9fe6206f400646a2322096b56c59891d530e8d51:
> > > Linus Torvalds (1):
> > > Linux 2.6.35
> > >
> > > are available in the git repository at:
> > >
> > > git://android.kernel.org/kernel/tegra.git for-linus
> > >
> > > This code has received review on linux-arm-kernel and has been in
> > > for-next since June 18th. No subsystems were harmed out side of
> > > mach-tegra.
> > >
> > > Colin Cross (4):
> > > [ARM] tegra: Add clock support
> > > [ARM] tegra: SMP support
> >
> >
> > This fixes some typos in the Tegra tree which caused build failures in
> > all ARM compiles.
>
> Argh, no, not another patch doing this the wrong way. I've fixed this
> already, just preparing the pull request for this evening.
Ok with me, just ask long as it gets fixed soon..
Daniel
--
Sent by an consultant of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2010-08-10 22:10 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-05 21:10 [GIT PULL] Initial Tegra ARM support Erik Gilling
2010-08-05 21:45 ` Daniel Walker
2010-08-05 22:01 ` Erik Gilling
2010-08-05 22:06 ` Erik Gilling
2010-08-05 22:14 ` Daniel Walker
2010-08-10 21:44 ` Daniel Walker
2010-08-10 22:06 ` Russell King - ARM Linux
2010-08-10 22:10 ` Daniel Walker
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).