[GIT PULL 1/8] ARM: tegra: DT-related fixes needed by the MMC tree

[GIT PULL 1/8] ARM: tegra: DT-related fixes needed by the MMC tree

[Stephen Warren]

In order to convert the Tegra MMC driver to using mmc_of_parse(), some
bugs in the Tegra device-tree content need to be fixed first; it's
currently wrong but unused, and mmc_of_parse() causes that data to be
used for the first time.

(This branch has also been merged into the MMC tree. I'm sending it as a
separate pull request as an FYI, but you can feel free to skip it and just
pull in 2/8 which is the main Tegra fixes branch and includes this)

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

The following changes since commit 6dbe51c251a327e012439c4772097a13df43c5b8:

  Linux 3.9-rc1

are available in the git repository at:

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

for you to fetch changes up to 908ab9368866e6edf0edebdd546adefd5f3128f9:

  ARM: dts: tegra: fix the activate polarity of cd-gpio in mmc host

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

Joseph Lo (1):
      ARM: dts: tegra: fix the activate polarity of cd-gpio in mmc host

 arch/arm/boot/dts/tegra20-colibri-512.dtsi |    2 +-
 arch/arm/boot/dts/tegra20-harmony.dts      |    4 ++--
 arch/arm/boot/dts/tegra20-paz00.dts        |    2 +-
 arch/arm/boot/dts/tegra20-seaboard.dts     |    2 +-
 arch/arm/boot/dts/tegra20-tamonten.dtsi    |    2 +-
 arch/arm/boot/dts/tegra20-trimslice.dts    |    2 +-
 arch/arm/boot/dts/tegra20-ventana.dts      |    2 +-
 arch/arm/boot/dts/tegra20-whistler.dts     |    1 +
 arch/arm/boot/dts/tegra30-beaver.dts       |    2 +-
 arch/arm/boot/dts/tegra30-cardhu.dtsi      |    2 +-
 10 files changed, 11 insertions(+), 10 deletions(-)

[GIT PULL 2/8] ARM: tegra: minor fixes

[Stephen Warren]

This branch contains a variety of small build and run-time fixes that
weren't important enough for 3.9.

* Enable CPU errata WARs in secondary reset handler as a preparation
  for multi-platform support, and a related fix.
* Don't touch DBLGAR in reset/resume handlers, so enable the code to
  run on A15 cores.
* Minor build fixes.
* A fix to the Tegra clock driver.
* Some error-handling fixes.

This branch is based on the previous fixes-for-mmc pull request.

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

The following changes since commit 908ab9368866e6edf0edebdd546adefd5f3128f9:

  ARM: dts: tegra: fix the activate polarity of cd-gpio in mmc host

are available in the git repository at:

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

for you to fetch changes up to eebd1fda2342014a50ed3fd132e5dc6e8b5251e8:

  ARM: tegra: powergate: Don't error out if new state == old state

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

Hiroshi Doyu (2):
      ARM: tegra: Fix unchecked return value
      memory: tegra30: Fix build error w/o PM

Joseph Lo (2):
      ARM: tegra: don't unlock MMIO access to DBGLAR
      ARM: tegra: fix the logical detection of power on sequence of warm boot CPUs

Peter De Schrijver (1):
      clk: tegra: No 7.1 super clk dividers on Tegra20

Stephen Warren (3):
      ARM: tegra: add CPU errata WARs to Tegra reset handler
      ARM: tegra: remove save/restore of CPU diag register
      ARM: tegra: fix ignored return value of regulator_enable

Thierry Reding (2):
      ARM: tegra: Export tegra_powergate_sequence_power_up()
      ARM: tegra: powergate: Don't error out if new state == old state

 arch/arm/mach-tegra/board-harmony-pcie.c |    7 +++-
 arch/arm/mach-tegra/cpuidle-tegra30.c    |    4 ---
 arch/arm/mach-tegra/headsmp.S            |    3 --
 arch/arm/mach-tegra/platsmp.c            |    5 ++-
 arch/arm/mach-tegra/pm.c                 |   19 ----------
 arch/arm/mach-tegra/powergate.c          |    4 ++-
 arch/arm/mach-tegra/reset-handler.S      |   48 ++++++++++++++++++++-----
 drivers/clk/tegra/clk-tegra20.c          |   36 ++-----------------
 drivers/memory/tegra30-mc.c              |    2 ++
 9 files changed, 56 insertions(+), 72 deletions(-)

[GIT PULL 3/8] ARM: tegra: cleanup

[Stephen Warren]

This branch includes various cleanup of the core Tegra support.

* Unification of the separate board-dt-tegra*.c files into a single
  tegra.c, now that everything is DT-driven and basically identical.
* Use of_clk_get() in the Tegra clocksource driver so that clocks are
  described in DT rather than hard-coding clock names.
* Some cleanup of the PMC-related code, with the aim that the PMC
  "driver" contains more of the code that touches PMC registers, rather
  than spreading PMC register accesses through other files.
* Conversion of the "PMC" driver to acquire resources describe in device
  tree rather than hard-coding them.
* Use of common code for the CPU sleep TLB invalidation.

This branch is based on the previous fixes pull request.

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

The following changes since commit 84b808da2dea7020211f1d73d015ff6c3ac207c4:

  ARM: tegra: fix ignored return value of regulator_enable

are available in the git repository at:

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

for you to fetch changes up to 6affb4826405dc1f53bae0e5c302a18f734a44ca:

  ARM: tegra: use setup_mm_for_reboot rather than explicit pgd switch

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

Hiroshi Doyu (4):
      ARM: tegra: Unify tegra{20,30,114}_init_early()
      ARM: tegra: Rename board-dt-tegra20.c to tegra.c
      ARM: tegra: Unify Device tree board files
      ARM: tegra: refactor tegra{20,30}_boot_secondary

Joseph Lo (5):
      ARM: tegra: pmc: add specific compatible DT string for Tegra30 and Tegra114
      ARM: tegra: fix the PMC compatible string in DT
      ARM: tegra: pmc: convert PMC driver to support DT only
      ARM: tegra: pmc: add power on function for secondary CPUs
      ARM: tegra: replace the CPU power on function with PMC call

Peter De Schrijver (1):
      clocksource: tegra: move to of_clk_get

Will Deacon (1):
      ARM: tegra: use setup_mm_for_reboot rather than explicit pgd switch

 arch/arm/boot/dts/tegra114.dtsi                 |    2 +-
 arch/arm/boot/dts/tegra20.dtsi                  |    2 +
 arch/arm/boot/dts/tegra30.dtsi                  |    4 +-
 arch/arm/mach-tegra/Makefile                    |    4 +-
 arch/arm/mach-tegra/board-dt-tegra114.c         |   46 ------
 arch/arm/mach-tegra/board-dt-tegra30.c          |   60 -------
 arch/arm/mach-tegra/board.h                     |    4 +-
 arch/arm/mach-tegra/common.c                    |   26 +--
 arch/arm/mach-tegra/hotplug.c                   |   23 ++-
 arch/arm/mach-tegra/platsmp.c                   |  110 +++++--------
 arch/arm/mach-tegra/pm.c                        |    7 +-
 arch/arm/mach-tegra/pmc.c                       |  152 ++++++++++++++----
 arch/arm/mach-tegra/pmc.h                       |    4 +
 arch/arm/mach-tegra/sleep.h                     |   10 +-
 .../mach-tegra/{board-dt-tegra20.c => tegra.c}  |   16 +-
 drivers/clocksource/tegra20_timer.c             |    4 +-
 16 files changed, 207 insertions(+), 267 deletions(-)
 delete mode 100644 arch/arm/mach-tegra/board-dt-tegra114.c
 delete mode 100644 arch/arm/mach-tegra/board-dt-tegra30.c
 rename arch/arm/mach-tegra/{board-dt-tegra20.c => tegra.c} (89%)

[GIT PULL 4/8] ARM: tegra: core SoC support development

[Stephen Warren]

This branch includes major development on the core Tegra SoC support code
in the mach-tegra directory:

* SMP support for Tegra114.
* Exposes SoC chip ID and revision through standard sysfs files.
* System-level suspend/resume for Tegra20/30. At present, this only
  supports "LP2" mode (CPU power-down), but provides the basis to
  implement "LP0"/"LP1" (various levels of core/chip power-down) in the
  hopefully near future.
* A minor cleanup of a duplicate include, which was introduced in this
  branch.

This branch is based on the previous cleanup pull request.

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

The following changes since commit 7e56474456221541aab7b2fe415ff400d7c9910a:

  ARM: tegra: replace the CPU power on function with PMC call

are available in the git repository at:

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

for you to fetch changes up to 38be85de698ef3f2755ee0eabf520530757860aa:

  ARM: tegra: pm: remove duplicated include from pm.c

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

Danny Huang (2):
      ARM: tegra: expose chip ID and revision
      ARM: tegra: add speedo-based process id for Tegra114

Joseph Lo (8):
      ARM: tegra: bring up secondary CPU for Tegra114
      ARM: tegra: add clock source of PMC to device trees
      ARM: tegra: moving the CPU power timer function to PMC driver
      gpio: tegra: add gpio wakeup source handling
      ARM: tegra: irq: add wake up handling
      ARM: dt: tegra: add bindings of power management configurations for PMC
      ARM: tegra: pm: add platform suspend support
      ARM: tegra: cpuidle: remove redundant parameters for powered-down mode

