| Message ID | 4ED7A7E0.9050208@denx.de |
|---|---|
| State | Superseded |
| Delegated to: | Albert ARIBAUD |
| Headers | show |
Hi Stefano, Le 01/12/2011 17:14, Stefano Babic a écrit : > Hi Albert, > > please pull from u-boot-imx, thanks. > > The following changes since commit 3be4bab07b614c23f3bffaa6febca9a5a2c4dfa6: > > vision2: Fix checkpatch warning (2011-11-28 13:10:36 +0100) > > are available in the git repository at: > git://www.denx.de/git/u-boot-imx.git master > > Fabio Estevam (5): > mx53loco: Configure the pins as GPIOs prior to using gpio_get_value > mx53ard: Configure the pins as GPIOs prior to using gpio_get_value > mx53evk: Configure the pins as GPIOs prior to using gpio_get_value > mx53smd: Configure the pins as GPIOs prior to using gpio_get_value > mx51evk: Configure the pins as GPIOs prior to using gpio_get_value > > Marek Vasut (3): > MC13892: Add REGMODE0 bits definitions > Efika: Configure additional regulators for HDMI output > MXS: Add static annotations to dma driver > > Robert Deliën (1): > M28: Fix OB1 bug in GPIO driver > > Simon Glass (1): > mx5: Correct a warning in clock.c > > Stefano Babic (2): > MX: serial_mxc: cleanup removing nasty #ifdef > MX35: flea3: changes due to hardware revision B > > Wolfram Sang (1): > apbh_dma: return error value on timeout Hmm... Your master is based on my next, not on my master. Do you intend me to add these onto my 'next' or 'master' branch? Amicalement,
On 05/12/2011 17:57, Albert ARIBAUD wrote: > > Hmm... Your master is based on my next, not on my master. Do you intend > me to add these onto my 'next' or 'master' branch? Sorry, I have applied the wrong script, I presume. I will send a new pull request soon. Best regards, Stefano Babic
Hi Albert, please pull from u-boot-imx, thanks. The following changes since commit 3be4bab07b614c23f3bffaa6febca9a5a2c4dfa6: vision2: Fix checkpatch warning (2011-11-28 13:10:36 +0100) are available in the git repository at: git://www.denx.de/git/u-boot-imx.git master Fabio Estevam (5): mx53loco: Configure the pins as GPIOs prior to using gpio_get_value mx53ard: Configure the pins as GPIOs prior to using gpio_get_value mx53evk: Configure the pins as GPIOs prior to using gpio_get_value mx53smd: Configure the pins as GPIOs prior to using gpio_get_value mx51evk: Configure the pins as GPIOs prior to using gpio_get_value Marek Vasut (3): MC13892: Add REGMODE0 bits definitions Efika: Configure additional regulators for HDMI output MXS: Add static annotations to dma driver Robert Deliën (1): M28: Fix OB1 bug in GPIO driver Simon Glass (1): mx5: Correct a warning in clock.c Stefano Babic (2): MX: serial_mxc: cleanup removing nasty #ifdef MX35: flea3: changes due to hardware revision B Wolfram Sang (1): apbh_dma: return error value on timeout arch/arm/cpu/arm1136/mx31/devices.c | 4 - arch/arm/cpu/armv7/mx5/clock.c | 2 +- arch/arm/include/asm/arch-mx25/imx-regs.h | 10 +- arch/arm/include/asm/arch-mx27/imx-regs.h | 8 +- arch/arm/include/asm/arch-mx28/dma.h | 25 ---- arch/arm/include/asm/arch-mx31/imx-regs.h | 6 + arch/arm/include/asm/arch-mx35/imx-regs.h | 6 +- arch/arm/include/asm/arch-mx5/imx-regs.h | 6 +- board/CarMediaLab/flea3/flea3.c | 4 +- board/efikamx/efikamx.c | 15 ++- board/freescale/mx51evk/mx51evk.c | 3 + board/freescale/mx53ard/mx53ard.c | 3 + board/freescale/mx53evk/mx53evk.c | 3 + board/freescale/mx53loco/mx53loco.c | 3 + board/freescale/mx53smd/mx53smd.c | 1 + drivers/dma/apbh_dma.c | 211 +++++++---------------------- drivers/gpio/mxs_gpio.c | 2 +- drivers/serial/serial_mxc.c | 37 +----- include/configs/efikamx.h | 2 +- include/configs/flea3.h | 22 ++-- include/configs/imx27lite-common.h | 2 +- include/configs/imx31_litekit.h | 4 +- include/configs/imx31_phycore.h | 2 +- include/configs/mx25pdk.h | 2 +- include/configs/mx31ads.h | 4 +- include/configs/mx31pdk.h | 2 +- include/configs/mx35pdk.h | 2 +- include/configs/mx51evk.h | 2 +- include/configs/mx53ard.h | 2 +- include/configs/mx53evk.h | 2 +- include/configs/mx53loco.h | 2 +- include/configs/mx53smd.h | 2 +- include/configs/qong.h | 4 +- include/configs/tt01.h | 2 +- include/configs/tx25.h | 2 +- include/configs/vision2.h | 2 +- include/configs/zmx25.h | 2 +- include/mc13892.h | 16 +++ 38 files changed, 153 insertions(+), 276 deletions(-)