* [GIT PULL] ARM: tegra: for-3.5/ahb branch
@ 2012-05-14 19:46 ` Stephen Warren
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Warren @ 2012-05-14 19:46 UTC (permalink / raw)
To: arm-DgEjT+Ai2ygdnm+yROfE0A
Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-tegra-u79uwXL29TY76Z2rM5mHXA, Stephen Warren
This branch adds the Tegra AHB driver.
I meant to send this with the other two pull requests this morning, but
forgot:-(
This is the last pull request I intend to send for 3.5, except for any
bugs that crop up.
----------------------------------------------------------------
The following changes since commit e816b57a337ea3b755de72bec38c10c864f23015:
Linux 3.4-rc3
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git for-3.5/ahb
for you to fetch changes up to 89c788bab1f0374ae05aef7560066442ceb55384:
ARM: tegra: Add SMMU enabler in AHB
----------------------------------------------------------------
Hiroshi DOYU (2):
ARM: tegra: Add Tegra AHB driver
ARM: tegra: Add SMMU enabler in AHB
.../bindings/arm/tegra/nvidia,tegra20-ahb.txt | 11 +
arch/arm/mach-tegra/Kconfig | 8 +
arch/arm/mach-tegra/include/mach/tegra-ahb.h | 19 +
drivers/Makefile | 2 +-
drivers/amba/Makefile | 4 +-
drivers/amba/tegra-ahb.c | 293 +++++++++++++++
6 files changed, 334 insertions(+), 3 deletions(-)
create mode 100644 Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-ahb.txt
create mode 100644 arch/arm/mach-tegra/include/mach/tegra-ahb.h
create mode 100644 drivers/amba/tegra-ahb.c
^ permalink raw reply [flat|nested] 6+ messages in thread
* [GIT PULL] ARM: tegra: for-3.5/ahb branch
@ 2012-05-14 19:46 ` Stephen Warren
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Warren @ 2012-05-14 19:46 UTC (permalink / raw)
To: linux-arm-kernel
This branch adds the Tegra AHB driver.
I meant to send this with the other two pull requests this morning, but
forgot:-(
This is the last pull request I intend to send for 3.5, except for any
bugs that crop up.
----------------------------------------------------------------
The following changes since commit e816b57a337ea3b755de72bec38c10c864f23015:
Linux 3.4-rc3
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git for-3.5/ahb
for you to fetch changes up to 89c788bab1f0374ae05aef7560066442ceb55384:
ARM: tegra: Add SMMU enabler in AHB
----------------------------------------------------------------
Hiroshi DOYU (2):
ARM: tegra: Add Tegra AHB driver
ARM: tegra: Add SMMU enabler in AHB
.../bindings/arm/tegra/nvidia,tegra20-ahb.txt | 11 +
arch/arm/mach-tegra/Kconfig | 8 +
arch/arm/mach-tegra/include/mach/tegra-ahb.h | 19 +
drivers/Makefile | 2 +-
drivers/amba/Makefile | 4 +-
drivers/amba/tegra-ahb.c | 293 +++++++++++++++
6 files changed, 334 insertions(+), 3 deletions(-)
create mode 100644 Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-ahb.txt
create mode 100644 arch/arm/mach-tegra/include/mach/tegra-ahb.h
create mode 100644 drivers/amba/tegra-ahb.c
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [GIT PULL] ARM: tegra: for-3.5/ahb branch
2012-05-14 19:46 ` Stephen Warren
@ 2012-05-14 20:55 ` Arnd Bergmann
-1 siblings, 0 replies; 6+ messages in thread
From: Arnd Bergmann @ 2012-05-14 20:55 UTC (permalink / raw)
To: Stephen Warren
Cc: arm-DgEjT+Ai2ygdnm+yROfE0A,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-tegra-u79uwXL29TY76Z2rM5mHXA
On Monday 14 May 2012, Stephen Warren wrote:
> I meant to send this with the other two pull requests this morning, but
> forgot:-(
>
> This is the last pull request I intend to send for 3.5, except for any
> bugs that crop up.
>
> ----------------------------------------------------------------
>
> The following changes since commit e816b57a337ea3b755de72bec38c10c864f23015:
>
> Linux 3.4-rc3
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git for-3.5/ahb
>
> for you to fetch changes up to 89c788bab1f0374ae05aef7560066442ceb55384:
>
> ARM: tegra: Add SMMU enabler in AHB
>
When I pull the branch, I get an extraneous commit
"ARM: dt: tegra: Add device tree support for AHB" that adds nodes that are
already there from another branch. I've removed that commit and applied the
rest to next/drivers. Please check what I have now.
Thanks,
Arnd
^ permalink raw reply [flat|nested] 6+ messages in thread
* [GIT PULL] ARM: tegra: for-3.5/ahb branch
@ 2012-05-14 20:55 ` Arnd Bergmann
0 siblings, 0 replies; 6+ messages in thread
From: Arnd Bergmann @ 2012-05-14 20:55 UTC (permalink / raw)
To: linux-arm-kernel
On Monday 14 May 2012, Stephen Warren wrote:
> I meant to send this with the other two pull requests this morning, but
> forgot:-(
>
> This is the last pull request I intend to send for 3.5, except for any
> bugs that crop up.
>
> ----------------------------------------------------------------
>
> The following changes since commit e816b57a337ea3b755de72bec38c10c864f23015:
>
> Linux 3.4-rc3
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git for-3.5/ahb
>
> for you to fetch changes up to 89c788bab1f0374ae05aef7560066442ceb55384:
>
> ARM: tegra: Add SMMU enabler in AHB
>
When I pull the branch, I get an extraneous commit
"ARM: dt: tegra: Add device tree support for AHB" that adds nodes that are
already there from another branch. I've removed that commit and applied the
rest to next/drivers. Please check what I have now.
Thanks,
Arnd
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [GIT PULL] ARM: tegra: for-3.5/ahb branch
2012-05-14 20:55 ` Arnd Bergmann
@ 2012-05-14 21:03 ` Stephen Warren
-1 siblings, 0 replies; 6+ messages in thread
From: Stephen Warren @ 2012-05-14 21:03 UTC (permalink / raw)
To: Arnd Bergmann
Cc: arm-DgEjT+Ai2ygdnm+yROfE0A,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-tegra-u79uwXL29TY76Z2rM5mHXA
On 05/14/2012 02:55 PM, Arnd Bergmann wrote:
> On Monday 14 May 2012, Stephen Warren wrote:
>> I meant to send this with the other two pull requests this morning, but
>> forgot:-(
>>
>> This is the last pull request I intend to send for 3.5, except for any
>> bugs that crop up.
>>
>> ----------------------------------------------------------------
>>
>> The following changes since commit e816b57a337ea3b755de72bec38c10c864f23015:
>>
>> Linux 3.4-rc3
>>
>> are available in the git repository at:
>>
>> git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git for-3.5/ahb
>>
>> for you to fetch changes up to 89c788bab1f0374ae05aef7560066442ceb55384:
>>
>> ARM: tegra: Add SMMU enabler in AHB
>>
>
> When I pull the branch, I get an extraneous commit
> "ARM: dt: tegra: Add device tree support for AHB" that adds nodes that are
> already there from another branch. I've removed that commit and applied the
> rest to next/drivers. Please check what I have now.
Sorry about that.
That the correct "resolution"; I simply forgot to re-push the ahb branch
after I moved that commit into the dt branch.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [GIT PULL] ARM: tegra: for-3.5/ahb branch
@ 2012-05-14 21:03 ` Stephen Warren
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Warren @ 2012-05-14 21:03 UTC (permalink / raw)
To: linux-arm-kernel
On 05/14/2012 02:55 PM, Arnd Bergmann wrote:
> On Monday 14 May 2012, Stephen Warren wrote:
>> I meant to send this with the other two pull requests this morning, but
>> forgot:-(
>>
>> This is the last pull request I intend to send for 3.5, except for any
>> bugs that crop up.
>>
>> ----------------------------------------------------------------
>>
>> The following changes since commit e816b57a337ea3b755de72bec38c10c864f23015:
>>
>> Linux 3.4-rc3
>>
>> are available in the git repository at:
>>
>> git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git for-3.5/ahb
>>
>> for you to fetch changes up to 89c788bab1f0374ae05aef7560066442ceb55384:
>>
>> ARM: tegra: Add SMMU enabler in AHB
>>
>
> When I pull the branch, I get an extraneous commit
> "ARM: dt: tegra: Add device tree support for AHB" that adds nodes that are
> already there from another branch. I've removed that commit and applied the
> rest to next/drivers. Please check what I have now.
Sorry about that.
That the correct "resolution"; I simply forgot to re-push the ahb branch
after I moved that commit into the dt branch.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-05-14 21:03 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-14 19:46 [GIT PULL] ARM: tegra: for-3.5/ahb branch Stephen Warren
2012-05-14 19:46 ` Stephen Warren
[not found] ` <1337024794-25269-1-git-send-email-swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
2012-05-14 20:55 ` Arnd Bergmann
2012-05-14 20:55 ` Arnd Bergmann
[not found] ` <201205142055.12881.arnd-r2nGTMty4D4@public.gmane.org>
2012-05-14 21:03 ` Stephen Warren
2012-05-14 21:03 ` Stephen Warren
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.