[U-Boot] [GIT PULL] Pull request: u-boot-imx

Albert ARIBAUD albert.u.boot at aribaud.net
Tue Oct 18 20:12:42 CEST 2011


Le 17/10/2011 10:05, Stefano Babic a écrit :
> Hi Albert,
>
> please pull from u-boot-imx, thanks. Generating the pull request I see
> that three patches are missing (the three patches by  Łukasz Majewski).
> However, everything in the tree seems correct and the tree is already
> rebased on uboot_arm. Let me know if you find any issue.
>
> The following changes since commit e36544d37385c4a4b525e18326feb3664d2268fa:
>
>    omap: overo: Disable pull-ups on camera PCLK, HS and VS signals
> (2011-10-14 22:15:13 +0200)
>
> are available in the git repository at:
>    git://www.denx.de/git/u-boot-imx.git master
>
> Fabio Estevam (2):
>        mx31pdk: Remove unneeded config
>        imx: fix coding style
>
> Helmut Raiger (1):
>        mx31: provide readable WEIM CS accessor
>
> Marek Vasut (1):
>        I2C: Add i2c_get/set_speed() to mxc_i2c.c
>
> Stefano Babic (15):
>        MX51: vision2: Set global macros
>        misc: pmic: Freescale PMIC switches to generic PMIC driver
>        MX5: vision2: use new pmic driver
>        RTC: Switch mc13783 to generic pmic code
>        MX3: qong: use new pmic driver
>        MX5: efikamx/efikasb: use new pmic driver
>        misc: pmic: use I2C_SET_BUS in pmic I2C
>        misc: pmic: addI2C  support to pmic_fsl driver
>        MX35: mx35pdk: use new pmic driver
>        MX5: mx51evk: use new pmic driver
>        MX5: mx53evk: use new pmic driver
>        MX31: mx31_litekit: use new pmic driver
>        MX31: mx31ads: use new pmic driver

Weird: these two commits:

>        misc:pmic:max8998 MAX8998 support at a new PMIC driver.
>        misc:pmic:samsung Enable PMIC driver at GONI target

are attributed to you whereas in your branch they are attributed to 
Łukasz Majewski -- plus a third one not mentioned above. I did a git 
request-pull on my side, and find the following entries:

Stefano Babic (15):
       MX51: vision2: Set global macros
       misc: pmic: Freescale PMIC switches to generic PMIC driver
       MX5: vision2: use new pmic driver
       RTC: Switch mc13783 to generic pmic code
       MX3: qong: use new pmic driver
       MX5: efikamx/efikasb: use new pmic driver
       misc: pmic: use I2C_SET_BUS in pmic I2C
       misc: pmic: addI2C  support to pmic_fsl driver
       MX35: mx35pdk: use new pmic driver
       MX5: mx51evk: use new pmic driver
       MX5: mx53evk: use new pmic driver
       MX31: mx31_litekit: use new pmic driver
       MX31: mx31ads: use new pmic driver
(the next two commits are missing in your list)
       MX31: mx31pdk: use new pmic driver
       misc: pmic: drop old Freescale's pmic driver

Łukasz Majewski (3):
(the next commit is missing in your list)
       misc:pmic:core New generic PMIC driver
(the next two commits are misattributed in your list)
       misc:pmic:max8998 MAX8998 support at a new PMIC driver.
       misc:pmic:samsung Enable PMIC driver at GONI target

Note that I find the same list of modifications as stated below, which 
implies that only the attribution list above is incorrect.

>   arch/arm/cpu/arm1136/mx31/generic.c         |   11 ++
>   arch/arm/cpu/arm1136/mx31/timer.c           |   23 ++-
>   arch/arm/cpu/arm1136/mx35/generic.c         |    2 +-
>   arch/arm/cpu/arm926ejs/mx25/generic.c       |  110 +++++++-------
>   arch/arm/cpu/arm926ejs/mx25/reset.c         |    2 +-
>   arch/arm/cpu/arm926ejs/mx25/timer.c         |   16 +-
>   arch/arm/cpu/arm926ejs/mx27/reset.c         |    2 +-
>   arch/arm/cpu/arm926ejs/mx27/timer.c         |   14 +-
>   arch/arm/cpu/armv7/mx5/soc.c                |   10 +-
>   arch/arm/include/asm/arch-mx31/imx-regs.h   |   35 ++++-
>   arch/arm/include/asm/arch-mx31/sys_proto.h  |   35 ++++
>   arch/arm/include/asm/arch-mx5/sys_proto.h   |    8 +
>   board/davedenx/qong/qong.c                  |  107 ++++++-------
>   board/efikamx/efikamx.c                     |   51 ++++---
>   board/freescale/mx31ads/mx31ads.c           |   16 ++-
>   board/freescale/mx31pdk/mx31pdk.c           |   14 ++-
>   board/freescale/mx35pdk/mx35pdk.c           |   18 ++-
>   board/freescale/mx51evk/mx51evk.c           |   47 +++---
>   board/freescale/mx53evk/mx53evk.c           |   17 ++-
>   board/imx31_phycore/imx31_phycore.c         |   41 ++++-
>   board/karo/tx25/tx25.c                      |    2 +-
>   board/logicpd/imx27lite/imx27lite.c         |    6 +-
>   board/logicpd/imx31_litekit/imx31_litekit.c |   30 +++-
>   board/samsung/goni/goni.c                   |    4 +
>   board/ttcontrol/vision2/vision2.c           |   33 +++--
>   boards.cfg                                  |    3 +-
>   drivers/i2c/mxc_i2c.c                       |   31 +++-
>   drivers/misc/Makefile                       |    6 +-
>   drivers/misc/fsl_pmic.c                     |  235
> ---------------------------
>   drivers/misc/pmic_core.c                    |  147 +++++++++++++++++
>   drivers/misc/pmic_fsl.c                     |   66 ++++++++
>   drivers/misc/pmic_i2c.c                     |   92 +++++++++++
>   drivers/misc/pmic_max8998.c                 |   43 +++++
>   drivers/misc/pmic_spi.c                     |  109 +++++++++++++
>   drivers/rtc/mc13783-rtc.c                   |   20 ++-
>   include/configs/efikamx.h                   |    5 +-
>   include/configs/imx31_litekit.h             |    9 +-
>   include/configs/mx31ads.h                   |    8 +-
>   include/configs/mx31pdk.h                   |    6 +-
>   include/configs/mx35pdk.h                   |    5 +-
>   include/configs/mx51evk.h                   |    6 +-
>   include/configs/mx53evk.h                   |    5 +-
>   include/configs/qong.h                      |    5 +-
>   include/configs/s5p_goni.h                  |    4 +
>   include/configs/vision2.h                   |   22 ++-
>   include/fsl_pmic.h                          |    5 +-
>   include/max8998_pmic.h                      |   84 ++++++++++
>   include/pmic.h                              |   71 ++++++++
>   48 files changed, 1110 insertions(+), 531 deletions(-)
>   create mode 100644 arch/arm/include/asm/arch-mx31/sys_proto.h
>   delete mode 100644 drivers/misc/fsl_pmic.c
>   create mode 100644 drivers/misc/pmic_core.c
>   create mode 100644 drivers/misc/pmic_fsl.c
>   create mode 100644 drivers/misc/pmic_i2c.c
>   create mode 100644 drivers/misc/pmic_max8998.c
>   create mode 100644 drivers/misc/pmic_spi.c
>   create mode 100644 include/max8998_pmic.h
>   create mode 100644 include/pmic.h

Can you double-check this u-boot-imx/master branch?

> Thanks,
> Stefano

Amicalement,
-- 
Albert.


More information about the U-Boot mailing list