[U-Boot] please pull u-boot-samsung master

[Minkyu Kang <mk7.kang@samsung.com>]

Dear Albert,

On 12/01/13 06:33, Albert ARIBAUD wrote:
> Hi Minkyu,
> 
> On Fri, 11 Jan 2013 17:23:10 +0900, Minkyu Kang <mk7.kang@samsung.com>
> wrote:
>> Dear Albert,
>>
>>   Merge samsung, imx, tegra into u-boot-arm/master (2012-12-22 11:59:14 +0100)
>>
>> are available in the git repository at:
>>
>>
>>   git://git.denx.de/u-boot-samsung master
>>
>> for you to fetch changes up to a2468dedef569863e1243e802fbe3aa7565e1de1:
>>
>>   EXYNOS5: Enable console multiplexing in u-boot (2013-01-11 17:15:04 +0900)
>>
>> ----------------------------------------------------------------
>> Ajay Kumar (6):
>>       EXYNOS5: Add support for FIMD and DP
>>       EXYNOS5: Change parent clock of FIMD to MPLL
>>       EXYNOS: Add dummy definition to fix compilation dependency on CONFIG_EXYNOS_MIPI_DSIM
>>       video: Modify exynos_fimd driver to support LCD console
>>       EXYNOS5: Make all display related code dependent on CONFIG_LCD
>>       EXYNOS5: Enable console multiplexing in u-boot
>>
>> Chander Kashyap (4):
>>       EXYNOS: EXYNOS4X12: Populate Exynos4x12 register addresses
>>       EXYNOS: EXYNOS4X12: Add clock structure for EXYNOS4X12
>>       EXYNOS: EXYNOS4X12: Add gpio structure for EXYNOS4X12
>>       EXYNOS: EXYNOS4X12: extract Exynos4x12 IPs clock frequency
>>
>> Hatim RV (5):
>>       EXYNOS5: FDT: add initial dts file for EXYNOS5250, SMDK5250
>>       fdt: exynos5: Add DT node definition for SROM and SMSC9215
>>       exynos5: Add DT based driver for SMC911X ethernet
>>       exynos5: config: Rename the smdk5250.h to exynos5250-dt.h
>>       SMDK5250: config: Add configuration file for SMDK5250 board
>>
>> Jaehoon Chung (2):
>>       Exynos: clock: support get_mmc_clk for exynos
>>       Exynos: clock: add CLK_DIV_FSYS3 at set_mmc_clk
>>
>> Piotr Wilczek (1):
>>       arm:exynos4:pinmux: Modify the gpio function for mmc
>>
>> Rajeshwari Shinde (22):
>>       EXYNOS5: FDT: Add I2C device node data
>>       EXYNOS5 : FDT: Add Aliases for I2C device
>>       FDT: Add compatible string for I2C
>>       EXYNOS5: FDT : Decode peripheral id
>>       I2C: Driver changes for FDT support
>>       SMDK5250: Initialise I2C using FDT
>>       EXYNOS5: FDT: Add sound device node data
>>       EXYNOS5: FDT: Add sound and codec device node
>>       EXYNOS5: FDT: Add compatible strings for sound
>>       Sound: Add FDT support to driver
>>       Sound: WM8994: Add FDT support to codec
>>       Sound: Add FDT support to CMD.
>>       EXYNOS5: FDT: Add compatible strings for SPI
>>       EXYNOS5 : FDT: Add Aliases for SPI device
>>       EXYNOS5: FDT: Add SPI device node data
>>       SPI: EXYNOS: Add FDT support to driver.
>>       EHCI: Exynos: Add fdt support
>>       EXYNOS5: Add device node for USB.
>>       EXYNOS5: FDT: Add compatible strings for USB
>>       EXYNOS5: FDT: Add compatible strings for PMIC
>>       EXYNOS5: Add device node for PMIC
>>       PMIC: MAX77686: Add FDT Support
>>
>> Vivek Gautam (1):
>>       SMDK5250: Enable VBus for USB 2.0 controller
>>
>> ?ukasz Majewski (2):
>>       spl:falcon:trats Update Trats default board configuration file to support FALCON MODE
>>       video:cache:fix: Enable dcache flush at LCD subsystem for Exynos based boards
>>
>>  arch/arm/cpu/armv7/exynos/clock.c            |  272 +++++++++++++++++++++-
>>  arch/arm/cpu/armv7/exynos/pinmux.c           |   74 ++++++
>>  arch/arm/dts/exynos5250.dtsi                 |  154 ++++++++++++
>>  arch/arm/include/asm/arch-exynos/clk.h       |    1 +
>>  arch/arm/include/asm/arch-exynos/clock.h     |  276 ++++++++++++++++++++++
>>  arch/arm/include/asm/arch-exynos/cpu.h       |   48 +++-
>>  arch/arm/include/asm/arch-exynos/dp_info.h   |    2 +
>>  arch/arm/include/asm/arch-exynos/gpio.h      |   85 +++++++
>>  arch/arm/include/asm/arch-exynos/mipi_dsim.h |    7 +
>>  arch/arm/include/asm/arch-exynos/periph.h    |   33 +--
>>  arch/arm/include/asm/arch-exynos/pinmux.h    |    8 +
>>  arch/arm/include/asm/arch-exynos/sromc.h     |   18 ++
>>  board/samsung/dts/exynos5250-smdk5250.dts    |   69 ++++++
>>  board/samsung/smdk5250/smdk5250.c            |  237 +++++++++++++++----
>>  board/samsung/trats/trats.c                  |    2 +-
>>  common/cmd_sound.c                           |    2 +-
>>  doc/device-tree-bindings/exynos/isp-spi.txt  |   22 ++
>>  doc/device-tree-bindings/exynos/sound.txt    |   27 +++
>>  drivers/i2c/s3c24x0_i2c.c                    |   83 ++++++-
>>  drivers/i2c/s3c24x0_i2c.h                    |    8 +
>>  drivers/power/pmic/pmic_max77686.c           |   37 ++-
>>  drivers/sound/sound.c                        |  171 ++++++++------
>>  drivers/sound/wm8994.c                       |   74 +++++-
>>  drivers/sound/wm8994.h                       |    6 +-
>>  drivers/spi/exynos_spi.c                     |   96 +++++++-
>>  drivers/usb/host/ehci-exynos.c               |   92 +++++++-
>>  drivers/video/exynos_fb.c                    |    5 +
>>  drivers/video/exynos_fimd.c                  |   12 +-
>>  include/configs/exynos5250-dt.h              |  321 ++++++++++++++++++++++++++
>>  include/configs/smdk5250.h                   |  278 +---------------------
>>  include/configs/trats.h                      |   45 +++-
>>  include/fdtdec.h                             |    9 +
>>  include/i2c.h                                |   26 +++
>>  include/sound.h                              |    4 +-
>>  lib/fdtdec.c                                 |    9 +
>>  35 files changed, 2167 insertions(+), 446 deletions(-)
>>  create mode 100644 arch/arm/dts/exynos5250.dtsi
>>  create mode 100644 board/samsung/dts/exynos5250-smdk5250.dts
>>  create mode 100644 doc/device-tree-bindings/exynos/isp-spi.txt
>>  create mode 100644 doc/device-tree-bindings/exynos/sound.txt
>>  create mode 100644 include/configs/exynos5250-dt.h
>>
>> -- 
>> Thanks,
>> Minkyu Kang.
> 
> I'm sorry, but this branch breaks two boards:
> 
> - VCMA9 is broken by commit a9d2ae7014d9e66dde6dd4a344308449508e4a22,
>   which causes the following build errors:
> 
> In file included from s3c24x0_i2c.c:40:0:
> s3c24x0_i2c.h:38:17: error: field 'id' has incomplete type
> s3c24x0_i2c.c:70:39: error: 'CONFIG_MAX_I2C_NUM' undeclared here (not
>   in a function) s3c24x0_i2c.c:70:31: warning: 'i2c_bus' defined but
>   not used [-Wunused-variable] s3c24x0_i2c.c:72:12: warning:
>   'i2c_busses' defined but not used [-Wunused-variable]