Wei Yongjun (1):
      ARM: tegra: pm: remove duplicated include from pm.c

 .../bindings/arm/tegra/nvidia,tegra20-pmc.txt   |   67 +++++++-
 arch/arm/Kconfig                                |    1 +
 arch/arm/boot/dts/tegra114-dalmore.dts          |   13 ++
 arch/arm/boot/dts/tegra114-pluto.dts            |   13 ++
 arch/arm/boot/dts/tegra114.dtsi                 |    2 +
 arch/arm/boot/dts/tegra20-colibri-512.dtsi      |   13 ++
 arch/arm/boot/dts/tegra20-harmony.dts           |   13 ++
 arch/arm/boot/dts/tegra20-paz00.dts             |   13 ++
 arch/arm/boot/dts/tegra20-seaboard.dts          |   13 ++
 arch/arm/boot/dts/tegra20-tamonten.dtsi         |   13 ++
 arch/arm/boot/dts/tegra20-trimslice.dts         |   13 ++
 arch/arm/boot/dts/tegra20-ventana.dts           |   13 ++
 arch/arm/boot/dts/tegra20-whistler.dts          |   13 ++
 arch/arm/boot/dts/tegra20.dtsi                  |    2 +
 arch/arm/boot/dts/tegra30-beaver.dts            |   13 ++
 arch/arm/boot/dts/tegra30-cardhu.dtsi           |   13 ++
 arch/arm/boot/dts/tegra30.dtsi                  |    2 +
 arch/arm/mach-tegra/Makefile                    |    1 +
 arch/arm/mach-tegra/common.c                    |    5 +-
 arch/arm/mach-tegra/cpuidle-tegra20.c           |    6 +-
 arch/arm/mach-tegra/cpuidle-tegra30.c           |    6 +-
 arch/arm/mach-tegra/fuse.c                      |    4 +
 arch/arm/mach-tegra/fuse.h                      |    7 +
 arch/arm/mach-tegra/irq.c                       |   96 ++++++++++-
 arch/arm/mach-tegra/irq.h                       |    6 +
 arch/arm/mach-tegra/platsmp.c                   |    8 +
 arch/arm/mach-tegra/pm.c                        |  131 ++++++++------
 arch/arm/mach-tegra/pm.h                        |   17 +-
 arch/arm/mach-tegra/pmc.c                       |  162 ++++++++++++++++++
 arch/arm/mach-tegra/pmc.h                       |   14 ++
 arch/arm/mach-tegra/tegra.c                     |   29 +++-
 arch/arm/mach-tegra/tegra114_speedo.c           |  104 +++++++++++
 drivers/gpio/gpio-tegra.c                       |   21 ++-
 33 files changed, 780 insertions(+), 67 deletions(-)
 create mode 100644 arch/arm/mach-tegra/tegra114_speedo.c

[GIT PULL 5/8] ARM: tegra: clock driver development

[Stephen Warren]

This branch contains most fixes and enhancements to the Tegra common
clock driver. The main new feature is a driver for Tegra114, which
coupled with later device tree changes enables many devices on that
chip, such as MMC, I2C, etc.

This branch depends on a patch in:

git://git.linaro.org/people/mturquette/linux.git clk-for-3.10

Mike has stated that this branch is stable, and is aware of this
dependency and merge.

Mike's branch is based on v3.9-rc3, which includes a USB change which
causes problems on Tegra. That problem was fixed in v3.9-rc4. Hence,
this branch pulls in v3.9-rc4 to ensure bisectability as much as
possible.

This branch is based on v3.9-rc4, followed by a merge of previous Tegra
"soc" pull request, followed by a merge of clk-for-3.10.

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

The following changes since commit 43089433b00a086980fc6e9571535477fb749e84:

  Merge remote-tracking branch 'linaro_mturquette_linux/clk-for-3.10' into for-3.10/clk

are available in the git repository at:

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

for you to fetch changes up to 964ea47572b89589b61b553e44bbe9907d4f12a6:

  clk: tegra: fix enum tegra114_clk to match binding

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

Peter De Schrijver (14):
      clk: tegra: provide dummy cpu car ops
      clk: tegra: Refactor PLL programming code
      clk: tegra: Add TEGRA_PLL_BYPASS flag
      clk: tegra: introduce TEGRA_PLL_HAS_LOCK_ENABLE
      clk: tegra: Add PLL post divider table
      clk: tegra: move from a lock bit idx to a lock mask
      clk: tegra: Add new fields and PLL types for Tegra114
      clk: tegra: Add flags to tegra_clk_periph()
      clk: tegra: Workaround for Tegra114 MSENC problem
      ARM: tegra: Define Tegra114 CAR binding
      clk: tegra: Implement clocks for Tegra114
      clk: tegra: devicetree match for nvidia,tegra114-car
      ARM: dt: Add references to tegra_car clocks
      clk: tegra: Remove forced clk_enable of uartd

Prashant Gaikwad (1):
      clk: tegra: Fix cdev1 and cdev2 IDs

Stephen Warren (2):
      clk: tegra: defer application of init table
      clk: tegra: fix enum tegra114_clk to match binding

Thierry Reding (2):
      clk: tegra: Export peripheral reset functions
      clk: tegra: Make gr2d and gr3d clocks children of pll_c

