On Thu, Mar 28, 2013 at 09:06:28PM +0100, Albert ARIBAUD wrote: > Hello Tom, > > Here is a pull request for u-boot-arm/master -- note it should appear > trivial and result in a fast-forward as ARM ToT is actually a merge of > mainline ToT so as to resolve minor manual merge issues. > > The following changes since commit > 417c55803118eb8e350d5ab8ba6583fb39f4e2e3: > > apx4devkit: change maintainer (2013-03-27 15:30:11 -0400) > > are available in the git repository at: > > git://git.denx.de/u-boot-arm master > > for you to fetch changes up to 009d75ccc11d27b9a083375a88bb93cb746b4800: > > Merge branch 'u-boot/master' into 'u-boot-arm/master' (2013-03-28 > 18:50:01 +0100) > > ---------------------------------------------------------------- > > Akshay Saraswat (8): > Exynos5: TMU: Add driver for Thermal Management Unit > Exynos5: FDT: Add TMU device node values > Exynos5: TMU: Add TMU init and status check > Exynos5: Config: Enable support for Exynos TMU driver > TMU: Add TMU support in dtt command > Exynos5: Config: Enable dtt command for TMU > Exynos5: TMU: Add hardware tripping > Exynos5: FDT: Add a H/W-trip member to TMU node > > Albert ARIBAUD (4): > Merge branch 'u-boot-ti/master' into 'u-boot-arm/master' > Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master' > Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master' > Merge branch 'u-boot/master' into 'u-boot-arm/master' > > 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 > > Enric Balletbo i Serra (2): > ARM: AM33XX: Fix typo that causes an AM duplication in CPU name. > igep00x0: Enable CONFIG_CMD_BOOTZ > > Koen Kooi (3): > am335x_evm: add support for BeagleBone Black DT name > am335x_evm: Enable CMD_EXT4 and CMD_FS_GENERIC, add bootpart to > env am335x_evm: Add more variables and switch to DT booting. > > Mark Jackson (2): > Allow AM335x MPU core clock speed to be specified in the board > config file Initialise correct GPMC WAITx irq for AM33xx > > Matt Porter (9): > am33xx: convert defines from am33xx-specific to generic names > am33xx: refactor emif4/ddr to support multiple EMIF instances > am33xx: refactor am33xx clocks and add ti814x support > am33xx: refactor am33xx mux support and add ti814x support > am33xx: add ti814x specific register definitions > am33xx: add dmm support to emif4 library > am33xx: support ti814x mmc reference clock > ns16550: enable quirks for ti814x > ti814x_evm: add ti814x evm board support > > Nikita Kiryanov (1): > cm-t35: add support for loading splash image from NAND > > Peter Korsgaard (2): > mmc: mmc_getcd/getwp: use sensible defaults > mmc: omap_hsmmc.c: only register getcd/getwp callbacks if gpio > could be used > > R Sricharan (2): > ARM: mmu: Introduce weak dram_bank_setup function > ARM: mmu: Set domain permissions to client access > > Rajeshwari Shinde (11): > EXYNOS5: Add function to setup set ps hold > SMDK5250: Add PMIC voltage settings > EXYNOS5: Add function to enable XXTI clock source > Sound: MAX98095: Add the driver for codec > Sound: Support for MAX98095 codec in driver > EXYNOS5: GPIO to enable MAX98095 > EXYNOS5: FDT: Add compatible strings for MAX98095 > config: Snow: Enable MAX98095 codec > SMDK5250: FDT: Retrieve board model via DT > EXYNOS5: Add initial DTS file for Snow. > EXYNOS5: Snow: Add a configuration file > > Simon Glass (1): > EXYNOS: Correct ordering of SPL machine_params > > Stephen Warren (9): > ARM: bcm2835: add mailbox driver > ARM: rpi_b: use bcm2835 mbox driver to get memory size > lcd: calculate line_length after lcd_ctrl_init() > ARM: rpi_b: disable rpi_b dcache explicitly > video: add a driver for the bcm2835 > mmc: add bcm2835 driver > ARM: rpi_b: enable SD controller, add related env/cmds > ARM: implement erratum 716044 workaround > ARM: tegra: enable workaround for ARM erratum 716044 > > Steve Kipisz (1): > am33xx:ddr:Fix config_sdram to work for all DDR > > Tom Rini (3): > am33xx: Add required includes to some omap/am33xx code > am335x_evm: Add better timings for the new BeagleBoard DDR3 part > arm: Correct CONFIG_STANDALONE_LOAD_ADDR for AM33XX/OMAP* > platforms > > 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 > > Vaibhav Hiremath (1): > am335x: Enable DDR PHY dynamic power down bit for DDR3 boards > > Vincent Stehl?? (2): > ARM: cache: declare set_section_dcache > armv7: do not relocate _start twice > > ??ukasz Majewski (1): > mmc:sdhci:fix: Change default interrupts enabled at SDHCI > initialization > > MAINTAINERS | 8 + > Makefile | 2 +- > README | 5 + > arch/arm/config.mk | 2 +- > arch/arm/cpu/arm1176/bcm2835/Makefile | 2 +- > arch/arm/cpu/arm1176/bcm2835/mbox.c | 164 ++++++ > arch/arm/cpu/armv7/Makefile | 2 +- > arch/arm/cpu/armv7/am33xx/Makefile | 3 +- > arch/arm/cpu/armv7/am33xx/board.c | 4 +- > .../cpu/armv7/am33xx/{clock.c => clock_am33xx.c} | 33 +- > arch/arm/cpu/armv7/am33xx/clock_ti814x.c | 406 > +++++++++++++++ arch/arm/cpu/armv7/am33xx/ddr.c | > 104 ++-- arch/arm/cpu/armv7/am33xx/emif4.c | 57 +- > arch/arm/cpu/armv7/am33xx/mem.c | 2 +- > arch/arm/cpu/armv7/am33xx/sys_info.c | 5 +- > arch/arm/cpu/armv7/cache_v7.c | 3 + > arch/arm/cpu/armv7/exynos/power.c | 45 ++ > arch/arm/cpu/armv7/omap-common/Makefile | 2 +- > arch/arm/cpu/armv7/omap-common/hwinit-common.c | 35 ++ > arch/arm/cpu/armv7/omap-common/lowlevel_init.S | 1 + > arch/arm/cpu/armv7/omap-common/timer.c | 1 + > arch/arm/cpu/armv7/start.S | 7 +- > arch/arm/dts/exynos5250.dtsi | 5 + > arch/arm/dts/tegra114.dtsi | 141 +++++ > arch/arm/include/asm/arch-am33xx/clock.h | 2 +- > arch/arm/include/asm/arch-am33xx/clocks_am33xx.h | 36 +- > arch/arm/include/asm/arch-am33xx/cpu.h | 11 +- > arch/arm/include/asm/arch-am33xx/ddr_defs.h | 75 ++- > arch/arm/include/asm/arch-am33xx/hardware.h | 40 +- > arch/arm/include/asm/arch-am33xx/hardware_am33xx.h | 54 ++ > arch/arm/include/asm/arch-am33xx/hardware_ti814x.h | 53 ++ > arch/arm/include/asm/arch-am33xx/mmc_host_def.h | 5 + > arch/arm/include/asm/arch-am33xx/mux.h | 235 +-------- > arch/arm/include/asm/arch-am33xx/mux_am33xx.h | 247 +++++++++ > arch/arm/include/asm/arch-am33xx/mux_ti814x.h | 311 +++++++++++ > arch/arm/include/asm/arch-am33xx/omap.h | 5 + > arch/arm/include/asm/arch-am33xx/spl.h | 5 + > arch/arm/include/asm/arch-am33xx/sys_proto.h | 2 + > arch/arm/include/asm/arch-bcm2835/mbox.h | 433 > +++++++++++++++ arch/arm/include/asm/arch-bcm2835/sdhci.h | > 24 + arch/arm/include/asm/arch-exynos/power.h | 24 + > arch/arm/include/asm/arch-exynos/spl.h | 3 +- > arch/arm/include/asm/arch-exynos/tmu.h | 58 +++ > 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 ++ > arch/arm/include/asm/cache.h | 2 + > arch/arm/include/asm/system.h | 14 + > arch/arm/lib/cache-cp15.c | 11 +- > board/cm_t35/cm_t35.c | 61 +++ > 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 +- > board/phytec/pcm051/board.c | 8 +- > board/raspberrypi/rpi_b/rpi_b.c | 47 +- > board/samsung/dts/exynos5250-smdk5250.dts | 13 + > board/samsung/dts/exynos5250-snow.dts | 58 +++ > board/samsung/smdk5250/smdk5250.c | 178 ++++++- > board/ti/am335x/board.c | 57 +- > board/ti/ti814x/Makefile | 46 ++ > board/ti/ti814x/evm.c | 198 +++++++ > board/ti/ti814x/evm.h | 7 + > board/ti/ti814x/mux.c | 51 ++ > boards.cfg | 2 + > common/cmd_dtt.c | 32 +- > common/lcd.c | 4 +- > doc/device-tree-bindings/exynos/tmu.txt | 44 ++ > drivers/mmc/Makefile | 1 + > drivers/mmc/bcm2835_sdhci.c | 189 +++++++ > drivers/mmc/mmc.c | 16 +- > drivers/mmc/omap_hsmmc.c | 8 +- > drivers/mmc/sdhci.c | 8 +- > drivers/mtd/nand/omap_gpmc.c | 1 + > drivers/mtd/spi/winbond.c | 5 + > drivers/net/cpsw.c | 1 + > drivers/power/Makefile | 1 + > drivers/power/exynos-tmu.c | 319 ++++++++++++ > drivers/serial/ns16550.c | 5 +- > drivers/sound/Makefile | 1 + > drivers/sound/max98095.c | 550 > ++++++++++++++++++++ > drivers/sound/max98095.h | 311 +++++++++++ > drivers/sound/sound.c | 9 +- > drivers/spi/Makefile | 6 +- > drivers/spi/fdt_spi.c | 186 +++++++ > drivers/spi/tegra114_spi.c | 405 > ++++++++++++++ drivers/spi/{tegra_spi.c => tegra20_sflash.c} | > 217 ++++---- drivers/spi/{tegra_slink.c => tegra20_slink.c} | 128 > +++-- drivers/video/Makefile | 1 + > drivers/video/bcm2835.c | 127 +++++ > include/configs/am335x_evm.h | 28 +- > include/configs/cardhu.h | 2 +- > include/configs/cm_t35.h | 4 + > include/configs/dalmore.h | 23 +- > include/configs/exynos5250-dt.h | 6 + > include/configs/igep00x0.h | 3 +- > include/configs/pcm051.h | 3 +- > include/configs/rpi_b.h | 79 > +++ .../uart-spi-switch.h => include/configs/snow.h | 35 +- > include/configs/tegra-common-post.h | 4 + > include/configs/tegra20-common.h | 1 + > include/configs/ti814x_evm.h | 221 ++++++++ > include/configs/trimslice.h | 2 +- > include/fdtdec.h | 3 + > include/power/max77686_pmic.h | 32 ++ > include/sound.h | 1 + > include/tmu.h | 46 ++ > lib/fdtdec.c | 3 + > spl/Makefile | 2 +- 116 files > changed, 6120 insertions(+), 882 deletions(-) create mode 100644 > arch/arm/cpu/arm1176/bcm2835/mbox.c rename > arch/arm/cpu/armv7/am33xx/{clock.c => clock_am33xx.c} (91%) create > mode 100644 arch/arm/cpu/armv7/am33xx/clock_ti814x.c create mode > 100644 arch/arm/include/asm/arch-am33xx/hardware_am33xx.h create mode > 100644 arch/arm/include/asm/arch-am33xx/hardware_ti814x.h create mode > 100644 arch/arm/include/asm/arch-am33xx/mux_am33xx.h create mode > 100644 arch/arm/include/asm/arch-am33xx/mux_ti814x.h create mode > 100644 arch/arm/include/asm/arch-bcm2835/mbox.h create mode 100644 > arch/arm/include/asm/arch-bcm2835/sdhci.h create mode 100644 > arch/arm/include/asm/arch-exynos/tmu.h 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 > board/nvidia/common/uart-spi-switch.c create mode 100644 > board/samsung/dts/exynos5250-snow.dts create mode 100644 > board/ti/ti814x/Makefile create mode 100644 board/ti/ti814x/evm.c > create mode 100644 board/ti/ti814x/evm.h > create mode 100644 board/ti/ti814x/mux.c > create mode 100644 doc/device-tree-bindings/exynos/tmu.txt > create mode 100644 drivers/mmc/bcm2835_sdhci.c > create mode 100644 drivers/power/exynos-tmu.c > create mode 100644 drivers/sound/max98095.c > create mode 100644 drivers/sound/max98095.h > 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} (56%) > rename drivers/spi/{tegra_slink.c => tegra20_slink.c} (72%) > create mode 100644 drivers/video/bcm2835.c > rename arch/arm/include/asm/arch-tegra20/uart-spi-switch.h => > include/configs/snow.h (50%) create mode 100644 > include/configs/ti814x_evm.h create mode 100644 include/tmu.h > > Amicalement,
Applied to u-boot/master, thanks! -- Tom
signature.asc
Description: Digital signature
_______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot