From patchwork Fri Aug 3 16:16:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 175011 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 3450A2C00BD for ; Sat, 4 Aug 2012 02:16:28 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A856B280A7; Fri, 3 Aug 2012 18:16: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 zMfxy08xHuCN; Fri, 3 Aug 2012 18:16:26 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 1537B280A8; Fri, 3 Aug 2012 18:16:25 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 728DF280A8 for ; Fri, 3 Aug 2012 18:16:22 +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 vO3V1sBMU0Gn for ; Fri, 3 Aug 2012 18:16: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-yw0-f44.google.com (mail-yw0-f44.google.com [209.85.213.44]) by theia.denx.de (Postfix) with ESMTPS id 58ED4280A7 for ; Fri, 3 Aug 2012 18:16:18 +0200 (CEST) Received: by yhq56 with SMTP id 56so1056018yhq.3 for ; Fri, 03 Aug 2012 09:16:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:organization:user-agent; bh=vS0AXKHac9q41dH5rbEeBGAimRMDZtql61OgycUWUMU=; b=nw4PoQbEeLEqGnx+DaMTqmjVA1abIVNLAVW6lsE48+x/tpCIUr+6MlsgNAUDokwlqW rHDXcGRpXFHgIBhB0BLflQ8EcJ8pMRJ47cxagpKwc829AkNj0S1Bb7NSjom6AhILKc2w pqjso3ysE0U2iRTDVaxfWZjOV5pEDtR2S+nqhaScfNfJ12AcFAy0H5pyp/yztspFhp10 rBnxZoAreR5b7XGv/Rp/nk6xc4osqOm3gPGRp+QFAQBEaQ7g3Ez488o/ybkGdxVqh+Tu H49ap4HKEQxN4ajjfyk7A3Uk15b8HU2ffHU63F0Bb0RJJo7HaTtKnZny9xr2HRNQ/eVs vPQQ== Received: by 10.50.212.35 with SMTP id nh3mr4445183igc.19.1344010576750; Fri, 03 Aug 2012 09:16:16 -0700 (PDT) Received: from bill-the-cat ([2001:470:d:eba:40ab:5f0e:dd58:9e7e]) by mx.google.com with ESMTPS id bo7sm22561307igb.2.2012.08.03.09.16.15 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 03 Aug 2012 09:16:16 -0700 (PDT) Date: Fri, 3 Aug 2012 09:16:26 -0700 From: Tom Rini To: Albert Aribaud Message-ID: <20120803161626.GJ16633@bill-the-cat> MIME-Version: 1.0 Organization: Texas Instruments User-Agent: Mutt/1.5.21 (2010-09-15) Cc: u-boot@lists.denx.de Subject: [U-Boot] Please pull u-boot-ti/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 Hello, The following changes since commit 30a5f098e261b00b9c3ce43b8d4a641e106d26a0: Revert "arm: armv7: add compile option -mno-unaligned-access if available" (2012-07-29 11:19:37 +0200) are available in the git repository at: git://git.denx.de/u-boot-ti master for you to fetch changes up to c7dd0935555429d46d28ccbb0bde81a3e2f9c86e: DaVinci DA8xx: fix set_cpu_clk_info() (2012-08-03 09:00:57 -0700) ---------------------------------------------------------------- Chandan Nath (3): am33xx: CPSW init and definitions am33xx: pin mux defintions for CPSW switch am335x_evm: CPSW support Cyril Chemparathy (1): cpsw: add driver for cpsw ethernet device Ilya Yanok (1): am335x_evm: read the on-board EEPROM Javier Martinez Canillas (3): OMAP3: igep00x0: Add config option to choose flash storage memory OMAP3: mem: Add Numonyx OneNAND 200MHz timing information OMAP3: igep00x0: add SPL support for IGEP-based boards Laurence Withers (4): DaVinci DA8xx: tidy up clock ID definition DaVinci DA850: UART2 clock ID comes from ASYNC3 DaVinci DA8xx: replace magic number for DDR speed DaVinci DA8xx: fix set_cpu_clk_info() Marek Vasut (2): dm: Select CONFIG_SPL_GPIO_SUPPORT on OMAP dm: Move OMAP GPIO driver to drivers/gpio/ Mikhail Kshevetskiy (3): arm/davinci: fix DDR2/mDDR memory controller initialization for Omap L138 arm/davinci/da850: add uart0 pinmux serial/ns16550: ns16550 has a different register layout on SOC_DA8XX Peter Meerwald (1): beagle: only call DSS code when #defined CONFIG_VIDEO_OMAP3 Tom Rini (25): am33xx: Enable gpio0 clock am335x_evm: Update config for common usage am33xx: Remove DMM_BASE define am33xx: Convert to using to describe the EMIF am33xx: Remove extra check in enable_ddr_clocks am33xx: Bugfix to config_sdram() am33xx: Rework DDR2 EMIF initalization slightly am33xx: Make config_cmd_ctrl / config_ddr_data take const structs am33xx: Pass to config_ddr the type of memory that is connected am33xx: Move the call to ddr_pll_config, make it take the frequency am33xx: Clean up unused DDR defines, prefix more with 'DDR2' am33xx: Document what we're doing with ddrctrl->ddrckectrl am33xx: Turn a number of 'int' functions to 'void' am33xx: Use emif_regs struct for storing initialization values am33xx: Rework config_io_ctrl slightly am33xx: Do not touch 'ratio1' fields am33xx: Correct and clean up ddr_regs struct am33xx: Move some variables in emif4.c, mark them static. am33xx: Rework config_ddr to make DDR3 support easier. am33xx: Add DDR3 (Micron MT41J128M16JT-125) timings and support am33xx: Remove board/ti/am335x/evm.c am33xx: Add support for TI AM335x StarterKit EVM am33xx evm: Add CONFIG_CMD_EEPROM and related am33xx: Rework pinmux functions doc/git-mailrc: Update 'ti' alias Vaibhav Bedia (1): am335x: ddr_defs: Update EMIF parameters arch/arm/cpu/arm926ejs/davinci/cpu.c | 22 +- arch/arm/cpu/arm926ejs/davinci/da850_lowlevel.c | 26 +- arch/arm/cpu/arm926ejs/davinci/da850_pinmux.c | 5 + arch/arm/cpu/armv7/am33xx/board.c | 194 +++- arch/arm/cpu/armv7/am33xx/clock.c | 22 +- arch/arm/cpu/armv7/am33xx/ddr.c | 87 +- arch/arm/cpu/armv7/am33xx/emif4.c | 240 +++-- arch/arm/cpu/armv7/omap-common/Makefile | 3 - arch/arm/include/asm/arch-am33xx/common_def.h | 23 - arch/arm/include/asm/arch-am33xx/cpu.h | 11 + arch/arm/include/asm/arch-am33xx/ddr_defs.h | 184 ++-- arch/arm/include/asm/arch-am33xx/hardware.h | 6 +- arch/arm/include/asm/arch-am33xx/sys_proto.h | 29 + arch/arm/include/asm/arch-davinci/hardware.h | 60 +- arch/arm/include/asm/arch-davinci/pinmux_defs.h | 1 + arch/arm/include/asm/arch-omap3/mem.h | 29 + arch/arm/include/asm/emif.h | 8 +- board/isee/igep0020/config.mk | 33 - board/isee/igep0020/igep0020.c | 42 +- board/isee/igep0020/igep0020.h | 4 + board/isee/igep0030/config.mk | 33 - board/isee/igep0030/igep0030.c | 42 +- board/isee/igep0030/igep0030.h | 4 + board/ti/am335x/Makefile | 4 +- board/ti/am335x/evm.c | 40 - board/ti/am335x/mux.c | 87 +- board/ti/beagle/beagle.c | 4 + boards.cfg | 6 +- doc/git-mailrc | 2 +- drivers/gpio/Makefile | 1 + .../omap-common/gpio.c => drivers/gpio/omap_gpio.c | 0 drivers/net/Makefile | 1 + drivers/net/cpsw.c | 991 ++++++++++++++++++++ drivers/serial/ns16550.c | 2 +- include/configs/am335x_evm.h | 97 +- include/configs/cm_t35.h | 1 + include/configs/devkit8000.h | 3 + include/configs/dig297.h | 1 + include/configs/igep00x0.h | 85 ++ include/configs/mcx.h | 1 + include/configs/omap3_beagle.h | 2 + include/configs/omap3_evm_common.h | 1 + include/configs/omap3_logic.h | 1 + include/configs/omap3_mvblx.h | 1 + include/configs/omap3_overo.h | 2 + include/configs/omap3_pandora.h | 1 + include/configs/omap3_zoom2.h | 1 + include/configs/omap4_common.h | 2 + include/configs/omap5_evm.h | 1 + include/configs/tam3517-common.h | 2 + include/cpsw.h | 51 + include/ns16550.h | 9 + 52 files changed, 1984 insertions(+), 524 deletions(-) delete mode 100644 arch/arm/include/asm/arch-am33xx/common_def.h delete mode 100644 board/isee/igep0020/config.mk delete mode 100644 board/isee/igep0030/config.mk delete mode 100644 board/ti/am335x/evm.c rename arch/arm/cpu/armv7/omap-common/gpio.c => drivers/gpio/omap_gpio.c (100%) create mode 100644 drivers/net/cpsw.c create mode 100644 include/cpsw.h Please note that my tree is based on current u-boot-arm/next and I've updated my next and master branches to the same content. I also did a quick test and all of these merge easily onto Wolfgang's current tree. Thanks!