Yen Lin (1):
      clk: tegra: Fix periph_clk_to_bit macro

 .../bindings/clock/nvidia,tegra114-car.txt      |  303 +++
 .../bindings/clock/nvidia,tegra20-car.txt       |    4 +-
 arch/arm/boot/dts/tegra114-dalmore.dts          |    1 -
 arch/arm/boot/dts/tegra114-pluto.dts            |    1 -
 arch/arm/boot/dts/tegra114.dtsi                 |    8 +-
 arch/arm/mach-tegra/tegra.c                     |    3 +
 drivers/clk/tegra/Makefile                      |    1 +
 drivers/clk/tegra/clk-periph-gate.c             |   11 +-
 drivers/clk/tegra/clk-periph.c                  |   14 +-
 drivers/clk/tegra/clk-pll.c                     | 1194 ++++++++--
 drivers/clk/tegra/clk-tegra114.c                | 2085 ++++++++++++++++++
 drivers/clk/tegra/clk-tegra20.c                 |  184 +-
 drivers/clk/tegra/clk-tegra30.c                 |  276 +--
 drivers/clk/tegra/clk.c                         |   14 +-
 drivers/clk/tegra/clk.h                         |   98 +-
 include/linux/clk/tegra.h                       |    1 +
 16 files changed, 3832 insertions(+), 366 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/clock/nvidia,tegra114-car.txt
 create mode 100644 drivers/clk/tegra/clk-tegra114.c

[GIT PULL 6/8] ARM: tegra: device tree changes

[Stephen Warren]

This branch contains the majority of the device tree changes for Tegra.
Highlights include:

* Many changes for Tegra114, and the Dalmore board, to enable pinctrl,
  SDHCI/MMC, PWM, DMA, I2C, KBC, SPI, battery, regulators.
* Adding or enabling suspend wakeup sources on many boards, and adding
  suspend timing parameters, to support the system suspend patches.
* Adding clocks to the audio-related nodes, so that in 3.11, the audio
  driver can pull these clocks from device tree rather than hard-coding
  clock names.
* Some small DT fixes/cleanup.

This branch is based on the previous clk pull request.

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

The following changes since commit 964ea47572b89589b61b553e44bbe9907d4f12a6:

  clk: tegra: fix enum tegra114_clk to match binding

are available in the git repository at:

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

for you to fetch changes up to 1071b2df22aa45ffeaf34dfccc889d92586ca645:

  clk: tegra: Fix cdev1 and cdev2 IDs

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

Andrew Chew (2):
      ARM: tegra: fix the status of PWM DT nodes
      ARM: tegra: add PWM nodes to Tegra114 DT

Joseph Lo (4):
      ARM: tegra: add power gpio keys to DT
      ARM: tegra: whistler: add wakeup source for KBC
      ARM: tegra: add non-removable and keep-power-in-suspend property for MMC
      ARM: dts: tegra: add the PM configurations of PMC

Laxman Dewangan (9):
      ARM: tegra: add APB DMA nodes to Tegra114 DT
      ARM: tegra: add I2C nodes to Tegra114 DT
      ARM: tegra: add aliases and DMA requestor for serial nodes of Tegra114
      ARM: tegra: add KBC nodes to Tegra114 DT
      ARM: tegra: add SPI nodes to Tegra114 DT
      ARM: tegra: add DT binding for i2c-tegra
      ARM: tegra: dalmore: add cpu regulator node
      ARM: tegra: dalmore: add TPS65090 node
      ARM: tegra: dalmore: add fixed regulator node

Prashant Gaikwad (1):
      clk: tegra: Fix cdev1 and cdev2 IDs

Pritesh Raithatha (2):
      ARM: tegra: add default pinctrl nodes for Dalmore
      ARM: tegra: add SDHCI nodes with common properties

Rhyland Klein (2):
      ARM: tegra: add SDHCI support for Dalmore
      ARM: tegra: Add sbs-battery node to Dalmore

Stephen Warren (5):
      ARM: tegra: device tree whitespace cleanup
      ARM: tegra: fix sort order of USB PHY nodes
      ARM: tegra: add clocks property to sound nodes
      ARM: tegra: add clocks property to AC'97 sound nodes
      ARM: tegra: keep power on to SD slot on Dalmore

 .../bindings/i2c/nvidia,tegra20-i2c.txt         |   60 ++
 .../sound/nvidia,tegra-audio-alc5632.txt        |    8 +
 .../sound/nvidia,tegra-audio-trimslice.txt      |    7 +
 .../sound/nvidia,tegra-audio-wm8753.txt         |    8 +
 .../sound/nvidia,tegra-audio-wm8903.txt         |    8 +
 .../sound/nvidia,tegra-audio-wm9712.txt         |    8 +
 arch/arm/boot/dts/tegra114-dalmore.dts          |  891 ++++++++++++++++++
 arch/arm/boot/dts/tegra114.dtsi                 |  240 ++++-
 arch/arm/boot/dts/tegra20-colibri-512.dtsi      |   12 +
 arch/arm/boot/dts/tegra20-harmony.dts           |   20 +
 arch/arm/boot/dts/tegra20-medcom-wide.dts       |    7 +
 arch/arm/boot/dts/tegra20-paz00.dts             |   10 +
 arch/arm/boot/dts/tegra20-plutux.dts            |    3 +
 arch/arm/boot/dts/tegra20-seaboard.dts          |   11 +
 arch/arm/boot/dts/tegra20-tamonten.dtsi         |    6 +
 arch/arm/boot/dts/tegra20-tec.dts               |    3 +
 arch/arm/boot/dts/tegra20-trimslice.dts         |   23 +
 arch/arm/boot/dts/tegra20-ventana.dts           |   22 +
 arch/arm/boot/dts/tegra20-whistler.dts          |   13 +
 arch/arm/boot/dts/tegra20.dtsi                  |   53 +-
 arch/arm/boot/dts/tegra30-beaver.dts            |    8 +
 arch/arm/boot/dts/tegra30-cardhu-a02.dts        |    1 +
 arch/arm/boot/dts/tegra30-cardhu-a04.dts        |    1 +
 arch/arm/boot/dts/tegra30-cardhu.dtsi           |   11 +
 arch/arm/boot/dts/tegra30.dtsi                  |    1 +
 25 files changed, 1405 insertions(+), 30 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/i2c/nvidia,tegra20-i2c.txt

[GIT PULL 7/8] ARM: tegra: multi-platform conversion

[Stephen Warren]

This branch converts Tegra to support multi-platform/single-zImage.

One header is made accessible to drivers. The earlyprintk implementation
is moved to the multi-platform location. Some Kconfig changes are made
to enable multi-platform. Some dead files are deleted.

The APIs exposed in the now-global tegra-powergate.h should be replaced
with standard reset and power domain APIs in the future.

This branch is based on (part of) the previous soc pull request.

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

The following changes since commit 7495b2eb0770b85e58af98b99faaf853e9563784:

  ARM: tegra: add speedo-based process id for Tegra114

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git tegra-for-3.10-multiplatform

for you to fetch changes up to 9002722560ba86a2f59811e3d11a2575bf47e1f6:

  ARM: tegra: convert to multi-platform

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

Stephen Warren (2):
      ARM: tegra: move <mach/powergate.h> to <linux/tegra-powergate.h>
      ARM: tegra: convert to multi-platform

 arch/arm/Kconfig                                |   19 --
 arch/arm/mach-tegra/Kconfig                     |   27 ++-
 arch/arm/mach-tegra/Makefile.boot               |    3 -
 arch/arm/mach-tegra/board.h                     |    1 +
 arch/arm/mach-tegra/common.c                    |    2 -
 arch/arm/mach-tegra/include/mach/timex.h        |   26 ---
 arch/arm/mach-tegra/include/mach/uncompress.h   |  175 ------------------
 arch/arm/mach-tegra/pcie.c                      |    3 +-
 arch/arm/mach-tegra/powergate.c                 |    3 +-
 drivers/clk/tegra/clk-tegra30.c                 |    3 +-
 .../linux/tegra-powergate.h                     |    5 -
 11 files changed, 24 insertions(+), 243 deletions(-)
 delete mode 100644 arch/arm/mach-tegra/Makefile.boot
 delete mode 100644 arch/arm/mach-tegra/include/mach/timex.h
 delete mode 100644 arch/arm/mach-tegra/include/mach/uncompress.h
 rename arch/arm/mach-tegra/include/mach/powergate.h => include/linux/tegra-powergate.h (92%)

[GIT PULL 8/8] ARM: tegra: defconfig changes

[Stephen Warren]

Various new features are enabled:

* Tegra114 support.
* Various PMICs and related options for Tegra114 platforms.
* KEYBOARD_GPIO, mainly as a suspend wakeup source.
* tegra_defconfig is rebuilt based on v3.9-rc1, which causes various
  layout changes.

This branch is based on v3.9-rc1.

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

The following changes since commit 6dbe51c251a327e012439c4772097a13df43c5b8:

  Linux 3.9-rc1

are available in the git repository at:

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

for you to fetch changes up to e1eee65f1a0cce8e49624104b3497ba3f8d35199:

  ARM: tegra: defconfig updates

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

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

 arch/arm/configs/tegra_defconfig |   18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

[GIT PULL 1/8] ARM: tegra: DT-related fixes needed by the MMC tree

[Arnd Bergmann]

On Friday 05 April 2013, Stephen Warren wrote:
> In order to convert the Tegra MMC driver to using mmc_of_parse(), some
> bugs in the Tegra device-tree content need to be fixed first; it's
> currently wrong but unused, and mmc_of_parse() causes that data to be
> used for the first time.
> 
> (This branch has also been merged into the MMC tree. I'm sending it as a
> separate pull request as an FYI, but you can feel free to skip it and just
> pull in 2/8 which is the main Tegra fixes branch and includes this)
> 

