[GIT PULL V2 0/7] ARM: tegra: pull requests for 3.6

[GIT PULL V2 0/7] ARM: tegra: pull requests for 3.6

[Stephen Warren]

This is Tegra's pull requests for v3.6.

Changes in V2:
* Split for-3.6/{fixes,soc} to remove their dependency.
* Split for-3.6/{dt,boards} to remove their dependency.
* Added example merge resolution branches for the conflicts when merging
  the above pairs of branches.

[GIT PULL V2 0/7] ARM: tegra: pull requests for 3.6

[Stephen Warren]

This is Tegra's pull requests for v3.6.

Changes in V2:
* Split for-3.6/{fixes,soc} to remove their dependency.
* Split for-3.6/{dt,boards} to remove their dependency.
* Added example merge resolution branches for the conflicts when merging
  the above pairs of branches.

[GIT PULL V2 1/7] ARM: tegra: for-3.6/cleanup branch

[Stephen Warren]

This branch contains various minor cleanups, such as binding and .dts renames,
DT content cleanup, SDHCI support-8bit property usage cleanup, and removal of
some unnecessary sleep code.

This branch depends only on v3.5-rc2.

This branch is included in many later pull requests.

----------------------------------------------------------------

The following changes since commit cfaf025112d3856637ff34a767ef785ef5cf2ca9:

  Linux 3.5-rc2

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git for-3.6/cleanup

for you to fetch changes up to 702b0e4f2f2782962aab7d9a0a40ad68770bb1f6:

  ARM: dt: tegra: rename board files to match SoC

----------------------------------------------------------------

Prashant Gaikwad (1):
      ARM: tegra: Remove flow controller programming

Stephen Warren (5):
      dt: name all Tegra binding docs consistently
      mmc: tegra: use bus-width property instead of support-8bit
      ARM: dt: tegra: remove legacy support-8bit property
      ASoC: tegra: simplify Kconfig dependencies
      ARM: dt: tegra: rename board files to match SoC

hdoyu-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org (5):
      amba: tegra-ahb: Remove empty *_remove()
      ARM: dt: tegra{20,30}.dtsi: Rename "mc" to "memory-controller"
      ARM: tegra{20,30}: Rename "mc" to "memory-controller"
      ARM: dt: tegra20: Rename "emc" to "memory-controller"
      ARM: tegra20: Rename "emc" to "memory-controller"

 .../arm/tegra/{emc.txt => nvidia,tegra20-emc.txt}  |    2 +-
 .../bindings/arm/tegra/nvidia,tegra20-mc.txt       |    2 +-
 .../bindings/arm/tegra/nvidia,tegra30-mc.txt       |    2 +-
 .../{gpio_nvidia.txt => nvidia,tegra20-gpio.txt}   |    0
 .../{tegra-kbc.txt => nvidia,tegra20-kbc.txt}      |    0
 .../{nvidia-sdhci.txt => nvidia,tegra20-sdhci.txt} |    0
 .../nvec/{nvec_nvidia.txt => nvidia,nvec.txt}      |    0
 ...-alc5632.txt => nvidia,tegra-audio-alc5632.txt} |    0
 ...mslice.txt => nvidia,tegra-audio-trimslice.txt} |    0
 ...io-wm8753.txt => nvidia,tegra-audio-wm8753.txt} |    0
 ...io-wm8903.txt => nvidia,tegra-audio-wm8903.txt} |    0
 .../{tegra20-das.txt => nvidia,tegra20-das.txt}    |    0
 .../{tegra20-i2s.txt => nvidia,tegra20-i2s.txt}    |    0
 .../spi/{spi_nvidia.txt => nvidia,tegra20-spi.txt} |    0
 .../usb/{tegra-usb.txt => nvidia,tegra20-ehci.txt} |    0
 .../dts/{tegra-harmony.dts => tegra20-harmony.dts} |    1 -
 .../dts/{tegra-paz00.dts => tegra20-paz00.dts}     |    1 -
 .../{tegra-seaboard.dts => tegra20-seaboard.dts}   |    3 +-
 .../{tegra-trimslice.dts => tegra20-trimslice.dts} |    0
 .../dts/{tegra-ventana.dts => tegra20-ventana.dts} |    1 -
 arch/arm/boot/dts/tegra20.dtsi                     |    4 +-
 .../dts/{tegra-cardhu.dts => tegra30-cardhu.dts}   |    1 -
 arch/arm/boot/dts/tegra30.dtsi                     |    2 +-
 arch/arm/mach-tegra/Kconfig                        |    3 --
 arch/arm/mach-tegra/Makefile.boot                  |   12 +++---
 arch/arm/mach-tegra/cpuidle.c                      |    6 ++--
 arch/arm/mach-tegra/sleep.S                        |   29 ---------------
 drivers/amba/tegra-ahb.c                           |    6 ---
 drivers/mmc/host/sdhci-tegra.c                     |    5 ++-
 sound/soc/tegra/Kconfig                            |   10 +-----
 30 files changed, 21 insertions(+), 69 deletions(-)
 rename Documentation/devicetree/bindings/arm/tegra/{emc.txt => nvidia,tegra20-emc.txt} (99%)
 rename Documentation/devicetree/bindings/gpio/{gpio_nvidia.txt => nvidia,tegra20-gpio.txt} (100%)
 rename Documentation/devicetree/bindings/input/{tegra-kbc.txt => nvidia,tegra20-kbc.txt} (100%)
 rename Documentation/devicetree/bindings/mmc/{nvidia-sdhci.txt => nvidia,tegra20-sdhci.txt} (100%)
 rename Documentation/devicetree/bindings/nvec/{nvec_nvidia.txt => nvidia,nvec.txt} (100%)
 rename Documentation/devicetree/bindings/sound/{tegra-audio-alc5632.txt => nvidia,tegra-audio-alc5632.txt} (100%)
 rename Documentation/devicetree/bindings/sound/{tegra-audio-trimslice.txt => nvidia,tegra-audio-trimslice.txt} (100%)
 rename Documentation/devicetree/bindings/sound/{tegra-audio-wm8753.txt => nvidia,tegra-audio-wm8753.txt} (100%)
 rename Documentation/devicetree/bindings/sound/{tegra-audio-wm8903.txt => nvidia,tegra-audio-wm8903.txt} (100%)
 rename Documentation/devicetree/bindings/sound/{tegra20-das.txt => nvidia,tegra20-das.txt} (100%)
 rename Documentation/devicetree/bindings/sound/{tegra20-i2s.txt => nvidia,tegra20-i2s.txt} (100%)
 rename Documentation/devicetree/bindings/spi/{spi_nvidia.txt => nvidia,tegra20-spi.txt} (100%)
 rename Documentation/devicetree/bindings/usb/{tegra-usb.txt => nvidia,tegra20-ehci.txt} (100%)
 rename arch/arm/boot/dts/{tegra-harmony.dts => tegra20-harmony.dts} (99%)
 rename arch/arm/boot/dts/{tegra-paz00.dts => tegra20-paz00.dts} (99%)
 rename arch/arm/boot/dts/{tegra-seaboard.dts => tegra20-seaboard.dts} (99%)
 rename arch/arm/boot/dts/{tegra-trimslice.dts => tegra20-trimslice.dts} (100%)
 rename arch/arm/boot/dts/{tegra-ventana.dts => tegra20-ventana.dts} (99%)
 rename arch/arm/boot/dts/{tegra-cardhu.dts => tegra30-cardhu.dts} (99%)

