From patchwork Mon Mar 25 17:43:22 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Warren X-Patchwork-Id: 230857 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 4E7D82C007C for ; Tue, 26 Mar 2013 04:50:47 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 426F54A358; Mon, 25 Mar 2013 18:47:59 +0100 (CET) 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 VtsUlKGNGYjZ; Mon, 25 Mar 2013 18:47:59 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C45584A266; Mon, 25 Mar 2013 18:47:22 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8B9354A0C0 for ; Mon, 25 Mar 2013 18:47:19 +0100 (CET) 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 XBJ8tIeG8QGZ for ; Mon, 25 Mar 2013 18:47:18 +0100 (CET) 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-la0-f51.google.com (mail-la0-f51.google.com [209.85.215.51]) by theia.denx.de (Postfix) with ESMTPS id 67F024A266 for ; Mon, 25 Mar 2013 18:43:23 +0100 (CET) Received: by mail-la0-f51.google.com with SMTP id fo13so11680949lab.24 for ; Mon, 25 Mar 2013 10:43:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:date:message-id:subject:from:to:cc :content-type; bh=x7IKezg0r41zx1/iOF3x0LJNv/NDtn2fr/Km6sGkn4s=; b=hRdulTzhQAlaYbEH91PVTB3TTagwglzwZy6NUx7yX0lxkZk5aVE8927WKsyNQ0q4g0 ENfzoy8B9l5yaPN1U3ybDf65kljU8ZsaeehOQkPuyiIVUMdVHSOjnn3MzGpdSW7gBuyt eDXgXEjwImF/vB2l+gwRggI5uYfba+nxRKW7DH0SNaf92fg11ADo19cuHbO0KSmVa5Ch EODyJqTIyqL9TSyLwDU7mZoP7QeCqbHri6Q0QE6YRAx+4vibeTRCYw8nnnZotueOJqnu wboBeZo9O7UuMM6j39rFsDQzZ4gNlj8OmIuLUJLFk+vTOm42VugMSb6O9w5hnOM5R3gX t2MQ== MIME-Version: 1.0 X-Received: by 10.112.104.103 with SMTP id gd7mr6543921lbb.54.1364233402283; Mon, 25 Mar 2013 10:43:22 -0700 (PDT) Received: by 10.114.93.194 with HTTP; Mon, 25 Mar 2013 10:43:22 -0700 (PDT) Date: Mon, 25 Mar 2013 10:43:22 -0700 Message-ID: From: Tom Warren To: Albert ARIBAUD , "u-boot@lists.denx.de" X-Content-Filtered-By: Mailman/MimeDel 2.1.11 Cc: Stephen Warren , jimmzhang@nvidia.com Subject: [U-Boot] pull request for u-boot-tegra/master into ARM/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! ./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%)