Pulled into next/dt for completeness, thanks!

	Arnd

[GIT PULL 2/8] ARM: tegra: minor fixes

[Arnd Bergmann]

On Friday 05 April 2013, Stephen Warren wrote:
> This branch contains a variety of small build and run-time fixes that
> weren't important enough for 3.9.
> 
> * Enable CPU errata WARs in secondary reset handler as a preparation
>   for multi-platform support, and a related fix.
> * Don't touch DBLGAR in reset/resume handlers, so enable the code to
>   run on A15 cores.
> * Minor build fixes.
> * A fix to the Tegra clock driver.
> * Some error-handling fixes.
> 
> This branch is based on the previous fixes-for-mmc pull request.
> 

Pulled into next/fixes-non-critical, thanks!

	Arnd

[GIT PULL 3/8] ARM: tegra: cleanup

[Arnd Bergmann]

On Friday 05 April 2013, Stephen Warren wrote:
> This branch includes various cleanup of the core Tegra support.
> 
> * Unification of the separate board-dt-tegra*.c files into a single
>   tegra.c, now that everything is DT-driven and basically identical.
> * Use of_clk_get() in the Tegra clocksource driver so that clocks are
>   described in DT rather than hard-coding clock names.
> * Some cleanup of the PMC-related code, with the aim that the PMC
>   "driver" contains more of the code that touches PMC registers, rather
>   than spreading PMC register accesses through other files.
> * Conversion of the "PMC" driver to acquire resources describe in device
>   tree rather than hard-coding them.
> * Use of common code for the CPU sleep TLB invalidation.
> 

Pulled into next/cleanup branch and resolved the conflict against
an earlier cleanup that was already present there, fixup below.

	Arnd

--- a/drivers/clocksource/tegra20_timer.c
+++ b/drivers/clocksource/tegra20_timer.c
@@@ -218,34 -259,12 +218,34 @@@ static void __init tegra20_init_timer(s
        tegra_clockevent.irq = tegra_timer_irq.irq;
        clockevents_config_and_register(&tegra_clockevent, 1000000,
                                        0x1, 0x1fffffff);
 -#ifdef CONFIG_HAVE_ARM_TWD
 -      twd_local_timer_of_register();
 -#endif
 +}
 +CLOCKSOURCE_OF_DECLARE(tegra20_timer, "nvidia,tegra20-timer", tegra20_init_timer);
 +
 +static void __init tegra20_init_rtc(struct device_node *np)
 +{
 +      struct clk *clk;
 +
 +      rtc_base = of_iomap(np, 0);
 +      if (!rtc_base) {
 +              pr_err("Can't map RTC registers");
 +              BUG();
 +      }
 +
 +      /*
 +       * rtc registers are used by read_persistent_clock, keep the rtc clock
 +       * enabled
 +       */
-       clk = clk_get_sys("rtc-tegra", NULL);
++      clk = of_clk_get(np, 0);
 +      if (IS_ERR(clk))
 +              pr_warn("Unable to get rtc-tegra clock\n");
 +      else
 +              clk_prepare_enable(clk);
 +
 +      of_node_put(np);
 +
        register_persistent_clock(NULL, tegra_read_persistent_clock);
  }
 -CLOCKSOURCE_OF_DECLARE(tegra20, "nvidia,tegra20-timer", tegra20_init_timer);
 +CLOCKSOURCE_OF_DECLARE(tegra20_rtc, "nvidia,tegra20-rtc", tegra20_init_rtc);
  
  #ifdef CONFIG_PM
  static u32 usec_config;

[GIT PULL 4/8] ARM: tegra: core SoC support development

[Arnd Bergmann]

On Friday 05 April 2013, Stephen Warren wrote:
> This branch includes major development on the core Tegra SoC support code
> in the mach-tegra directory:
> 
> * SMP support for Tegra114.
> * Exposes SoC chip ID and revision through standard sysfs files.
> * System-level suspend/resume for Tegra20/30. At present, this only
>   supports "LP2" mode (CPU power-down), but provides the basis to
>   implement "LP0"/"LP1" (various levels of core/chip power-down) in the
>   hopefully near future.
> * A minor cleanup of a duplicate include, which was introduced in this
>   branch.
> 
> This branch is based on the previous cleanup pull request.

Pulled into next/soc, thanks!

	Arnd

[GIT PULL 7/8] ARM: tegra: multi-platform conversion

[Arnd Bergmann]

On Friday 05 April 2013, Stephen Warren wrote:
> This branch converts Tegra to support multi-platform/single-zImage.
> 
> One header is made accessible to drivers. The earlyprintk implementation
> is moved to the multi-platform location. Some Kconfig changes are made
> to enable multi-platform. Some dead files are deleted.
> 
> The APIs exposed in the now-global tegra-powergate.h should be replaced
> with standard reset and power domain APIs in the future.
> 
> This branch is based on (part of) the previous soc pull request.
> 

