On Fri, Sep 21, 2012 at 11:35:17PM +0200, Albert ARIBAUD wrote:

Hello Wolfgang,

The following changes since commit 6e2fbdea1b26d75314d87c380a36b0015bf824cf:

Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging (2012-09-02 00:44:09 +0200)

are available in the git repository at:

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

for you to fetch changes up to d193c1b6eb05041c94ad9aacd8c94189d1dbc5f8:

Merge remote-tracking branch 'u-boot-imx/master' (2012-09-21 00:26:19 +0200)

---

Albert ARIBAUD (4): edminiv2: orion5x: fix GPIO inits and values Merge remote-tracking branch 'u-boot-atmel/master' into m Merge remote-tracking branch 'u-boot-ti/master' into m Merge remote-tracking branch 'u-boot-imx/master'

Arnout Vandecappelle (Essensium/Mind) (1): OMAP3: add definition of CTRL_WKUP_CTRL register

Ashok Kumar Reddy (2): ima3-mx53:Rename CONFIG_PRIME => CONFIG_ETHPRME, remove mx6qsabrelite:Use IMX_GPIO_NR Macro

Beno??t Th??baudeau (8): mx35: Fix decode_pll mx35: Add definitions for clock gate values mx35: Fix clock dividers mx25: Define default SoC input clock frequencies mx35: Define default SoC input clock frequencies mx35 timer: Switch to 32-kHz source Fix mx31_decode_pll mx31: Define default SoC input clock frequencies

Fabio Estevam (3): mx28evk: Convert to mxs_adjust_memory_params() mx28evk: Add USB Ethernet support mx35pdk: README: Remove NAND references

Holger Brunck (1): arm/km: remove unused code

Jens Scharsig (2): eb_cpux9k2: fix chip select atmel: eb_cpux9k2: add ram target configuration

Jim Lin (1): tegra: nand: Add Tegra NAND driver

Karl O. Pinc (2): Cosmetic doc typo fixes to the kwbimage feature docs cosmetic: Better explain how to use the kirkwood kwbimage.cfg file.

Linus Walleij (1): integrator: break out common config

Lucas Stach (1): tegra20: usb: rework set_host_mode

Marek Vasut (7): M28: Fix the use of gpmi-nand in mtdparts MX28: Cleanup mxsboot within make mrproper MX28: Fixup the ad-hoc use of DIGCTL_MICROSECONDS SCSPS1: Enable caches MX28: SPI: Fix the DMA DCache race condition MX28: SPI: Fix the DMA chaining MX28: MMC: Avoid DMA DCache race condition

Markus Hubig (2): arm: Adds board_postclk_init to the init_sequence. Fixes the crippled console output on PortuxG20.

Matt Sealey (1): efikamx: refine USB support

Michael Walle (1): lsxl: support power switch

Otavio Salvador (3): MX28: mx28evk: Align SSP clock speed MX28: mx28evk: Enable SPI DMA mx28evk: extend default environment

Simon Glass (5): nand: Try to align the default buffers tegra: Add NAND support to funcmux tegra: fdt: Add NAND controller binding and definitions tegra: fdt: Add NAND definitions to fdt tegra: Enable NAND on Seaboard

Stefano Babic (12): OMAP3: tam3517: add function to read MAC from EEPROM OMAP3: twister : get MAC address from EEPROM OMAP3: mt_ventoux: Correct board pinmux OMAP3: mt_ventoux: activate GPIO4 OMAP3: mt_ventoux: read MAC address from EEPROM OMAP3: mt_ventoux: disable the buzzer at start-up video: drop duplicate set of DISPC_CONFIG register OMAP3: video: add macros to set display parameters OMAP3: mt_ventoux: added video support MX: set a common place to share code for Freescale i.MX MX35: mx35pdk: add support for MMC MX6: drop binary constants from iomux header

Stephen Warren (6): tegra: enable NAND on Harmony mmc: detect boot sectors using EXT_CSD_BOOT_MULT too env_mmc: allow environment to be in an eMMC partition tegra: put eMMC environment into the boot sectors ARM: tegra: remove redundant mkdirs from board Makefiles ARM: tegra: fix Ventana standalone build

Thierry Reding (2): cmd_nand: dump: Align data and OOB buffers tegra: Enable NAND on TEC

Tom Rini (1): am33xx: Remove redundant timer config

Tom Warren (2): Tegra: Change Tegra20 to Tegra in common code, prep for T30 NAND: MXS: include common.h first so cache.h is included in correct order

Valentin Longchamp (4): km/arm: set SPI NOR Flash default parameters kw_spi: fix clock prescaler computation km/ivm: fix string len check to support 7 char board names arm/km: fix frequency of the SPI NOR Flash