[GIT PULL V2 1/7] ARM: tegra: for-3.6/cleanup branch

[Stephen Warren]

This branch contains various minor cleanups, such as binding and .dts renames,
DT content cleanup, SDHCI support-8bit property usage cleanup, and removal of
some unnecessary sleep code.

This branch depends only on v3.5-rc2.

This branch is included in many later pull requests.

----------------------------------------------------------------

The following changes since commit cfaf025112d3856637ff34a767ef785ef5cf2ca9:

  Linux 3.5-rc2

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git for-3.6/cleanup

for you to fetch changes up to 702b0e4f2f2782962aab7d9a0a40ad68770bb1f6:

  ARM: dt: tegra: rename board files to match SoC

----------------------------------------------------------------

Prashant Gaikwad (1):
      ARM: tegra: Remove flow controller programming

Stephen Warren (5):
      dt: name all Tegra binding docs consistently
      mmc: tegra: use bus-width property instead of support-8bit
      ARM: dt: tegra: remove legacy support-8bit property
      ASoC: tegra: simplify Kconfig dependencies
      ARM: dt: tegra: rename board files to match SoC

hdoyu at nvidia.com (5):
      amba: tegra-ahb: Remove empty *_remove()
      ARM: dt: tegra{20,30}.dtsi: Rename "mc" to "memory-controller"
      ARM: tegra{20,30}: Rename "mc" to "memory-controller"
      ARM: dt: tegra20: Rename "emc" to "memory-controller"
      ARM: tegra20: Rename "emc" to "memory-controller"

 .../arm/tegra/{emc.txt => nvidia,tegra20-emc.txt}  |    2 +-
 .../bindings/arm/tegra/nvidia,tegra20-mc.txt       |    2 +-
 .../bindings/arm/tegra/nvidia,tegra30-mc.txt       |    2 +-
 .../{gpio_nvidia.txt => nvidia,tegra20-gpio.txt}   |    0
 .../{tegra-kbc.txt => nvidia,tegra20-kbc.txt}      |    0
 .../{nvidia-sdhci.txt => nvidia,tegra20-sdhci.txt} |    0
 .../nvec/{nvec_nvidia.txt => nvidia,nvec.txt}      |    0
 ...-alc5632.txt => nvidia,tegra-audio-alc5632.txt} |    0
 ...mslice.txt => nvidia,tegra-audio-trimslice.txt} |    0
 ...io-wm8753.txt => nvidia,tegra-audio-wm8753.txt} |    0
 ...io-wm8903.txt => nvidia,tegra-audio-wm8903.txt} |    0
 .../{tegra20-das.txt => nvidia,tegra20-das.txt}    |    0
 .../{tegra20-i2s.txt => nvidia,tegra20-i2s.txt}    |    0
 .../spi/{spi_nvidia.txt => nvidia,tegra20-spi.txt} |    0
 .../usb/{tegra-usb.txt => nvidia,tegra20-ehci.txt} |    0
 .../dts/{tegra-harmony.dts => tegra20-harmony.dts} |    1 -
 .../dts/{tegra-paz00.dts => tegra20-paz00.dts}     |    1 -
 .../{tegra-seaboard.dts => tegra20-seaboard.dts}   |    3 +-
 .../{tegra-trimslice.dts => tegra20-trimslice.dts} |    0
 .../dts/{tegra-ventana.dts => tegra20-ventana.dts} |    1 -
 arch/arm/boot/dts/tegra20.dtsi                     |    4 +-
 .../dts/{tegra-cardhu.dts => tegra30-cardhu.dts}   |    1 -
 arch/arm/boot/dts/tegra30.dtsi                     |    2 +-
 arch/arm/mach-tegra/Kconfig                        |    3 --
 arch/arm/mach-tegra/Makefile.boot                  |   12 +++---
 arch/arm/mach-tegra/cpuidle.c                      |    6 ++--
 arch/arm/mach-tegra/sleep.S                        |   29 ---------------
 drivers/amba/tegra-ahb.c                           |    6 ---
 drivers/mmc/host/sdhci-tegra.c                     |    5 ++-
 sound/soc/tegra/Kconfig                            |   10 +-----
 30 files changed, 21 insertions(+), 69 deletions(-)
 rename Documentation/devicetree/bindings/arm/tegra/{emc.txt => nvidia,tegra20-emc.txt} (99%)
 rename Documentation/devicetree/bindings/gpio/{gpio_nvidia.txt => nvidia,tegra20-gpio.txt} (100%)
 rename Documentation/devicetree/bindings/input/{tegra-kbc.txt => nvidia,tegra20-kbc.txt} (100%)
 rename Documentation/devicetree/bindings/mmc/{nvidia-sdhci.txt => nvidia,tegra20-sdhci.txt} (100%)
 rename Documentation/devicetree/bindings/nvec/{nvec_nvidia.txt => nvidia,nvec.txt} (100%)
 rename Documentation/devicetree/bindings/sound/{tegra-audio-alc5632.txt => nvidia,tegra-audio-alc5632.txt} (100%)
 rename Documentation/devicetree/bindings/sound/{tegra-audio-trimslice.txt => nvidia,tegra-audio-trimslice.txt} (100%)
 rename Documentation/devicetree/bindings/sound/{tegra-audio-wm8753.txt => nvidia,tegra-audio-wm8753.txt} (100%)
 rename Documentation/devicetree/bindings/sound/{tegra-audio-wm8903.txt => nvidia,tegra-audio-wm8903.txt} (100%)
 rename Documentation/devicetree/bindings/sound/{tegra20-das.txt => nvidia,tegra20-das.txt} (100%)
 rename Documentation/devicetree/bindings/sound/{tegra20-i2s.txt => nvidia,tegra20-i2s.txt} (100%)
 rename Documentation/devicetree/bindings/spi/{spi_nvidia.txt => nvidia,tegra20-spi.txt} (100%)
 rename Documentation/devicetree/bindings/usb/{tegra-usb.txt => nvidia,tegra20-ehci.txt} (100%)
 rename arch/arm/boot/dts/{tegra-harmony.dts => tegra20-harmony.dts} (99%)
 rename arch/arm/boot/dts/{tegra-paz00.dts => tegra20-paz00.dts} (99%)
 rename arch/arm/boot/dts/{tegra-seaboard.dts => tegra20-seaboard.dts} (99%)
 rename arch/arm/boot/dts/{tegra-trimslice.dts => tegra20-trimslice.dts} (100%)
 rename arch/arm/boot/dts/{tegra-ventana.dts => tegra20-ventana.dts} (99%)
 rename arch/arm/boot/dts/{tegra-cardhu.dts => tegra30-cardhu.dts} (99%)