Pulled into next/multiplatform, thanks a lot!

We now have a total of eight new platforms lined up for supporting a
multiplatform kernel in 3.10, and I still have some (limited) hope
for exynos.

I had to reorder the branches in arm-soc to avoid starting a
next/multiplatform2 branch, but I saw nothing that prevents us from
having multiplatform after soc.

	Arnd

[GIT PULL 6/8] ARM: tegra: device tree changes

[Arnd Bergmann]

On Friday 05 April 2013, Stephen Warren wrote:
> Spam Status: Spamassassin 0% probability of being spam.
> 
> Full report:
> No, score=-4.2 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1  
> This branch contains the majority of the device tree changes for Tegra.
> Highlights include:
> 
> * Many changes for Tegra114, and the Dalmore board, to enable pinctrl,
>   SDHCI/MMC, PWM, DMA, I2C, KBC, SPI, battery, regulators.
> * Adding or enabling suspend wakeup sources on many boards, and adding
>   suspend timing parameters, to support the system suspend patches.
> * Adding clocks to the audio-related nodes, so that in 3.11, the audio
>   driver can pull these clocks from device tree rather than hard-coding
>   clock names.
> * Some small DT fixes/cleanup.
> 
> This branch is based on the previous clk pull request.

Hmm, I can't put this into the normal next/dt branch, since I really don't
want to add a dependency on the next/drivers branch there.

Can you send a replacement pull request that only contains the commits
that don't depend on that, and a separate request that can go on top
of next/drivers?

Alternatively, I could start a next/dt2 branch, but I'd like to avoid
that.

	Arnd

[GIT PULL 5/8] ARM: tegra: clock driver development

[Arnd Bergmann]

On Friday 05 April 2013, Stephen Warren wrote:
> This branch contains most fixes and enhancements to the Tegra common
> clock driver. The main new feature is a driver for Tegra114, which
> coupled with later device tree changes enables many devices on that
> chip, such as MMC, I2C, etc.
> 
> This branch depends on a patch in:
> 
> git://git.linaro.org/people/mturquette/linux.git clk-for-3.10

Pulled into next/drivers branch, and noted down the dependency.

As a general recommendation, it is nicer if you can prepare a
separate branch with the dependency, even if it's just one patch,
and have that pulled into both maintainer trees, rather than
having us add the entire set of clk changes as a dependency.

	Arnd

[GIT PULL 8/8] ARM: tegra: defconfig changes

[Arnd Bergmann]

On Friday 05 April 2013, Stephen Warren wrote:
> Various new features are enabled:
> 
> * Tegra114 support.
> * Various PMICs and related options for Tegra114 platforms.
> * KEYBOARD_GPIO, mainly as a suspend wakeup source.
> * tegra_defconfig is rebuilt based on v3.9-rc1, which causes various
>   layout changes.
> 
> This branch is based on v3.9-rc1.

Pulled into next/soc.

I'm currently thinking about creating a next/defconfig branch after all,
since we have a couple of pull requests in next/soc that only do
defconfig changes. Olof, any opinion?

	Arnd

[GIT PULL 3/8] ARM: tegra: cleanup

[Stephen Warren]

On 04/09/2013 07:44 AM, Arnd Bergmann wrote:
> On Friday 05 April 2013, Stephen Warren wrote:
>> This branch includes various cleanup of the core Tegra support.
>>
>> * Unification of the separate board-dt-tegra*.c files into a single
>>   tegra.c, now that everything is DT-driven and basically identical.
>> * Use of_clk_get() in the Tegra clocksource driver so that clocks are
>>   described in DT rather than hard-coding clock names.
>> * Some cleanup of the PMC-related code, with the aim that the PMC
>>   "driver" contains more of the code that touches PMC registers, rather
>>   than spreading PMC register accesses through other files.
>> * Conversion of the "PMC" driver to acquire resources describe in device
>>   tree rather than hard-coding them.
>> * Use of common code for the CPU sleep TLB invalidation.
>>
> 
> Pulled into next/cleanup branch and resolved the conflict against
> an earlier cleanup that was already present there, fixup below.