Makefile | 8 +- arch/arm/cpu/arm1136/mx31/generic.c | 12 +- arch/arm/cpu/arm1136/mx31/timer.c | 16 +- arch/arm/cpu/arm1136/mx35/generic.c | 90 +- arch/arm/cpu/arm1136/mx35/timer.c | 46 +- arch/arm/cpu/arm720t/tegra20/cpu.c | 8 +- arch/arm/cpu/arm926ejs/mx25/generic.c | 2 +- arch/arm/cpu/arm926ejs/mx25/timer.c | 16 +- arch/arm/cpu/arm926ejs/mxs/spl_boot.c | 8 +- arch/arm/cpu/arm926ejs/orion5x/cpu.c | 2 + arch/arm/cpu/armv7/am33xx/board.c | 20 - arch/arm/cpu/armv7/tegra20/cmd_enterrcm.c | 2 +- arch/arm/cpu/armv7/tegra20/usb.c | 37 +- arch/arm/cpu/tegra20-common/Makefile | 2 +- arch/arm/cpu/tegra20-common/ap20.c | 6 +- arch/arm/cpu/tegra20-common/board.c | 14 +- arch/arm/cpu/tegra20-common/funcmux.c | 7 + arch/arm/cpu/tegra20-common/warmboot.c | 14 +- arch/arm/cpu/tegra20-common/warmboot_avp.c | 2 +- arch/arm/dts/tegra20.dtsi | 7 + arch/arm/{cpu/armv7 => }/imx-common/Makefile | 4 +- arch/arm/{cpu/armv7 => }/imx-common/cmd_bmode.c | 0 arch/arm/{cpu/armv7 => }/imx-common/cpu.c | 0 .../imx-common/i2c.c => imx-common/i2c-mxv7.c} | 0 arch/arm/{cpu/armv7 => }/imx-common/iomux-v3.c | 0 arch/arm/{cpu/armv7 => }/imx-common/speed.c | 0 arch/arm/{cpu/armv7 => }/imx-common/timer.c | 0 arch/arm/include/asm/arch-kirkwood/spi.h | 1 + arch/arm/include/asm/arch-mx25/clock.h | 14 + arch/arm/include/asm/arch-mx31/clock.h | 14 + arch/arm/include/asm/arch-mx35/clock.h | 14 + arch/arm/include/asm/arch-mx35/crm_regs.h | 48 +- arch/arm/include/asm/arch-mx6/iomux.h | 124 +-- arch/arm/include/asm/arch-omap3/dss.h | 11 +- arch/arm/include/asm/arch-omap3/mux.h | 5 + arch/arm/include/asm/arch-tegra20/ap20.h | 3 - arch/arm/include/asm/arch-tegra20/funcmux.h | 3 + arch/arm/include/asm/arch-tegra20/mmc.h | 8 +- arch/arm/include/asm/arch-tegra20/sys_proto.h | 4 +- arch/arm/include/asm/arch-tegra20/tegra20.h | 13 +- .../arm/include/asm/arch-tegra20}/tegra_mmc.h | 12 +- arch/arm/include/asm/arch-tegra20/tegra_spi.h | 2 +- arch/arm/include/asm/arch-tegra20/timer.h | 4 +- arch/arm/lib/board.c | 3 + board/BuS/eb_cpux9k2/cpux9k2.c | 6 +- board/Marvell/sheevaplug/kwbimage.cfg | 4 +- board/avionic-design/common/tamonten.c | 2 +- board/avionic-design/dts/tegra20-tec.dts | 11 + board/buffalo/lsxl/lsxl.c | 22 +- board/compal/paz00/paz00.c | 4 +- board/compulab/trimslice/trimslice.c | 4 +- board/freescale/mx28evk/iomux.c | 2 +- board/freescale/mx28evk/mx28evk.c | 4 +- board/freescale/mx35pdk/README | 78 +- board/freescale/mx35pdk/mx35pdk.c | 25 + board/freescale/mx6qsabrelite/mx6qsabrelite.c | 24 +- board/genesi/mx51_efikamx/Makefile | 6 +- board/genesi/mx51_efikamx/efikamx-usb.c | 12 + board/genesi/mx51_efikamx/efikamx.c | 3 - board/keymile/common/ivm.c | 2 +- board/keymile/km_arm/km_arm.c | 20 - board/nvidia/common/board.c | 8 +- board/nvidia/dts/tegra20-harmony.dts | 10 + board/nvidia/dts/tegra20-seaboard.dts | 10 + board/nvidia/harmony/Makefile | 4 - board/nvidia/harmony/harmony.c | 4 +- board/nvidia/seaboard/Makefile | 4 - board/nvidia/seaboard/seaboard.c | 4 +- board/nvidia/ventana/Makefile | 4 +- board/nvidia/whistler/Makefile | 4 - board/nvidia/whistler/whistler.c | 4 +- board/taskit/stamp9g20/stamp9g20.c | 21 +- board/technexion/twister/twister.c | 10 + board/teejet/mt_ventoux/mt_ventoux.c | 113 +++ board/teejet/mt_ventoux/mt_ventoux.h | 80 +- boards.cfg | 3 +- common/cmd_nand.c | 4 +- common/env_mmc.c | 64 +- doc/README.kwbimage | 19 +- .../nand/nvidia,tegra20-nand.txt | 53 + drivers/gpio/tegra_gpio.c | 8 +- drivers/i2c/tegra_i2c.c | 12 +- drivers/input/Makefile | 2 +- drivers/mmc/mmc.c | 3 +- drivers/mmc/mxsmmc.c | 4 + drivers/mmc/tegra_mmc.c | 34 +- drivers/mtd/nand/Makefile | 1 + drivers/mtd/nand/mxs_nand.c | 2 +- drivers/mtd/nand/nand_base.c | 3 +- drivers/mtd/nand/tegra_nand.c | 1026 ++++++++++++++++++++ drivers/mtd/nand/tegra_nand.h | 257 +++++ drivers/spi/kirkwood_spi.c | 5 +- drivers/spi/mxs_spi.c | 58 +- drivers/spi/tegra_spi.c | 6 +- drivers/video/omap3_dss.c | 3 +- include/configs/eb_cpux9k2.h | 7 +- include/configs/edminiv2.h | 13 +- include/configs/flea3.h | 1 - include/configs/harmony.h | 19 +- include/configs/ima3-mx53.h | 3 +- include/configs/imx31_litekit.h | 1 - include/configs/imx31_phycore.h | 1 - include/configs/integrator-common.h | 103 ++ include/configs/integratorap.h | 49 +- include/configs/integratorcp.h | 115 +-- include/configs/km/keymile-common.h | 1 - include/configs/km/km_arm.h | 6 +- include/configs/m28evk.h | 4 +- include/configs/medcom.h | 6 +- include/configs/mt_ventoux.h | 17 + include/configs/mx25pdk.h | 1 - include/configs/mx28evk.h | 86 +- include/configs/mx31ads.h | 2 - include/configs/mx31pdk.h | 2 - include/configs/mx35pdk.h | 18 +- include/configs/paz00.h | 9 +- include/configs/plutux.h | 6 +- include/configs/qong.h | 2 - include/configs/sc_sps_1.h | 2 - include/configs/seaboard.h | 30 +- include/configs/stamp9g20.h | 1 + include/configs/tam3517-common.h | 66 ++ include/configs/tec.h | 18 +- .../{tegra20-common-post.h => tegra-common-post.h} | 12 +- include/configs/tegra20-common.h | 14 +- include/configs/trimslice.h | 8 +- include/configs/tt01.h | 2 - include/configs/ventana.h | 9 +- include/configs/whistler.h | 11 +- include/configs/zmx25.h | 1 - include/fdtdec.h | 1 + include/linux/mtd/nand.h | 7 +- include/mmc.h | 1 + lib/fdtdec.c | 1 + 134 files changed, 2522 insertions(+), 816 deletions(-) rename arch/arm/{cpu/armv7 => }/imx-common/Makefile (94%) rename arch/arm/{cpu/armv7 => }/imx-common/cmd_bmode.c (100%) rename arch/arm/{cpu/armv7 => }/imx-common/cpu.c (100%) rename arch/arm/{cpu/armv7/imx-common/i2c.c => imx-common/i2c-mxv7.c} (100%) rename arch/arm/{cpu/armv7 => }/imx-common/iomux-v3.c (100%) rename arch/arm/{cpu/armv7 => }/imx-common/speed.c (100%) rename arch/arm/{cpu/armv7 => }/imx-common/timer.c (100%) rename {drivers/mmc => arch/arm/include/asm/arch-tegra20}/tegra_mmc.h (96%) create mode 100644 doc/device-tree-bindings/nand/nvidia,tegra20-nand.txt create mode 100644 drivers/mtd/nand/tegra_nand.c create mode 100644 drivers/mtd/nand/tegra_nand.h create mode 100644 include/configs/integrator-common.h rename include/configs/{tegra20-common-post.h => tegra-common-post.h} (96%)

Applied to u-boot/master, thanks!