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

From: Albert ARIBAUD <albert.u.boot@aribaud.net>
To: u-boot@lists.denx.de
Subject: [U-Boot] pull request for u-boot-tegra/master into ARM/master
Date: Tue, 26 Mar 2013 11:12:18 +0100	[thread overview]
Message-ID: <20130326111218.24d5d36a@lilith> (raw)
In-Reply-To: <CA+m5__LoRik=c9Xv4rgOZy3wt64WhBiSd-LEFntauK384OUS_Q@mail.gmail.com>

Hi Tom,

On Mon, 25 Mar 2013 10:43:22 -0700, Tom Warren
<twarren.nvidia@gmail.com> wrote:

> Albert,
> 
> Please pull u-boot-tegra/master into ARM/master. Thanks!
> 
> ./MAKEALL for all the Tegra boards is OK, running a ./MAKEALL -a arm
> now. Checkpatch.pl is clean.
> 
> The following changes since commit b6379e15a70cc2e22486e5962927d9de374d877b:
> 
>   Merge branch 'u-boot-ti/master' into 'u-boot-arm/master' (2013-03-24
> 17:52:22 +0100)
> 
> are available in the git repository at:
> 
>   git://git.denx.de/u-boot-tegra master
> 
> for you to fetch changes up to f789be6086f3e6302fe4b163fa9b7bd6b358c4ce:
> 
>   Tegra114: MMC: Enable DT MMC driver support for Tegra114 Dalmore boards
> (2013-03-25 09:56:08 -0700)
> 
> ----------------------------------------------------------------
> Allen Martin (13):
>       tegra: remove support for UART SPI switch
>       tegra: spi: rename tegra SPI drivers
>       tegra: spi: remove non fdt support
>       tegra: spi: pull register structs out of headers
>       tegra20: spi: move fdt probe to spi_init
>       spi: add common fdt SPI driver interface
>       sf: winbond: add W25Q32DW
>       tegra114: fdt: add compatible string for tegra114 SPI ctrl
>       tegra114: fdt: add apbdma block
>       tegra114: fdt: add SPI blocks
>       tegra114: dalmore: fdt: enable dalmore SPI controller
>       tegra114: add SPI driver
>       tegra114: dalmore: config: enable SPI
> 
> Tom Warren (4):
>       Tegra114: fdt: Add SDMMC (sdhci) nodes for T114 boards (Dalmore for
> now)
>       Tegra114: Dalmore: Add SDIO3 pad config to pinctrl_config table
>       Tegra114: MMC: Add SD bus power-rail init routine
>       Tegra114: MMC: Enable DT MMC driver support for Tegra114 Dalmore
> boards
> 
>  arch/arm/dts/tegra114.dtsi                         | 141 +++++++
>  arch/arm/include/asm/arch-tegra/board.h            |   3 +-
>  arch/arm/include/asm/arch-tegra/tegra_slink.h      |  84 -----
>  arch/arm/include/asm/arch-tegra/tegra_spi.h        |  75 ----
>  arch/arm/include/asm/arch-tegra114/gp_padctrl.h    |   6 +
>  arch/arm/include/asm/arch-tegra114/tegra114_spi.h  |  41 +++
>  arch/arm/include/asm/arch-tegra20/tegra20_sflash.h |  41 +++
>  arch/arm/include/asm/arch-tegra20/tegra20_slink.h  |  41 +++
>  .../arm/include/asm/arch-tegra20/uart-spi-switch.h |  46 ---
>  board/nvidia/common/board.c                        |   5 +-
>  board/nvidia/common/common.mk                      |   1 -
>  board/nvidia/common/uart-spi-switch.c              | 125 -------
>  board/nvidia/dalmore/dalmore.c                     |  66 ++++
>  board/nvidia/dalmore/pinmux-config-dalmore.h       |   6 +
>  board/nvidia/dts/tegra114-dalmore.dts              |  18 +
>  board/nvidia/seaboard/seaboard.c                   |   2 +-
>  drivers/mtd/spi/winbond.c                          |   5 +
>  drivers/spi/Makefile                               |   6 +-
>  drivers/spi/fdt_spi.c                              | 186 ++++++++++
>  drivers/spi/tegra114_spi.c                         | 405
> +++++++++++++++++++++
>  drivers/spi/{tegra_spi.c => tegra20_sflash.c}      | 215 ++++++-----
>  drivers/spi/{tegra_slink.c => tegra20_slink.c}     | 128 ++++---
>  include/configs/cardhu.h                           |   2 +-
>  include/configs/dalmore.h                          |  23 +-
>  include/configs/tegra-common-post.h                |   4 +
>  include/configs/trimslice.h                        |   2 +-
>  include/fdtdec.h                                   |   1 +
>  lib/fdtdec.c                                       |   1 +
>  28 files changed, 1188 insertions(+), 491 deletions(-)
>  delete mode 100644 arch/arm/include/asm/arch-tegra/tegra_slink.h
>  delete mode 100644 arch/arm/include/asm/arch-tegra/tegra_spi.h
>  create mode 100644 arch/arm/include/asm/arch-tegra114/tegra114_spi.h
>  create mode 100644 arch/arm/include/asm/arch-tegra20/tegra20_sflash.h
>  create mode 100644 arch/arm/include/asm/arch-tegra20/tegra20_slink.h
>  delete mode 100644 arch/arm/include/asm/arch-tegra20/uart-spi-switch.h
>  delete mode 100644 board/nvidia/common/uart-spi-switch.c
>  create mode 100644 drivers/spi/fdt_spi.c
>  create mode 100644 drivers/spi/tegra114_spi.c
>  rename drivers/spi/{tegra_spi.c => tegra20_sflash.c} (57%)
>  rename drivers/spi/{tegra_slink.c => tegra20_slink.c} (72%)
> 
>  

Applied to u-boot-arm/master, thanks!

Amicalement,
-- 
Albert.