Hi Stefano,
On Fri, 03 Jan 2014 15:51:14 +0100, Stefano Babic sbabic@denx.de wrote:
On 02/01/2014 17:25, Stefano Babic wrote:
Hi Albert,
my first pull-request in 2014 ! Please pull from u-boot-imx, thanks !
Albert, I forget to merge some further patches. This is my updated PULL request:
The following changes since commit 56eb3da43fab5990a4b7bc118b76c7cae2ceb140:
arm, am335x: update for the siemens boards (2013-11-12 09:53:59 -0500)
are available in the git repository at:
git://www.denx.de/git/u-boot-imx.git master
for you to fetch changes up to 4611d5bab26f93471b84f6f33967cef69b3f723a:
arm: mx5: Add fuse supply enable in fsl_iim (2014-01-03 15:44:06 +0100)
Eric Nelson (8): i.MX6DQ/DLS: replace pad names with their Linux kernel equivalents i.MX6DQ/DLS: remove useless mux/pad declarations i.MX6DQ: Add Pinmux settings that are present in mainline and Dual-Lite/Solo i.MX6DQ/DLS: remove unused pad declarations i.MX6DQ/DLS: whitespace: Align IOMUX_PAD column in declarations imx-common: remove extraneous semicolon from macro i.MX6 (DQ/DLS): use macros for mux and pad declarations ARM: mx6: Update non-Freescale boards to include CPU errata.
Fabio Estevam (24): configs: imx: Make CONFIG_SYS_PROMPT uniform across FSL boards wandboard: Return the error immediately when ipuv3_fb_init() fails wandboard: Return the error when cpu_eth_init() fails titanium: Return the error when cpu_eth_init() fails nitrogen6x: Remove unused OCOTP options mx51evk: Fix pmic_init() argument mx31pdk: Fix pmic_init() argument efikamx: Fix pmic_init() argument power: power_fsl: Pass p->bus in the same way for SPI and I2C cases mx6sabresd: Fix wrong colors in LVDS splash mx6sabresd: Add SPI NOR support imx: Explicitly pass the I2C bus number in pmic_init() configs: imx: Remove CONFIG_SYS_SPD_BUS_NUM option mx6: clock: Fix the calculation of PLL_ENET frequency mx6sabresd: Allow probing HSYNC, VSYNC and DISP_CLK signals mx6sabresd: Fix LVDS width and color format doc: README.fuse: Add an example on how to use the fuse API on mx6q mx6sabre_common.h: Add CONFIG_CMD_FUSE support mx6: soc: Staticize set_vddsoc() mx6: soc: Clear the LDO ramp values up prior to setting the LDO voltages mx6: soc: Set the VDDSOC at 1.175 V mx6: soc: Introduce set_ldo_voltage() mx6: soc: Add the required LDO ramp up delay mx6: soc: Disable VDDPU regulator
Frank Li (1): imx6: fix random hang when download by usb
Giuseppe Pagano (5): udoo: Move and optimize platform register setting. udoo: Add ethernet support (FEC + Micrel KSZ9031). udoo: Fix watchdog during kernel boot. nitrogen6x: Move setup_sata to common part udoo: Add SATA support on uDoo Board.
Liu Ying (1): MX6 SabreSD: Use readl() to read the CCM_CCGR3 register
Marek Vasut (3): Net: FEC: Fix huge memory leak ARM: mx53: video: Add IPUv3 LCD support for M53EVK ARM: mxs: tools: Fix errno handling in strtoul() invocation
Michael Heimpold (1): mxs_gpio: fix the handling in gpio_direction_output()
Otavio Salvador (6): imx: Easy enabling of SION per-pin using MUX_MODE_SION helper macro mx28evk: Use 512k for fdt partition to align it mx28evk: Add 'nandboot' environment command mx28evk: Extend environment to easy write of NAND system ARM: mx6: Change the FDT loading address to avoid overlaping ARM: mx6: Allow enablement of FEC Anatop based clock for all MX6
Sergey Alyoshin (1): arm: mx5: Add fuse supply enable in fsl_iim
Stefan Roese (1): mx6: titanium: Move BSP code to barco board directory
Stefano Babic (1): MX6: fix sata compilation for i.MX6
arch/arm/cpu/armv7/mx5/clock.c | 12 + arch/arm/cpu/armv7/mx6/clock.c | 23 +- arch/arm/cpu/armv7/mx6/soc.c | 110 +- arch/arm/imx-common/Makefile | 3 + arch/arm/imx-common/cpu.c | 4 +- arch/arm/imx-common/sata.c | 34 + arch/arm/include/asm/arch-mx5/clock.h | 1 + arch/arm/include/asm/arch-mx5/crm_regs.h | 3 + arch/arm/include/asm/arch-mx6/crm_regs.h | 1 + arch/arm/include/asm/arch-mx6/imx-regs.h | 23 + arch/arm/include/asm/arch-mx6/mx6-pins.h | 33 +- arch/arm/include/asm/arch-mx6/mx6dl_pins.h | 2728 +++++++++------------- arch/arm/include/asm/arch-mx6/mx6q_pins.h | 2642 ++++++++------------- arch/arm/include/asm/arch-mx6/sys_proto.h | 2 - arch/arm/include/asm/imx-common/iomux-v3.h | 2 + arch/arm/include/asm/imx-common/sata.h | 16 + board/{freescale => barco}/titanium/Makefile | 0 board/{freescale => barco}/titanium/imximage.cfg | 0 board/{freescale => barco}/titanium/titanium.c | 110 +- board/boundary/nitrogen6x/nitrogen6x.c | 197 +- board/congatec/cgtqmx6eval/cgtqmx6eval.c | 40 +- board/denx/m53evk/m53evk.c | 73 + board/freescale/mx25pdk/mx25pdk.c | 2 +- board/freescale/mx31pdk/mx31pdk.c | 2 +- board/freescale/mx35pdk/mx35pdk.c | 2 +- board/freescale/mx51evk/mx51evk.c | 2 +- board/freescale/mx53evk/mx53evk.c | 2 +- board/freescale/mx53loco/mx53loco.c | 2 +- board/freescale/mx6qarm2/mx6qarm2.c | 68 +- board/freescale/mx6qsabreauto/mx6qsabreauto.c | 62 +- board/freescale/mx6sabresd/mx6sabresd.c | 155 +- board/genesi/mx51_efikamx/efikamx.c | 2 +- board/udoo/1066mhz_4x256mx16.cfg | 55 + board/udoo/clocks.cfg | 32 + board/udoo/ddr-setup.cfg | 87 + board/udoo/udoo.c | 165 +- board/udoo/udoo.cfg | 29 + board/wandboard/wandboard.c | 60 +- boards.cfg | 4 +- doc/README.imx6 | 76 + drivers/gpio/mxs_gpio.c | 4 +- drivers/misc/fsl_iim.c | 13 +- drivers/net/fec_mxc.c | 177 +- drivers/power/power_fsl.c | 3 +- include/configs/cgtqmx6eval.h | 2 +- include/configs/imx31_phycore.h | 1 - include/configs/m53evk.h | 16 + include/configs/mx25pdk.h | 2 - include/configs/mx28evk.h | 56 +- include/configs/mx31pdk.h | 1 - include/configs/mx35pdk.h | 2 - include/configs/mx51evk.h | 1 - include/configs/mx53ard.h | 1 - include/configs/mx53evk.h | 2 - include/configs/mx53loco.h | 2 - include/configs/mx53smd.h | 2 - include/configs/mx6_common.h | 1 + include/configs/mx6qarm2.h | 1 - include/configs/mx6sabre_common.h | 20 +- include/configs/nitrogen6x.h | 13 +- include/configs/titanium.h | 1 + include/configs/udoo.h | 31 +- include/configs/wandboard.h | 3 +- include/micrel.h | 5 + tools/mxsimage.c | 1 + 65 files changed, 3444 insertions(+), 3781 deletions(-) create mode 100644 arch/arm/imx-common/sata.c create mode 100644 arch/arm/include/asm/imx-common/sata.h rename board/{freescale => barco}/titanium/Makefile (100%) rename board/{freescale => barco}/titanium/imximage.cfg (100%) rename board/{freescale => barco}/titanium/titanium.c (66%) create mode 100644 board/udoo/1066mhz_4x256mx16.cfg create mode 100644 board/udoo/clocks.cfg create mode 100644 board/udoo/ddr-setup.cfg create mode 100644 board/udoo/udoo.cfg
Thanks, Stefano
Applied to u-boot-arm/master (with a cosmetic merge conflict resolution on include/micrel.h), thanks!
Amicalement,