[U-Boot] pull request for u-boot-tegra/master into ARM/master

[Tom Warren]

Albert,

Please pull u-boot-tegra/master into ARM/master. Thanks!

./MAKEALL -s tegra AOK, checkpatch.pl is OK, and ./MAKEALL -a arm only
shows failures that were already present in ARM/master.

The following changes since commit 1b82491ee6ee1e986e5521b33692a00e1f38fe75:

  board:tricorder: fixup SPL OOB layout (2014-04-11 10:08:42 -0400)

are available in the git repository at:

  git://git.denx.de/u-boot-tegra.git master

for you to fetch changes up to d381294aef4a5b6ddeda3685519330a5b73d884f:

  ARM: tegra: pack pinmux data tables tighter (2014-04-17 08:41:06 -0700)

----------------------------------------------------------------
Stefan Agner (3):
      usb: tegra: fix USB2 powerdown for Tegra30 and later
      usb: tegra: fix PHY configuration
      usb: tegra: combine header file

Stephen Warren (14):
      ARM: tegra: pinctrl: remove func_safe
      ARM: tegra: pinctrl: remove vddio
      ARM: tegra: pinctrl: make pmux_func values consistent on Tegra20
      ARM: tegra: prototype pinmux_init() in board.h
      ARM: tegra: use apb_misc.h in more places
      ARM: tegra: pinctrl: remove duplication
      ARM: tegra: reduce public pinmux API
      ARM: tegra: pinmux naming consistency fixes
      ARM: tegra: Tegra20 pinmux cleanup
      ARM: tegra: Tegra30 pinmux cleanup
      ARM: tegra: Tegra114 pinmux cleanup
      ARM: tegra: Tegra124 pinmux cleanup
      ARM: tegra: add Jetson TK1 board
      ARM: tegra: pack pinmux data tables tighter

 arch/arm/cpu/arm720t/tegra-common/spl.c            |   6 +-
 arch/arm/cpu/arm720t/tegra114/cpu.c                |   4 +-
 arch/arm/cpu/arm720t/tegra124/cpu.c                |   4 +-
 arch/arm/cpu/tegra-common/Makefile                 |   6 +-
 arch/arm/cpu/tegra-common/pinmux-common.c          | 508 +++++++++++
 arch/arm/cpu/tegra114-common/funcmux.c             |  32 +-
 arch/arm/cpu/tegra114-common/pinmux.c              | 895
+++++--------------
 arch/arm/cpu/tegra124-common/funcmux.c             |  38 +-
 arch/arm/cpu/tegra124-common/pinmux.c              | 898
+++++--------------
 arch/arm/cpu/tegra20-common/emc.c                  |   2 +-
 arch/arm/cpu/tegra20-common/funcmux.c              | 185 ++--
 arch/arm/cpu/tegra20-common/pinmux.c               | 416 +++------
 arch/arm/cpu/tegra20-common/warmboot.c             |   8 +-
 arch/arm/cpu/tegra20-common/warmboot_avp.c         |   6 +-
 arch/arm/cpu/tegra30-common/funcmux.c              |  20 +-
 arch/arm/cpu/tegra30-common/pinmux.c               | 948
++++++--------------
 arch/arm/dts/Makefile                              |   1 +
 arch/arm/dts/tegra124-jetson-tk1.dts               |  84 ++
 .../asm/{arch-tegra20 => arch-tegra}/apb_misc.h    |   2 +
 arch/arm/include/asm/arch-tegra/board.h            |   1 +
 arch/arm/include/asm/arch-tegra/pinmux.h           | 185 ++++
 arch/arm/include/asm/arch-tegra/usb.h              | 223 ++++-
 arch/arm/include/asm/arch-tegra114/pinmux.h        | 836 ++++++------------
 arch/arm/include/asm/arch-tegra114/usb.h           | 156 ----
 arch/arm/include/asm/arch-tegra124/pinmux.h        | 866 +++++++-----------
 arch/arm/include/asm/arch-tegra124/usb.h           | 268 ------
 arch/arm/include/asm/arch-tegra20/pinmux.h         | 372 +++-----
 arch/arm/include/asm/arch-tegra20/usb.h            | 155 ----
 arch/arm/include/asm/arch-tegra30/pinmux.h         | 963
++++++++-------------
 arch/arm/include/asm/arch-tegra30/usb.h            | 168 ----
 .../common/pinmux-config-tamonten-ng.h             | 492 +++++------
 board/avionic-design/common/tamonten-ng.c          |  12 +-
 board/avionic-design/common/tamonten.c             |   4 +-
 board/compal/paz00/paz00.c                         |  22 +-
 board/compulab/trimslice/trimslice.c               |   4 +-
 board/nvidia/cardhu/cardhu.c                       |   6 +-
 board/nvidia/cardhu/pinmux-config-cardhu.h         | 498 +++++------
 board/nvidia/common/board.c                        |   9 +-
 board/nvidia/dalmore/dalmore.c                     |   9 +-
 board/nvidia/dalmore/pinmux-config-dalmore.h       | 388 ++++-----
 board/nvidia/harmony/harmony.c                     |  18 +-
 board/nvidia/jetson-tk1/Makefile                   |   9 +
 board/nvidia/jetson-tk1/jetson-tk1.c               |  23 +
 board/nvidia/jetson-tk1/pinmux-config-jetson-tk1.h | 227 +++++
 board/nvidia/seaboard/seaboard.c                   |   6 +-
 board/nvidia/venice2/as3722_init.h                 |   4 +
 board/nvidia/venice2/pinmux-config-venice2.h       | 360 ++++----
 board/nvidia/venice2/venice2.c                     |  15 +-
 .../colibri_t20-common/colibri_t20-common.c        |   8 +-
 board/toradex/colibri_t20_iris/colibri_t20_iris.c  |   4 +-
 boards.cfg                                         |   1 +
 drivers/spi/tegra20_sflash.c                       |   6 +-
 drivers/usb/host/ehci-tegra.c                      |  28 +-
 drivers/video/tegra.c                              |   4 +-
 include/configs/jetson-tk1.h                       |  79 ++
 55 files changed, 4384 insertions(+), 6108 deletions(-)
 create mode 100644 arch/arm/cpu/tegra-common/pinmux-common.c
 create mode 100644 arch/arm/dts/tegra124-jetson-tk1.dts
 rename arch/arm/include/asm/{arch-tegra20 => arch-tegra}/apb_misc.h (87%)
 create mode 100644 arch/arm/include/asm/arch-tegra/pinmux.h
 delete mode 100644 arch/arm/include/asm/arch-tegra114/usb.h
 delete mode 100644 arch/arm/include/asm/arch-tegra124/usb.h
 delete mode 100644 arch/arm/include/asm/arch-tegra20/usb.h
 delete mode 100644 arch/arm/include/asm/arch-tegra30/usb.h
 create mode 100644 board/nvidia/jetson-tk1/Makefile
 create mode 100644 board/nvidia/jetson-tk1/jetson-tk1.c
 create mode 100644 board/nvidia/jetson-tk1/pinmux-config-jetson-tk1.h
 create mode 100644 include/configs/jetson-tk1.h