[GIT PULL V2 2/7] ARM: tegra: for-3.6/fixes branch

[Stephen Warren]

This branch contains various small bug-fixes to Tegra code.

This branch is based on Tegra's for-3.6/cleanup branch from a previous pull
request.

This branch is not included in a later pull request.

Note that there will be a merge conflict between for-3.6/{fixes,soc}. The
expected resolution may be found in branch for-3.6/merged-fixes-soc.

----------------------------------------------------------------

The following changes since commit 702b0e4f2f2782962aab7d9a0a40ad68770bb1f6:

  ARM: dt: tegra: rename board files to match SoC

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git for-3.6/fixes

for you to fetch changes up to 95ef9958849381931a79ecec53e677e52c406c5a:

  ARM: tegra: build powergate unconditionally

----------------------------------------------------------------

Roland Stigge (1):
      ARM: tegra: Fix dts files w/ status property: "disable" -> "disabled"

Wolfram Sang (1):
      ARM: tegra: build powergate unconditionally

 arch/arm/boot/dts/tegra20.dtsi |   36 ++++++++++++++++----------------
 arch/arm/boot/dts/tegra30.dtsi |   38 +++++++++++++++++-----------------
 arch/arm/mach-tegra/Makefile   |    2 +-
 3 files changed, 38 insertions(+), 38 deletions(-)