Oh yes, sorry I forgot to mention that; of course this conflict doesn't
show up when I build my own for-next, but rather only in
arm-soc/linux-next so I forgot about it:-(

Anyway, the resolution you posted looks good. Thanks.

[GIT PULL 5/8] ARM: tegra: clock driver development

[Stephen Warren]

On 04/09/2013 09:14 AM, Arnd Bergmann wrote:
> On Friday 05 April 2013, Stephen Warren wrote:
>> This branch contains most fixes and enhancements to the Tegra common
>> clock driver. The main new feature is a driver for Tegra114, which
>> coupled with later device tree changes enables many devices on that
>> chip, such as MMC, I2C, etc.
>>
>> This branch depends on a patch in:
>>
>> git://git.linaro.org/people/mturquette/linux.git clk-for-3.10
> 
> Pulled into next/drivers branch, and noted down the dependency.
> 
> As a general recommendation, it is nicer if you can prepare a
> separate branch with the dependency, even if it's just one patch,
> and have that pulled into both maintainer trees, rather than
> having us add the entire set of clk changes as a dependency.

Yes, I did ask for that to happen repeatedly, but Mike forgot when
applying the patch to his tree.

[GIT PULL 6/8] ARM: tegra: device tree changes

[Arnd Bergmann]

On Friday 05 April 2013, Stephen Warren wrote:
> This branch contains the majority of the device tree changes for Tegra.
> Highlights include:
> 
> * Many changes for Tegra114, and the Dalmore board, to enable pinctrl,
>   SDHCI/MMC, PWM, DMA, I2C, KBC, SPI, battery, regulators.
> * Adding or enabling suspend wakeup sources on many boards, and adding
>   suspend timing parameters, to support the system suspend patches.
> * Adding clocks to the audio-related nodes, so that in 3.11, the audio
>   driver can pull these clocks from device tree rather than hard-coding
>   clock names.
> * Some small DT fixes/cleanup.
> 
> This branch is based on the previous clk pull request.

I ended up doing a next/dt2 branch for this, since the mxs tree has the
same kind of dependency.

	Arnd

[GIT PULL 7/8] ARM: tegra: multi-platform conversion

[Arnd Bergmann]

On Tuesday 09 April 2013, Arnd Bergmann wrote:
> On Friday 05 April 2013, Stephen Warren wrote:
> > This branch converts Tegra to support multi-platform/single-zImage.

> I had to reorder the branches in arm-soc to avoid starting a
> next/multiplatform2 branch, but I saw nothing that prevents us from
> having multiplatform after soc.

I've applied this patch on top.

>From 1939e142b04d91b97a8643dd68c4b3fae48a136b Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 9 Apr 2013 21:58:38 +0200
Subject: [PATCH] ARM: tegra: build assembly files with -march=armv7-a

The tegra assembly files are written for ARMv7 and are not compatible
with ARMv6, which leads to build warnings when compiling a dual
ARMv6/v7 kernel. Since this code is only ever run on Tegra ARMv7
hardware, we can tell the assembler which architecture level to
use.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile
index e40326d..bfc5b07 100644
--- a/arch/arm/mach-tegra/Makefile
+++ b/arch/arm/mach-tegra/Makefile
@@ -1,3 +1,5 @@
+asflags-y				+= -march=armv7-a
+
 obj-y                                   += common.o
 obj-y                                   += io.o
 obj-y                                   += irq.o

[GIT PULL 7/8] ARM: tegra: multi-platform conversion

[Stephen Warren]

On 04/09/2013 02:01 PM, Arnd Bergmann wrote:
> On Tuesday 09 April 2013, Arnd Bergmann wrote:
>> On Friday 05 April 2013, Stephen Warren wrote:
>>> This branch converts Tegra to support multi-platform/single-zImage.
> 
>> I had to reorder the branches in arm-soc to avoid starting a
>> next/multiplatform2 branch, but I saw nothing that prevents us from
>> having multiplatform after soc.
> 
> I've applied this patch on top.
...
> Subject: [PATCH] ARM: tegra: build assembly files with -march=armv7-a
> 
> The tegra assembly files are written for ARMv7 and are not compatible
> with ARMv6, which leads to build warnings when compiling a dual
> ARMv6/v7 kernel. Since this code is only ever run on Tegra ARMv7
> hardware, we can tell the assembler which architecture level to
> use.

Ah yes, I hit that problem too, but wasn't sure how to solve it. The
patch below looks good. Now I must go try a combo bcm2835+Tegra kernel
on both devices...

[GIT PULL 8/8] ARM: tegra: defconfig changes

[Olof Johansson]

On Tue, Apr 09, 2013 at 05:16:35PM +0200, Arnd Bergmann wrote:
> On Friday 05 April 2013, Stephen Warren wrote:
> > Various new features are enabled:
> > 
> > * Tegra114 support.
> > * Various PMICs and related options for Tegra114 platforms.
> > * KEYBOARD_GPIO, mainly as a suspend wakeup source.
> > * tegra_defconfig is rebuilt based on v3.9-rc1, which causes various
> >   layout changes.
> > 
> > This branch is based on v3.9-rc1.
> 
> Pulled into next/soc.
> 
> I'm currently thinking about creating a next/defconfig branch after all,
> since we have a couple of pull requests in next/soc that only do
> defconfig changes. Olof, any opinion?

Sorry, didn't see this until now. Either way is fine with me. Main reason
for not keeping it in a branch on its own is that defconfig churn is
usually frowned upon and it makes some sense to show that it's caused
by other development (soc/board/etc).  But if we have enough volume to
keep separate then that's fine too.

Also, if we keep it separate we can always merge it together with another
branch before sending it up if it's very small for a particular merge window.


-Olof