From patchwork Thu May 31 16:47:18 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Warren X-Patchwork-Id: 162186 X-Patchwork-Delegate: albert.aribaud@free.fr Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 70176B6F9A for ; Fri, 1 Jun 2012 02:47:29 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 761E0280CC; Thu, 31 May 2012 18:47:26 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id C7-m08LmA6gU; Thu, 31 May 2012 18:47:26 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C0BB1280C1; Thu, 31 May 2012 18:47:24 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8EE66280C1 for ; Thu, 31 May 2012 18:47:21 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id cMfi+K8jVClK for ; Thu, 31 May 2012 18:47:20 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-wi0-f180.google.com (mail-wi0-f180.google.com [209.85.212.180]) by theia.denx.de (Postfix) with ESMTPS id 9A684280B4 for ; Thu, 31 May 2012 18:47:18 +0200 (CEST) Received: by wibhj6 with SMTP id hj6so956977wib.9 for ; Thu, 31 May 2012 09:47:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:cc:content-type; bh=uqkg8D/DHl2UvPgR9C+eQUXzAROi/1zGLYwGvXKJiQc=; b=ULM4byw0FGMR+x/XnQ7IqZBtBrexPLari0DolsYd5HCCq0UM0eCLO6sQ5srjk7eVI1 2ejsnaa4n2R2OteqpewnwCyvmrpxkU+pKwhOf/H5SgF3NKgk8ec+DW/kIb3EHowJCtMa G6y41i1KOyFbGzeZvl8rEb8qXmRtMNXkMxQX6Zt8Ucdn22Wo11161aKHE8a6VBsmNeMD L9fwgLehpXn4qORhDZk7XeMxParrTOMl+QXicD1w9sGsu+tvqeEkvCBqneKo1ZfSmmus EZmIM8Dq1+nV1vfBAzAYLhhdhH7GAYJRXEd97ZA2ccWvcxV07P8kAxvw9SOOzH6icRy8 d5LA== MIME-Version: 1.0 Received: by 10.216.216.226 with SMTP id g76mr13925240wep.221.1338482838403; Thu, 31 May 2012 09:47:18 -0700 (PDT) Received: by 10.217.4.138 with HTTP; Thu, 31 May 2012 09:47:18 -0700 (PDT) Date: Thu, 31 May 2012 09:47:18 -0700 Message-ID: From: Tom Warren To: Albert ARIBAUD Cc: u-boot@lists.denx.de Subject: [U-Boot] pull request for u-boot-tegra/master X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de Albert, Please pull u-boot-tegra/master into ARM master. Thanks! The following changes since commit 2ca4a209a5b961ad1be8782c68dabe326d77dfaf: SRICHARAN R (1): OMAP4/5: Change omap4_sdp, omap4_panda, omap5_evm maintainer are available in the git repository at: git://git.denx.de/u-boot-tegra master Lucas Stach (2): tegra: sync SDIO1 pingroup enum name with TRM tegra: add SDIO1 funcmux entry for UARTA Simon Glass (1): tegra: Correct PLL access in ap20.c and clock.c Stephen Warren (22): tegra: paz00: fix typo in SD slot CD detect GPIO tegra: add alternate UART1 funcmux entry tegra: Whistler board support tegra: remove some cruft from CONFIG_EXTRA_ENV_SETTINGS tegra: flesh out bootcmd tegra: whistler: reduce and comment network cfg options tegra: seaboard: add support for USB networking tegra: add UART1 on GPU funcmux entry tegra: add SDMMC1 on SDIO1 funcmux entry tegra: Compulab TrimSlice board support tegra: harmony: add device tree support tegra: paz00: add device tree support tegra: remove CONFIG_USB_ETHER_SMSC95XX from boards without it tegra: ventana: add own device tree, enable USB env_mmc: align buffers using ALLOC_CACHE_ALIGN_BUFFER sf: winbond: Add support for the Winbond W25Q80BL tegra: ventana: store environment in eMMC tegra: whistler: store environment in eMMC tegra: trimslice: store environment in SPI flash tegra: paz00: store environment in eMMC tegra: seaboard: disable SPI, move environment to eMMC tegra: trimslice: fix a couple typos Tom Warren (6): spi: Tegra2: Seaboard: fix UART corruption during SPI transactions spi: Tegra2: Seaboard: enable SPI/UART corruption fix spi: tegra2: rename tegra2_spi.* to tegra_spi.* mmc: tegra2: rename tegra2_mmc.* to tegra_mmc.* gpio: tegra2: rename tegra2_gpio.* to tegra_gpio.* arm: Tegra: Use ODMDATA from BCT in IRAM amartin@nvidia.com (1): tegra: override compiler flags for low level init code MAINTAINERS | 2 + arch/arm/cpu/armv7/tegra2/ap20.c | 28 ++++- arch/arm/cpu/armv7/tegra2/board.c | 18 +++- arch/arm/cpu/armv7/tegra2/clock.c | 4 +- arch/arm/cpu/armv7/tegra2/config.mk | 7 +- arch/arm/cpu/armv7/tegra2/funcmux.c | 30 +++++- arch/arm/include/asm/arch-tegra2/clock.h | 5 +- arch/arm/include/asm/arch-tegra2/funcmux.h | 4 + arch/arm/include/asm/arch-tegra2/gpio.h | 7 +- arch/arm/include/asm/arch-tegra2/pinmux.h | 2 +- arch/arm/include/asm/arch-tegra2/tegra2.h | 4 + .../asm/arch-tegra2/{tegra2_spi.h => tegra_spi.h} | 9 +- arch/arm/include/asm/arch-tegra2/uart-spi-switch.h | 4 +- board/compal/dts/tegra2-paz00.dts | 57 ++++++++++ board/compal/paz00/paz00.c | 12 +- board/compulab/dts/tegra2-trimslice.dts | 57 ++++++++++ board/compulab/trimslice/Makefile | 49 ++++++++ board/compulab/trimslice/trimslice.c | 73 ++++++++++++ board/nvidia/common/uart-spi-switch.c | 29 ++---- board/nvidia/dts/tegra2-harmony.dts | 57 ++++++++++ board/nvidia/dts/tegra2-ventana.dts | 57 ++++++++++ board/nvidia/dts/tegra2-whistler.dts | 67 +++++++++++ board/nvidia/harmony/harmony.c | 4 +- board/nvidia/seaboard/seaboard.c | 4 +- board/nvidia/whistler/Makefile | 48 ++++++++ board/nvidia/whistler/whistler.c | 116 +++++++++++++++++++ boards.cfg | 2 + common/env_mmc.c | 10 +- drivers/gpio/Makefile | 2 +- drivers/gpio/{tegra2_gpio.c => tegra_gpio.c} | 2 +- drivers/mmc/Makefile | 2 +- drivers/mmc/{tegra2_mmc.c => tegra_mmc.c} | 4 +- drivers/mmc/{tegra2_mmc.h => tegra_mmc.h} | 8 +- drivers/mtd/spi/winbond.c | 8 ++ drivers/spi/Makefile | 2 +- drivers/spi/{tegra2_spi.c => tegra_spi.c} | 17 +++- include/configs/harmony.h | 29 ++++- include/configs/medcom.h | 6 +- include/configs/paz00.h | 34 +++++- include/configs/plutux.h | 6 +- include/configs/seaboard.h | 35 +++--- include/configs/tegra2-common-post.h | 117 ++++++++++++++++++++ include/configs/tegra2-common.h | 10 +-- include/configs/trimslice.h | 99 +++++++++++++++++ include/configs/ventana.h | 29 ++++- include/configs/whistler.h | 94 ++++++++++++++++ 46 files changed, 1150 insertions(+), 120 deletions(-) rename arch/arm/include/asm/arch-tegra2/{tegra2_spi.h => tegra_spi.h} (95%) create mode 100644 board/compal/dts/tegra2-paz00.dts create mode 100644 board/compulab/dts/tegra2-trimslice.dts create mode 100644 board/compulab/trimslice/Makefile create mode 100644 board/compulab/trimslice/trimslice.c create mode 100644 board/nvidia/dts/tegra2-harmony.dts create mode 100644 board/nvidia/dts/tegra2-ventana.dts create mode 100644 board/nvidia/dts/tegra2-whistler.dts create mode 100644 board/nvidia/whistler/Makefile create mode 100644 board/nvidia/whistler/whistler.c rename drivers/gpio/{tegra2_gpio.c => tegra_gpio.c} (99%) rename drivers/mmc/{tegra2_mmc.c => tegra_mmc.c} (99%) rename drivers/mmc/{tegra2_mmc.h => tegra_mmc.h} (97%) rename drivers/spi/{tegra2_spi.c => tegra_spi.c} (95%) create mode 100644 include/configs/tegra2-common-post.h create mode 100644 include/configs/trimslice.h create mode 100644 include/configs/whistler.h