[GIT PULL V2 2/7] ARM: tegra: for-3.6/fixes branch

[Stephen Warren]

This branch contains various small bug-fixes to Tegra code.

This branch is based on Tegra's for-3.6/cleanup branch from a previous pull
request.

This branch is not included in a later pull request.

Note that there will be a merge conflict between for-3.6/{fixes,soc}. The
expected resolution may be found in branch for-3.6/merged-fixes-soc.

----------------------------------------------------------------

The following changes since commit 702b0e4f2f2782962aab7d9a0a40ad68770bb1f6:

  ARM: dt: tegra: rename board files to match SoC

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git for-3.6/fixes

for you to fetch changes up to 95ef9958849381931a79ecec53e677e52c406c5a:

  ARM: tegra: build powergate unconditionally

----------------------------------------------------------------

Roland Stigge (1):
      ARM: tegra: Fix dts files w/ status property: "disable" -> "disabled"

Wolfram Sang (1):
      ARM: tegra: build powergate unconditionally

 arch/arm/boot/dts/tegra20.dtsi |   36 ++++++++++++++++----------------
 arch/arm/boot/dts/tegra30.dtsi |   38 +++++++++++++++++-----------------
 arch/arm/mach-tegra/Makefile   |    2 +-
 3 files changed, 38 insertions(+), 38 deletions(-)

[GIT PULL V2 3/7] ARM: tegra: for-3.6/soc branch

[Stephen Warren]

This branch contains changes to Tegra SoC-specific code in the mach-tegra
directory; only APBIO/DMA-related patches this time around.

This branch is based on Tegra's for-3.6/cleanup branch from a previous pull
request.

This branch is not included in any later pull requests.

Note that there will be a merge conflict between for-3.6/{fixes,soc}. The
expected resolution may be found in branch for-3.6/merged-fixes-soc.

----------------------------------------------------------------

The following changes since commit 702b0e4f2f2782962aab7d9a0a40ad68770bb1f6:

  ARM: dt: tegra: rename board files to match SoC

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git for-3.6/soc

for you to fetch changes up to 5b39fc0bf17028a6b18e57d33f0dcf71f28a8223:

  ARM: tegra: apbio: use dmaengine based dma driver

----------------------------------------------------------------

Laxman Dewangan (2):
      ARM: tegra: apbio access using dma for tegra20 only
      ARM: tegra: apbio: use dmaengine based dma driver

 arch/arm/mach-tegra/Makefile |    3 +-
 arch/arm/mach-tegra/apbio.c  |  194 +++++++++++++++++++++++++++++++++++--
 arch/arm/mach-tegra/apbio.h  |   19 +----
 arch/arm/mach-tegra/common.c |    3 +
 4 files changed, 193 insertions(+), 26 deletions(-)

[GIT PULL V2 3/7] ARM: tegra: for-3.6/soc branch

[Stephen Warren]

This branch contains changes to Tegra SoC-specific code in the mach-tegra
directory; only APBIO/DMA-related patches this time around.

This branch is based on Tegra's for-3.6/cleanup branch from a previous pull
request.

This branch is not included in any later pull requests.

Note that there will be a merge conflict between for-3.6/{fixes,soc}. The
expected resolution may be found in branch for-3.6/merged-fixes-soc.

----------------------------------------------------------------

The following changes since commit 702b0e4f2f2782962aab7d9a0a40ad68770bb1f6:

  ARM: dt: tegra: rename board files to match SoC

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git for-3.6/soc

for you to fetch changes up to 5b39fc0bf17028a6b18e57d33f0dcf71f28a8223:

  ARM: tegra: apbio: use dmaengine based dma driver

----------------------------------------------------------------

Laxman Dewangan (2):
      ARM: tegra: apbio access using dma for tegra20 only
      ARM: tegra: apbio: use dmaengine based dma driver

 arch/arm/mach-tegra/Makefile |    3 +-
 arch/arm/mach-tegra/apbio.c  |  194 +++++++++++++++++++++++++++++++++++--
 arch/arm/mach-tegra/apbio.h  |   19 +----
 arch/arm/mach-tegra/common.c |    3 +
 4 files changed, 193 insertions(+), 26 deletions(-)

[GIT PULL V2 4/7] ARM: tegra: for-3.6/dt branch

[Stephen Warren]

This branch contains changes to Tegra device tree files, and related Kconfig
and Makefile changes. Highlights are:

* New support for the Whistler board.
* Use of the I2C pinctrl-based bus mux on Seaboard/Springbank.

This branch is based on Tegra's for-3.6/cleanup branch from a previous pull
request.

This branch is not included in a later pull request.

Note that there will be a merge conflict between for-3.6/{dt,boards}. The
expected resolution may be found in branch for-3.6/merged-dt-boards.

----------------------------------------------------------------

The following changes since commit 702b0e4f2f2782962aab7d9a0a40ad68770bb1f6:

  ARM: dt: tegra: rename board files to match SoC

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git for-3.6/dt

for you to fetch changes up to 0879c5f72f0a3905d08081e8a2c38e69896b0d5e:

  ARM: dt: tegra seaboard: move battery monitor to mux'd I2C bus.

----------------------------------------------------------------

Stephen Warren (3):
      ARM: dt: tegra: add Whistler device tree file
      ARM: dt: tegra: seaboard: instantiate pinctrl-based I2C bus mux
      ARM: dt: tegra seaboard: move battery monitor to mux'd I2C bus.

 arch/arm/boot/dts/tegra20-seaboard.dts |   85 ++++++--
 arch/arm/boot/dts/tegra20-whistler.dts |  301 +++++++++++++++++++++++++++
 arch/arm/mach-tegra/Makefile.boot      |    1 +
 3 files changed, 371 insertions(+), 16 deletions(-)
 create mode 100644 arch/arm/boot/dts/tegra20-whistler.dts

[GIT PULL V2 4/7] ARM: tegra: for-3.6/dt branch

[Stephen Warren]

This branch contains changes to Tegra device tree files, and related Kconfig
and Makefile changes. Highlights are:

* New support for the Whistler board.
* Use of the I2C pinctrl-based bus mux on Seaboard/Springbank.

This branch is based on Tegra's for-3.6/cleanup branch from a previous pull
request.

This branch is not included in a later pull request.

Note that there will be a merge conflict between for-3.6/{dt,boards}. The
expected resolution may be found in branch for-3.6/merged-dt-boards.

----------------------------------------------------------------

The following changes since commit 702b0e4f2f2782962aab7d9a0a40ad68770bb1f6:

  ARM: dt: tegra: rename board files to match SoC

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git for-3.6/dt

for you to fetch changes up to 0879c5f72f0a3905d08081e8a2c38e69896b0d5e:

  ARM: dt: tegra seaboard: move battery monitor to mux'd I2C bus.

----------------------------------------------------------------

Stephen Warren (3):
      ARM: dt: tegra: add Whistler device tree file
      ARM: dt: tegra: seaboard: instantiate pinctrl-based I2C bus mux
      ARM: dt: tegra seaboard: move battery monitor to mux'd I2C bus.

 arch/arm/boot/dts/tegra20-seaboard.dts |   85 ++++++--
 arch/arm/boot/dts/tegra20-whistler.dts |  301 +++++++++++++++++++++++++++
 arch/arm/mach-tegra/Makefile.boot      |    1 +
 3 files changed, 371 insertions(+), 16 deletions(-)
 create mode 100644 arch/arm/boot/dts/tegra20-whistler.dts

[GIT PULL V2 5/7] ARM: tegra: for-3.6/boards branch

[Stephen Warren]

This branch contains changes to Tegra board files, and related Kconfig and
Makefile changes. Highlights include:

* Removal of Seaboard/Springbank board files; these boards can now only be
  used with device tree.

* Use of small parts of some non-DT board files from the DT board files. This
  enables all features that the non-DT board files have, when booting from DT.
  This will allow almost complete removal of all non-DT board files in v3.7.

* Other miscellaneous changes.

This branch is based on Tegra's for-3.6/cleanup branch from a previous pull
request.

This branch is not included in a later pull request.

Note that there will be a merge conflict between for-3.6/{dt,boards}. The
expected resolution may be found in branch for-3.6/merged-dt-boards.

----------------------------------------------------------------

The following changes since commit 702b0e4f2f2782962aab7d9a0a40ad68770bb1f6:

  ARM: dt: tegra: rename board files to match SoC

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git for-3.6/boards

for you to fetch changes up to 2553dcc6e603e3833990bd3a29bee98d1dbdf251:

  ARM: tegra: use of_default_bus_match_table

----------------------------------------------------------------

Laxman Dewangan (1):
      ARM: tegra: add device tree AUXDATA for APBDMA

Stephen Warren (7):
      ARM: tegra: make .dts compilation depend on Tegra2 support
      ARM: tegra: remove CONFIG_MACH_TEGRA_DT
      ARM: tegra: remove Seaboard board files
      ARM: tegra: trimslice: enable PCIe when booting from device tree
      ARM: tegra: harmony: init regulators, PCIe when booting from DT
      ARM: tegra: paz00: enable WiFi rfkill when booting from device tree
      ARM: tegra: use of_default_bus_match_table

 arch/arm/Kconfig                            |    1 +
 arch/arm/mach-tegra/Kconfig                 |   36 ---
 arch/arm/mach-tegra/Makefile                |   13 +-
 arch/arm/mach-tegra/Makefile.boot           |   10 +-
 arch/arm/mach-tegra/board-dt-tegra20.c      |   74 +++++-
 arch/arm/mach-tegra/board-dt-tegra30.c      |    8 +-
 arch/arm/mach-tegra/board-harmony-pcie.c    |   15 +-
 arch/arm/mach-tegra/board-harmony-power.c   |   25 ++-
 arch/arm/mach-tegra/board-paz00.c           |    7 +-
 arch/arm/mach-tegra/board-seaboard-pinmux.c |  197 --------------
 arch/arm/mach-tegra/board-seaboard.c        |  306 ----------------------
 arch/arm/mach-tegra/board-seaboard.h        |   47 ----
 arch/arm/mach-tegra/board.h                 |    9 +
 13 files changed, 127 insertions(+), 621 deletions(-)
 delete mode 100644 arch/arm/mach-tegra/board-seaboard-pinmux.c
 delete mode 100644 arch/arm/mach-tegra/board-seaboard.c
 delete mode 100644 arch/arm/mach-tegra/board-seaboard.h

[GIT PULL V2 5/7] ARM: tegra: for-3.6/boards branch

[Stephen Warren]

This branch contains changes to Tegra board files, and related Kconfig and
Makefile changes. Highlights include:

* Removal of Seaboard/Springbank board files; these boards can now only be
  used with device tree.

* Use of small parts of some non-DT board files from the DT board files. This
  enables all features that the non-DT board files have, when booting from DT.
  This will allow almost complete removal of all non-DT board files in v3.7.

* Other miscellaneous changes.

This branch is based on Tegra's for-3.6/cleanup branch from a previous pull
request.

This branch is not included in a later pull request.

Note that there will be a merge conflict between for-3.6/{dt,boards}. The
expected resolution may be found in branch for-3.6/merged-dt-boards.

----------------------------------------------------------------

The following changes since commit 702b0e4f2f2782962aab7d9a0a40ad68770bb1f6:

  ARM: dt: tegra: rename board files to match SoC

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git for-3.6/boards

for you to fetch changes up to 2553dcc6e603e3833990bd3a29bee98d1dbdf251:

  ARM: tegra: use of_default_bus_match_table

----------------------------------------------------------------

Laxman Dewangan (1):
      ARM: tegra: add device tree AUXDATA for APBDMA

Stephen Warren (7):
      ARM: tegra: make .dts compilation depend on Tegra2 support
      ARM: tegra: remove CONFIG_MACH_TEGRA_DT
      ARM: tegra: remove Seaboard board files
      ARM: tegra: trimslice: enable PCIe when booting from device tree
      ARM: tegra: harmony: init regulators, PCIe when booting from DT
      ARM: tegra: paz00: enable WiFi rfkill when booting from device tree
      ARM: tegra: use of_default_bus_match_table

 arch/arm/Kconfig                            |    1 +
 arch/arm/mach-tegra/Kconfig                 |   36 ---
 arch/arm/mach-tegra/Makefile                |   13 +-
 arch/arm/mach-tegra/Makefile.boot           |   10 +-
 arch/arm/mach-tegra/board-dt-tegra20.c      |   74 +++++-
 arch/arm/mach-tegra/board-dt-tegra30.c      |    8 +-
 arch/arm/mach-tegra/board-harmony-pcie.c    |   15 +-
 arch/arm/mach-tegra/board-harmony-power.c   |   25 ++-
 arch/arm/mach-tegra/board-paz00.c           |    7 +-
 arch/arm/mach-tegra/board-seaboard-pinmux.c |  197 --------------
 arch/arm/mach-tegra/board-seaboard.c        |  306 ----------------------
 arch/arm/mach-tegra/board-seaboard.h        |   47 ----
 arch/arm/mach-tegra/board.h                 |    9 +
 13 files changed, 127 insertions(+), 621 deletions(-)
 delete mode 100644 arch/arm/mach-tegra/board-seaboard-pinmux.c
 delete mode 100644 arch/arm/mach-tegra/board-seaboard.c
 delete mode 100644 arch/arm/mach-tegra/board-seaboard.h

[GIT PULL V2 6/7] ARM: tegra: for-3.6/common-clk branch

[Stephen Warren]

This branch contains numerous changes required as a baseline in order to
convert Tegra to the common clock framework. The intention was to also
include patches to actually convert Tegra to the common clock framework.
However, those patches appeared late in the kernel cycle and currently cause
regressions on some boards, so were dropped for now.

This branch depends only on v3.5-rc2.

This branch is not included in a later pull request.