checked.

> 
> - smdk5250 is broken by commit f482310c6def17ba975a041077f89d984be54b68
>   which causes the following build errors:
> 
> sound.c: In function 'codec_init':
> sound.c:151:4: warning: passing argument 1 of 'wm8994_init' discards
> 'const' qualifier from pointer target type [enabled by default] In file
> included from sound.c:33:0: wm8994.h:83:5: note: expected 'struct
> sound_codec_info *' but argument is of type 'const void *' cmd_sound.c:
> In function 'do_init': cmd_sound.c:36:2: error: too few arguments to
> function 'sound_init' In file included from cmd_sound.c:27:0:
> /home/albert/src/u-boot-arm/include/sound.h:52:5: note: declared here

But I could not get this result.
Did you pull all patches for sound?

commit 2b8a0533449c8c868636def683c04282a89a85cb
Sound: Add FDT support to CMD.

commit 6647c7ac8ed6ae8b5bda86df0671aea9ee3bc761
Sound: WM8994: Add FDT support to codec
    

commit f482310c6def17ba975a041077f89d984be54b68
Sound: Add FDT support to driver
    

commit 72dbff12a73291fb68d217e534eaed98d69ff5c5
EXYNOS5: FDT: Add compatible strings for sound


commit d1e8d2cad0be2f624d1d39b85c45eec7252017cd
EXYNOS5: FDT: Add sound and codec device node
    

commit f0b16191184e3ada6bda5b3c74302f815b719592
EXYNOS5: FDT: Add sound device node data

> 
> Both commits are from Rajeshwari Shinde <rajeshwari.s@samsung.com>,
> respectively with summaries:
> 
> "I2C: Driver changes for FDT support"
> 
> and
> 
> "Sound: Add FDT support to driver".
> 
> Rajesh, please fix build of VCMA9 and smdk5250. Minkyu, please
> integrate fixes then resubmit PR.
> 
> Amicalement,
> 

Thanks.
Minkyu Kang.