* [GIT PULL 1/6] ARM: tegra: cleanups and fixes
[not found] ` <1330892042-32065-1-git-send-email-olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org>
@ 2012-03-04 20:13 ` Olof Johansson
2012-03-04 20:13 ` [GIT PULL 2/6] ARM: tegra: device tree updates Olof Johansson
` (6 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Olof Johansson @ 2012-03-04 20:13 UTC (permalink / raw)
To: arm-DgEjT+Ai2ygdnm+yROfE0A
Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-tegra-u79uwXL29TY76Z2rM5mHXA,
swarren-DDmLM1+adcrQT0dZR+AlfA, ccross-z5hGa2qSFaRBDgjK7y7TUQ,
Olof Johansson
The following changes since commit a5f17d1f4c2831b9b9bf8b1a537cdbac995d6e13:
Merge tag 'v3.3-rc2' into depends/rmk/for-armsoc (2012-02-07 15:05:20 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra.git tags/tegra-cleanups
for you to fetch changes up to f6a1ba67362fe78a1ec81c355ee638c70689b5d7:
ARM: tegra: Enable CPUIdle on Tegra20 (2012-03-04 11:17:17 -0800)
----------------------------------------------------------------
Minor fixes that weren't urgent enough to go into 3.3. The two paz00
patches are in mainline already but got merged after the branch point
for this branch, so they're duplicated. I also ended up merging in
rmk/for-armsoc into this later on to fix a bug introduced by it, so it's
included but it's not the base of this branch.
----------------------------------------------------------------
Arnd Bergmann (3):
ARM: tegra: select CPU_FREQ_TABLE
ARM: tegra: build localtimer support only when needed
ARM: tegra: export usb phy symbols
Marc Dietrich (2):
ARM: tegra: paz00: fix wrong SD1 power gpio
ARM: tegra: paz00: fix wrong UART port on mini-pcie plug
Olof Johansson (1):
Merge branch 'depends/rmk/for-armsoc' into for-3.4/cleanup-and-fixes
Peter De Schrijver (1):
ARM: tegra: Enable CPUIdle on Tegra20
Stephen Warren (1):
ARM: tegra: select required CPU and L2 errata options
arch/arm/boot/dts/tegra-paz00.dts | 6 +++---
arch/arm/mach-tegra/Kconfig | 14 ++++++++++++++
arch/arm/mach-tegra/Makefile | 3 ++-
arch/arm/mach-tegra/board-paz00.c | 8 ++++----
arch/arm/mach-tegra/board-paz00.h | 2 +-
arch/arm/mach-tegra/common.c | 2 --
arch/arm/mach-tegra/usb_phy.c | 11 +++++++++++
7 files changed, 35 insertions(+), 11 deletions(-)
^ permalink raw reply [flat|nested] 10+ messages in thread* [GIT PULL 2/6] ARM: tegra: device tree updates
[not found] ` <1330892042-32065-1-git-send-email-olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org>
2012-03-04 20:13 ` [GIT PULL 1/6] ARM: tegra: cleanups and fixes Olof Johansson
@ 2012-03-04 20:13 ` Olof Johansson
2012-03-04 20:13 ` [GIT PULL 3/6] ARM: tegra: SoC updates Olof Johansson
` (5 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Olof Johansson @ 2012-03-04 20:13 UTC (permalink / raw)
To: arm-DgEjT+Ai2ygdnm+yROfE0A
Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-tegra-u79uwXL29TY76Z2rM5mHXA,
swarren-DDmLM1+adcrQT0dZR+AlfA, ccross-z5hGa2qSFaRBDgjK7y7TUQ,
Olof Johansson
The following changes since commit 62aa2b537c6f5957afd98e29f96897419ed5ebab:
Linux 3.3-rc2 (2012-01-31 13:31:54 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra.git tags/tegra-dt
for you to fetch changes up to 96d6714ca27acab087dcc8d75a7ec815abe3dde7:
ASoC: DT: Add digital microphone binding to PAZ00 board. (2012-03-04 10:42:16 -0800)
----------------------------------------------------------------
Device tree updates for tegra. Various development, including a handful of
additions to the tegra30 device trees.
----------------------------------------------------------------
Leon Romanovsky (3):
ARM: dt: tegra: Enable device tree audio codec on PAZ00 board.
ARM: dt: tegra: Enable headset autodetection on PAZ00 board.
ASoC: DT: Add digital microphone binding to PAZ00 board.
Olof Johansson (2):
ARM: tegra: emc: device tree bindings
ARM: tegra: seaboard: add EMC table to device tree
Stephen Warren (10):
dt: tegra gpio: Flesh out binding documentation
ARM: dt: tegra30.dtsi: Reformat gpio's interrupts property
ARM: dt: tegra30.dtsi: Add extra GPIO interrupt
ARM: dt: tegra: Add Tegra APB DMA device tree binding
ARM: dt: tegra: Modify I2S nodes to match binding
ARM: dt: tegra: Add labels for I2S controllers
ARM: dt: tegra: Enable audio on WM8903 boards, disable others
ARM: dt: Add binding for Tegra PMC
ARM: dt: Add SD controller configuration to Tegra Cardhu
ARM: dt: Add ARM PMU to tegra*.dtsi
.../devicetree/bindings/arm/tegra/emc.txt | 100 ++++++++++++++++++++
.../bindings/arm/tegra/nvidia,tegra20-pmc.txt | 19 ++++
.../devicetree/bindings/dma/tegra20-apbdma.txt | 30 ++++++
.../devicetree/bindings/gpio/gpio_nvidia.txt | 18 ++++
arch/arm/boot/dts/tegra-cardhu.dts | 18 ++++
arch/arm/boot/dts/tegra-harmony.dts | 45 +++++++--
arch/arm/boot/dts/tegra-paz00.dts | 31 ++++++
arch/arm/boot/dts/tegra-seaboard.dts | 78 +++++++++++++++
arch/arm/boot/dts/tegra-trimslice.dts | 12 +++
arch/arm/boot/dts/tegra-ventana.dts | 42 ++++++++
arch/arm/boot/dts/tegra20.dtsi | 47 +++++++++-
arch/arm/boot/dts/tegra30.dtsi | 59 +++++++++++-
12 files changed, 484 insertions(+), 15 deletions(-)
create mode 100644 Documentation/devicetree/bindings/arm/tegra/emc.txt
create mode 100644 Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-pmc.txt
create mode 100644 Documentation/devicetree/bindings/dma/tegra20-apbdma.txt
^ permalink raw reply [flat|nested] 10+ messages in thread* [GIT PULL 3/6] ARM: tegra: SoC updates
[not found] ` <1330892042-32065-1-git-send-email-olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org>
2012-03-04 20:13 ` [GIT PULL 1/6] ARM: tegra: cleanups and fixes Olof Johansson
2012-03-04 20:13 ` [GIT PULL 2/6] ARM: tegra: device tree updates Olof Johansson
@ 2012-03-04 20:13 ` Olof Johansson
2012-03-04 20:14 ` [GIT PULL 4/6] ARM: tegra: SoC driver updates Olof Johansson
` (4 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Olof Johansson @ 2012-03-04 20:13 UTC (permalink / raw)
To: arm-DgEjT+Ai2ygdnm+yROfE0A
Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-tegra-u79uwXL29TY76Z2rM5mHXA,
swarren-DDmLM1+adcrQT0dZR+AlfA, ccross-z5hGa2qSFaRBDgjK7y7TUQ,
Olof Johansson
The following changes since commit 62aa2b537c6f5957afd98e29f96897419ed5ebab:
Linux 3.3-rc2 (2012-01-31 13:31:54 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra.git tags/tegra-soc
for you to fetch changes up to e186ad74c0941f5caeda28bde76dab903b342c1c:
ARM: tegra: Demote EMC clock inconsistency BUG to WARN (2012-02-26 14:16:28 -0800)
----------------------------------------------------------------
SoC new development for tegra SoCs, mostly tegra30 core support.
It also includes one stray bugfix that was misapplied (should have been
in soc-drivers), but it went out to the stable branches before I noticed
so I've left it in.
----------------------------------------------------------------
Peter De Schrijver (9):
ARM: tegra: add support for tegra30 interrupts
ARM: tegra: add support for new clock framework features
ARM: tegra: implement basic tegra30 clock framework
ARM: tegra: enable tegra30 clock framework
ARM: tegra: initialize basic system clocks
ARM: tegra: definitions for flow controller
ARM: tegra: assembler code for LP3
ARM: tegra: cpuidle driver for tegra
ARM: tegra: Avoid compiling cpuidle code when not configured
Stephen Warren (1):
ARM: tegra: Demote EMC clock inconsistency BUG to WARN
arch/arm/mach-tegra/Makefile | 3 +
arch/arm/mach-tegra/board-dt-tegra30.c | 24 +-
arch/arm/mach-tegra/clock.c | 22 +
arch/arm/mach-tegra/clock.h | 15 +
arch/arm/mach-tegra/common.c | 1 +
arch/arm/mach-tegra/cpuidle.c | 107 +
arch/arm/mach-tegra/flowctrl.h | 37 +
arch/arm/mach-tegra/include/mach/clk.h | 10 +
arch/arm/mach-tegra/include/mach/iomap.h | 3 +
arch/arm/mach-tegra/include/mach/irqs.h | 7 +-
arch/arm/mach-tegra/irq.c | 20 +-
arch/arm/mach-tegra/sleep.S | 91 +
arch/arm/mach-tegra/tegra2_clocks.c | 30 +-
arch/arm/mach-tegra/tegra30_clocks.c | 3099 ++++++++++++++++++++++++++++++
14 files changed, 3456 insertions(+), 13 deletions(-)
create mode 100644 arch/arm/mach-tegra/cpuidle.c
create mode 100644 arch/arm/mach-tegra/flowctrl.h
create mode 100644 arch/arm/mach-tegra/sleep.S
create mode 100644 arch/arm/mach-tegra/tegra30_clocks.c
^ permalink raw reply [flat|nested] 10+ messages in thread* [GIT PULL 4/6] ARM: tegra: SoC driver updates
[not found] ` <1330892042-32065-1-git-send-email-olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org>
` (2 preceding siblings ...)
2012-03-04 20:13 ` [GIT PULL 3/6] ARM: tegra: SoC updates Olof Johansson
@ 2012-03-04 20:14 ` Olof Johansson
2012-03-04 20:14 ` [GIT PULL 5/6] ARM: tegra: Tegra 30 SMP support Olof Johansson
` (3 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Olof Johansson @ 2012-03-04 20:14 UTC (permalink / raw)
To: arm-DgEjT+Ai2ygdnm+yROfE0A
Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-tegra-u79uwXL29TY76Z2rM5mHXA,
swarren-DDmLM1+adcrQT0dZR+AlfA, ccross-z5hGa2qSFaRBDgjK7y7TUQ,
Olof Johansson
The following changes since commit 62aa2b537c6f5957afd98e29f96897419ed5ebab:
Linux 3.3-rc2 (2012-01-31 13:31:54 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra.git tags/tegra-soc-drivers
for you to fetch changes up to e77a6b313fdfe4faa8f9a8edf919c7eb8d095fb5:
ARM: tegra: uncompress.h: Don't depend on kernel headers (2012-02-27 13:45:54 -0800)
----------------------------------------------------------------
Tegra SoC driver support.
Some device tree conversions, some new drivers. and a fix for an issue
introduced in Grant Likely's irq_domain conversion in his tree. Because
of that, this branch depends on his branch to build (but not to merge):
git://git.secretlab.ca/git/linux-2.6.git irqdomain/next
----------------------------------------------------------------
Doug Anderson (2):
ARM: tegra: Introduce define DEBUG_UART_SHIFT
ARM: tegra: uncompress.h: Store UART address in a variable
Laxman Dewangan (2):
ARM: tegra: Pause DMA when reading transfer count
ARM: tegra: dma: not required to move requestor when stopping.
Leon Romanovsky (2):
ARM: dt: tegra: Enable device tree audio codec on PAZ00 board.
ARM: dt: tegra: Enable headset autodetection on PAZ00 board.
Olof Johansson (9):
ARM: tegra: emc: device tree bindings
ARM: tegra: seaboard: add EMC table to device tree
ARM: tegra: Don't WARN_ON() for too early dma channel allocations
ARM: tegra: use APB DMA for accessing APB devices
ARM: tegra: fuse: use apbio dma for register access
ARM: tegra: fuse: add functions to access chip revision
ARM: tegra: fuse: add bct strapping reading
ARM: tegra: emc: convert tegra2_emc to a platform driver
ARM: tegra: emc: device tree support
Stephen Warren (19):
dt: tegra gpio: Flesh out binding documentation
ARM: dt: tegra30.dtsi: Reformat gpio's interrupts property
ARM: dt: tegra30.dtsi: Add extra GPIO interrupt
ARM: dt: tegra: Add Tegra APB DMA device tree binding
ARM: dt: tegra: Modify I2S nodes to match binding
ARM: dt: tegra: Add labels for I2S controllers
ARM: dt: tegra: Enable audio on WM8903 boards, disable others
ARM: dt: Add binding for Tegra PMC
ARM: tegra: Support Tegra30 in decompressor UART setup
ARM: tegra: uncompress.h: Choose a UART at runtime
ARM: tegra: Pass uncompress.h UART selection to DEBUG_LL
ARM: tegra: Remove use of TEGRA_GPIO_TO_IRQ
gpio: tegra: Dynamically allocate IRQ base, and support DT
gpio: tegra: Parameterize the number of banks
ARM: tegra: Fix EMC pdata initialization from registers
ARM: tegra: Add a simple PMC driver
ARM: tegra: Remove duplicate PMU interrupt inversion code
gpio: tegra: Fix build issue due to irq_domain rework.
ARM: tegra: uncompress.h: Don't depend on kernel headers
.../devicetree/bindings/arm/tegra/emc.txt | 100 +++++++++
.../bindings/arm/tegra/nvidia,tegra20-pmc.txt | 19 ++
.../devicetree/bindings/dma/tegra20-apbdma.txt | 30 +++
.../devicetree/bindings/gpio/gpio_nvidia.txt | 36 +++-
arch/arm/boot/dts/tegra-harmony.dts | 45 +++-
arch/arm/boot/dts/tegra-paz00.dts | 30 +++
arch/arm/boot/dts/tegra-seaboard.dts | 78 +++++++
arch/arm/boot/dts/tegra-trimslice.dts | 12 +
arch/arm/boot/dts/tegra-ventana.dts | 42 ++++
arch/arm/boot/dts/tegra20.dtsi | 43 ++++-
arch/arm/boot/dts/tegra30.dtsi | 53 +++++-
arch/arm/mach-tegra/Makefile | 3 +-
arch/arm/mach-tegra/apbio.c | 145 +++++++++++++
arch/arm/mach-tegra/apbio.h | 39 ++++
arch/arm/mach-tegra/board-harmony-power.c | 15 --
arch/arm/mach-tegra/board-harmony.c | 2 +-
arch/arm/mach-tegra/board-seaboard.c | 5 +-
arch/arm/mach-tegra/common.c | 20 ++
arch/arm/mach-tegra/dma.c | 128 +++++++-----
arch/arm/mach-tegra/fuse.c | 107 +++++++---
arch/arm/mach-tegra/fuse.h | 34 +++-
arch/arm/mach-tegra/include/mach/debug-macro.S | 88 +++++++-
arch/arm/mach-tegra/include/mach/gpio-tegra.h | 2 -
arch/arm/mach-tegra/include/mach/irammap.h | 35 +++
arch/arm/mach-tegra/include/mach/uncompress.h | 120 ++++++++++-
arch/arm/mach-tegra/pmc.c | 76 +++++++
arch/arm/mach-tegra/pmc.h | 23 ++
arch/arm/mach-tegra/tegra2_clocks.c | 2 +-
arch/arm/mach-tegra/tegra2_emc.c | 224 ++++++++++++++++++--
arch/arm/mach-tegra/tegra2_emc.h | 11 +-
drivers/gpio/gpio-tegra.c | 59 ++++--
include/linux/platform_data/tegra_emc.h | 34 +++
32 files changed, 1467 insertions(+), 193 deletions(-)
create mode 100644 Documentation/devicetree/bindings/arm/tegra/emc.txt
create mode 100644 Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-pmc.txt
create mode 100644 Documentation/devicetree/bindings/dma/tegra20-apbdma.txt
create mode 100644 arch/arm/mach-tegra/apbio.c
create mode 100644 arch/arm/mach-tegra/apbio.h
create mode 100644 arch/arm/mach-tegra/include/mach/irammap.h
create mode 100644 arch/arm/mach-tegra/pmc.c
create mode 100644 arch/arm/mach-tegra/pmc.h
create mode 100644 include/linux/platform_data/tegra_emc.h
^ permalink raw reply [flat|nested] 10+ messages in thread* [GIT PULL 5/6] ARM: tegra: Tegra 30 SMP support
[not found] ` <1330892042-32065-1-git-send-email-olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org>
` (3 preceding siblings ...)
2012-03-04 20:14 ` [GIT PULL 4/6] ARM: tegra: SoC driver updates Olof Johansson
@ 2012-03-04 20:14 ` Olof Johansson
2012-03-04 20:14 ` [GIT PULL 6/6] ARM: tegra: board updates Olof Johansson
` (2 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Olof Johansson @ 2012-03-04 20:14 UTC (permalink / raw)
To: arm-DgEjT+Ai2ygdnm+yROfE0A
Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-tegra-u79uwXL29TY76Z2rM5mHXA,
swarren-DDmLM1+adcrQT0dZR+AlfA, ccross-z5hGa2qSFaRBDgjK7y7TUQ,
Olof Johansson
The following changes since commit 0f830e5c902106e7fe51460fd1e3263bea72bf41:
Merge branch 'for-3.4/soc-drivers' into for-3.4/t30-smp (2012-02-26 14:43:43 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra.git tags/tegra-soc2
for you to fetch changes up to 8c690fdf465be9d97229f6bb0e6346624d6753a9:
ARM: dt: Explicitly configure all serial ports on Tegra Cardhu (2012-03-04 10:47:30 -0800)
----------------------------------------------------------------
Tegra 30 SMP support
I did this as a separate topic branch because it depends on both the
soc and the soc-drivers branch, so it brings both of those in as a base.
This branch contains work to enable SMP support on Tegra30 and reworks
some of the SMP bringup for T20 as well.
It also contains a device tree patch that builds on top of the SMP/clock
changes in the rest of the branch, so it made more sense to apply it
here than deal with the merge conflicts back and forth.
----------------------------------------------------------------
Peter De Schrijver (10):
ARM: tegra: cleanup use of chipid register
ARM: tegra: export Tegra chipid
ARM: tegra: initialize Tegra chipid early
ARM: tegra: functions to access the flowcontroller
ARM: tegra: rework Tegra secondary CPU core bringup
ARM: tegra: prepare powergate.c for multiple variants
ARM: tegra: export tegra_powergate_is_powered()
ARM: tegra: add support for Tegra30 powerdomains
ARM: tegra: support for Tegra30 CPU powerdomains
ARM: tegra: support for secondary cores on Tegra30
Stephen Warren (1):
ARM: dt: Explicitly configure all serial ports on Tegra Cardhu
arch/arm/boot/dts/tegra-cardhu.dts | 16 +++
arch/arm/mach-tegra/Makefile | 2 +
arch/arm/mach-tegra/board-dt-tegra30.c | 2 +-
arch/arm/mach-tegra/common.c | 4 +
arch/arm/mach-tegra/flowctrl.c | 62 ++++++++++
arch/arm/mach-tegra/flowctrl.h | 5 +
arch/arm/mach-tegra/fuse.c | 18 ++-
arch/arm/mach-tegra/fuse.h | 4 +
arch/arm/mach-tegra/headsmp.S | 167 ++++++++++++++++++++++++--
arch/arm/mach-tegra/include/mach/iomap.h | 3 +
arch/arm/mach-tegra/include/mach/powergate.h | 15 ++-
arch/arm/mach-tegra/platsmp.c | 137 +++++++++++++++-------
arch/arm/mach-tegra/powergate.c | 53 +++++++-
arch/arm/mach-tegra/reset.c | 84 +++++++++++++
arch/arm/mach-tegra/reset.h | 50 ++++++++
15 files changed, 558 insertions(+), 64 deletions(-)
create mode 100644 arch/arm/mach-tegra/flowctrl.c
create mode 100644 arch/arm/mach-tegra/reset.c
create mode 100644 arch/arm/mach-tegra/reset.h
^ permalink raw reply [flat|nested] 10+ messages in thread* [GIT PULL 6/6] ARM: tegra: board updates
[not found] ` <1330892042-32065-1-git-send-email-olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org>
` (4 preceding siblings ...)
2012-03-04 20:14 ` [GIT PULL 5/6] ARM: tegra: Tegra 30 SMP support Olof Johansson
@ 2012-03-04 20:14 ` Olof Johansson
2012-03-04 20:41 ` [GIT PULL 0/6] Tegra branches for 3.4 Olof Johansson
2012-03-04 21:27 ` Arnd Bergmann
7 siblings, 0 replies; 10+ messages in thread
From: Olof Johansson @ 2012-03-04 20:14 UTC (permalink / raw)
To: arm-DgEjT+Ai2ygdnm+yROfE0A
Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-tegra-u79uwXL29TY76Z2rM5mHXA,
swarren-DDmLM1+adcrQT0dZR+AlfA, ccross-z5hGa2qSFaRBDgjK7y7TUQ,
Olof Johansson
The following changes since commit 62aa2b537c6f5957afd98e29f96897419ed5ebab:
Linux 3.3-rc2 (2012-01-31 13:31:54 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra.git tags/tegra-boards
for you to fetch changes up to c5444f39620b2b7801eb1997c41befdc8bcf78ea:
ARM: tegra: match SoC name not board name in DT board files (2012-03-04 10:41:19 -0800)
----------------------------------------------------------------
Tegra board updates. Most of the board updates for tegra30 and for some
of the driver device-tree conversions have gone in through the other
branches, so that leaves quite little left here -- mostly a couple
of updates to the not-yet-converted tegra2 boards and a couple of
device-tree updates.
----------------------------------------------------------------
Marc Dietrich (3):
ARM: dt: tegra: add ADT7461 temperature sensor to paz00 device tree
ARM: dt: tegra: add the power gpio key to paz00 device tree
ARM: dt: tegra: add the wifi led to paz00 device tree
Stephen Warren (1):
ARM: tegra: match SoC name not board name in DT board files
Thierry Reding (1):
ARM: tegra: PCIe: Provide 3.3V supply voltage
arch/arm/boot/dts/tegra-paz00.dts | 26 ++++++++++++++++++++++++++
arch/arm/mach-tegra/board-dt-tegra20.c | 6 +-----
arch/arm/mach-tegra/board-dt-tegra30.c | 2 +-
arch/arm/mach-tegra/board-harmony-power.c | 3 ++-
4 files changed, 30 insertions(+), 7 deletions(-)
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [GIT PULL 0/6] Tegra branches for 3.4
[not found] ` <1330892042-32065-1-git-send-email-olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org>
` (5 preceding siblings ...)
2012-03-04 20:14 ` [GIT PULL 6/6] ARM: tegra: board updates Olof Johansson
@ 2012-03-04 20:41 ` Olof Johansson
[not found] ` <CAOesGMgahK_wkM1PGb55D1gEzbYfJVQKO_XSqMPbw5wTP09Fag-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2012-03-04 21:27 ` Arnd Bergmann
7 siblings, 1 reply; 10+ messages in thread
From: Olof Johansson @ 2012-03-04 20:41 UTC (permalink / raw)
To: arm-DgEjT+Ai2ygdnm+yROfE0A
Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-tegra-u79uwXL29TY76Z2rM5mHXA,
swarren-DDmLM1+adcrQT0dZR+AlfA, ccross-z5hGa2qSFaRBDgjK7y7TUQ,
Grant Likely
On Sun, Mar 4, 2012 at 12:13 PM, Olof Johansson <olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org> wrote:
> Hi Arnd,
>
> Below are the 6 pull requests for Tegra platforms for 3.4. This is also
> likely my last merge request for tegra material (besides possibly some
> stray patches between now and the merge window), since I am handing off
> main maintainership to Stephen Warren for the next merge window.
>
> Each branch is documented in the tag (they are all tag pull requests), as
> well as in the emails below. Nothing too controversial.
Oh, I did forget to mention one added dependency: The soc-drivers
branch has a dependency on Grant's irq_domain branch -- not for
merging but for building.
-Olof
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [GIT PULL 0/6] Tegra branches for 3.4
[not found] ` <1330892042-32065-1-git-send-email-olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org>
` (6 preceding siblings ...)
2012-03-04 20:41 ` [GIT PULL 0/6] Tegra branches for 3.4 Olof Johansson
@ 2012-03-04 21:27 ` Arnd Bergmann
7 siblings, 0 replies; 10+ messages in thread
From: Arnd Bergmann @ 2012-03-04 21:27 UTC (permalink / raw)
To: Olof Johansson
Cc: arm-DgEjT+Ai2ygdnm+yROfE0A,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-tegra-u79uwXL29TY76Z2rM5mHXA,
swarren-DDmLM1+adcrQT0dZR+AlfA, ccross-z5hGa2qSFaRBDgjK7y7TUQ
On Sunday 04 March 2012, Olof Johansson wrote:
> Hi Arnd,
>
> Below are the 6 pull requests for Tegra platforms for 3.4. This is also
> likely my last merge request for tegra material (besides possibly some
> stray patches between now and the merge window), since I am handing off
> main maintainership to Stephen Warren for the next merge window.
>
> Each branch is documented in the tag (they are all tag pull requests), as
> well as in the emails below. Nothing too controversial.
>
> There are a handful of trivial merge conflicts between the branches,
> mostly to the Makefile due to context chances. I also had a local
> issue where git auto-resolved the merge of the T30 SMP branch into
> my for-next branch, and did NOT remove the mach/system.h include at
> arch/arm/mach-tegra/common.c. This results in a build break since it
> has been removed in rmk/for-armsoc. So just a heads up in case you see
> the same thing.
Hi Olof,
I've pulled them all into the respective branches. I'll send out a
status of all the stuff (and missing stuff) in arm-soc.git tomorrow
and then hand back over to you for a while until you need to shift
your own focus again.
Arnd
^ permalink raw reply [flat|nested] 10+ messages in thread