----------------------------------------------------------------

The following changes since commit cfaf025112d3856637ff34a767ef785ef5cf2ca9:

  Linux 3.5-rc2

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git for-3.6/common-clk

for you to fetch changes up to 094479915618c526a1409dd6704bcb4ff2c5c1c2:

  ARM: tegra: Provide clock for only one PWM controller

----------------------------------------------------------------

Laxman Dewangan (1):
      ARM: tegra: dma: rename driver name for clock to "tegra-apbdma"

Prashant Gaikwad (10):
      ARM: tegra: add clk_prepare/clk_unprepare
      i2c: tegra: Add clk_prepare/clk_unprepare
      mmc: tegra: add clk_prepare/clk_unprepare
      USB: ehci-tegra: add clk_prepare/clk_unprepare
      Input: tegra-kbc - add clk_prepare/clk_unprepare
      spi/tegra: add clk_prepare/clk_unprepare
      staging: nvec: add clk_prepare/clk_unprepare
      ASoC: tegra: add clk_prepare/clk_unprepare
      crypto: add clk_prepare/clk_unprepare
      ARM: tegra: Remove second instance of uart clk

Simon Que (1):
      ARM: tegra: Fix PWM clock programming

Thierry Reding (1):
      ARM: tegra: Provide clock for only one PWM controller

 arch/arm/mach-tegra/cpu-tegra.c      |    6 +-
 arch/arm/mach-tegra/dma.c            |    4 +-
 arch/arm/mach-tegra/pcie.c           |    6 +-
 arch/arm/mach-tegra/powergate.c      |    4 +-
 arch/arm/mach-tegra/tegra2_clocks.c  |   58 +++++++++++++++++++---------
 arch/arm/mach-tegra/tegra30_clocks.c |   28 ++++++--------
 arch/arm/mach-tegra/timer.c          |    4 +-
 arch/arm/mach-tegra/usb_phy.c        |   16 ++++----
 drivers/crypto/tegra-aes.c           |   12 +++---
 drivers/i2c/busses/i2c-tegra.c       |   10 ++--
 drivers/input/keyboard/tegra-kbc.c   |    4 +-
 drivers/mmc/host/sdhci-tegra.c       |    6 +-
 drivers/spi/spi-tegra.c              |    4 +-
 drivers/staging/nvec/nvec.c          |    8 ++--
 drivers/usb/host/ehci-tegra.c        |   20 +++++-----
 sound/soc/tegra/tegra20_i2s.c        |    4 +-
 sound/soc/tegra/tegra20_spdif.c      |    4 +-
 sound/soc/tegra/tegra30_ahub.c       |    8 ++--
 sound/soc/tegra/tegra30_i2s.c        |    4 +-
 sound/soc/tegra/tegra_asoc_utils.c   |   12 +++---
 20 files changed, 119 insertions(+), 103 deletions(-)

[GIT PULL V2 6/7] ARM: tegra: for-3.6/common-clk branch

[Stephen Warren]

This branch contains numerous changes required as a baseline in order to
convert Tegra to the common clock framework. The intention was to also
include patches to actually convert Tegra to the common clock framework.
However, those patches appeared late in the kernel cycle and currently cause
regressions on some boards, so were dropped for now.

This branch depends only on v3.5-rc2.

This branch is not included in a later pull request.

----------------------------------------------------------------

The following changes since commit cfaf025112d3856637ff34a767ef785ef5cf2ca9:

  Linux 3.5-rc2

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git for-3.6/common-clk

for you to fetch changes up to 094479915618c526a1409dd6704bcb4ff2c5c1c2:

  ARM: tegra: Provide clock for only one PWM controller

----------------------------------------------------------------

Laxman Dewangan (1):
      ARM: tegra: dma: rename driver name for clock to "tegra-apbdma"

Prashant Gaikwad (10):
      ARM: tegra: add clk_prepare/clk_unprepare
      i2c: tegra: Add clk_prepare/clk_unprepare
      mmc: tegra: add clk_prepare/clk_unprepare
      USB: ehci-tegra: add clk_prepare/clk_unprepare
      Input: tegra-kbc - add clk_prepare/clk_unprepare
      spi/tegra: add clk_prepare/clk_unprepare
      staging: nvec: add clk_prepare/clk_unprepare
      ASoC: tegra: add clk_prepare/clk_unprepare
      crypto: add clk_prepare/clk_unprepare
      ARM: tegra: Remove second instance of uart clk

Simon Que (1):
      ARM: tegra: Fix PWM clock programming

Thierry Reding (1):
      ARM: tegra: Provide clock for only one PWM controller

 arch/arm/mach-tegra/cpu-tegra.c      |    6 +-
 arch/arm/mach-tegra/dma.c            |    4 +-
 arch/arm/mach-tegra/pcie.c           |    6 +-
 arch/arm/mach-tegra/powergate.c      |    4 +-
 arch/arm/mach-tegra/tegra2_clocks.c  |   58 +++++++++++++++++++---------
 arch/arm/mach-tegra/tegra30_clocks.c |   28 ++++++--------
 arch/arm/mach-tegra/timer.c          |    4 +-
 arch/arm/mach-tegra/usb_phy.c        |   16 ++++----
 drivers/crypto/tegra-aes.c           |   12 +++---
 drivers/i2c/busses/i2c-tegra.c       |   10 ++--
 drivers/input/keyboard/tegra-kbc.c   |    4 +-
 drivers/mmc/host/sdhci-tegra.c       |    6 +-
 drivers/spi/spi-tegra.c              |    4 +-
 drivers/staging/nvec/nvec.c          |    8 ++--
 drivers/usb/host/ehci-tegra.c        |   20 +++++-----
 sound/soc/tegra/tegra20_i2s.c        |    4 +-
 sound/soc/tegra/tegra20_spdif.c      |    4 +-
 sound/soc/tegra/tegra30_ahub.c       |    8 ++--
 sound/soc/tegra/tegra30_i2s.c        |    4 +-
 sound/soc/tegra/tegra_asoc_utils.c   |   12 +++---
 20 files changed, 119 insertions(+), 103 deletions(-)

[GIT PULL V2 7/7] ARM: tegra: for-3.6/defconfig branch

[Stephen Warren]

This branch contains a single commit which adjusts tegra_defconfig to enable
new kernel features, driven by new device tree file content and drivers.

This branch depends only on v3.5-rc2.

This branch is not included in a later pull request.

----------------------------------------------------------------

The following changes since commit cfaf025112d3856637ff34a767ef785ef5cf2ca9:

  Linux 3.5-rc2

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git for-3.6/defconfig

for you to fetch changes up to dbebe1589d3a86658f32e74396611452c5f34481:

  ARM: tegra: defconfig updates

----------------------------------------------------------------

Stephen Warren (1):
      ARM: tegra: defconfig updates

 arch/arm/configs/tegra_defconfig |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

[GIT PULL V2 7/7] ARM: tegra: for-3.6/defconfig branch

[Stephen Warren]

This branch contains a single commit which adjusts tegra_defconfig to enable
new kernel features, driven by new device tree file content and drivers.

This branch depends only on v3.5-rc2.

This branch is not included in a later pull request.

----------------------------------------------------------------

The following changes since commit cfaf025112d3856637ff34a767ef785ef5cf2ca9:

  Linux 3.5-rc2

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git for-3.6/defconfig

for you to fetch changes up to dbebe1589d3a86658f32e74396611452c5f34481:

  ARM: tegra: defconfig updates

----------------------------------------------------------------

Stephen Warren (1):
      ARM: tegra: defconfig updates

 arch/arm/configs/tegra_defconfig |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

Re: [GIT PULL V2 0/7] ARM: tegra: pull requests for 3.6

[Arnd Bergmann]

On Friday 06 July 2012, Stephen Warren wrote:
> This is Tegra's pull requests for v3.6.
> 
> Changes in V2:
> * Split for-3.6/{fixes,soc} to remove their dependency.
> * Split for-3.6/{dt,boards} to remove their dependency.
> * Added example merge resolution branches for the conflicts when merging
>   the above pairs of branches.

Pulled all of those, thanks for redoing the series so quickly!

I pulled both the fixes and the cleanup branch into the arm-soc next/cleanup
one, because I usually like the fixes to come even before the cleanups, but
I think that's fine.

The merge conflicts were really trivial compared to other things I'm used
to, so there is no need to provide an example merge in cases like this,
git mergetool handles those just fine.

I appreciate the comments for each pull request, I copied them into the
merge changeset description where it makes sense. This would be even easier
if you used signed tags because then you can put the text directly into
the tag message and I don't have to copy it.

Good job also on getting to the point where you can easily add support
for a new board using DT.

	Arnd

[GIT PULL V2 0/7] ARM: tegra: pull requests for 3.6

[Arnd Bergmann]

On Friday 06 July 2012, Stephen Warren wrote:
> This is Tegra's pull requests for v3.6.
> 
> Changes in V2:
> * Split for-3.6/{fixes,soc} to remove their dependency.
> * Split for-3.6/{dt,boards} to remove their dependency.
> * Added example merge resolution branches for the conflicts when merging
>   the above pairs of branches.

Pulled all of those, thanks for redoing the series so quickly!

I pulled both the fixes and the cleanup branch into the arm-soc next/cleanup
one, because I usually like the fixes to come even before the cleanups, but
I think that's fine.

The merge conflicts were really trivial compared to other things I'm used
to, so there is no need to provide an example merge in cases like this,
git mergetool handles those just fine.

I appreciate the comments for each pull request, I copied them into the
merge changeset description where it makes sense. This would be even easier
if you used signed tags because then you can put the text directly into
the tag message and I don't have to copy it.

Good job also on getting to the point where you can easily add support
for a new board using DT.

	Arnd