please pull u-boot-samsung master

Dear Albert,

The following changes since commit 7737c994609ffb50194d5ddb67467ae0fcd8f775:

net2big_v2: initialize LEDs at startup (2013-06-20 14:01:23 +0530)

are available in the git repository at:

git://git.denx.de/u-boot-samsung master

for you to fetch changes up to 9dfa3d0734df4aad107def2c900d1514ac7510ac:

power:bat:trats: Break battery charging with ctrl+C (2013-07-05 18:46:14 +0900)

----------------------------------------------------------------
Ajay Kumar (1):
video: exynos_fb: Add the missing #else clause

Amar (1):
EXYNOS5: I2C: Add FDT and non-FDT support for I2C

Axel Lin (2):
gpio: s3c2440_gpio: Fix wrong writel arguments
gpio: s5p_gpio: Call s5p_gpio_set_value() instead of open-code

Bernie Thompson (1):
exynos: Adjust the starting MIF voltage to 1.05v

Rajeshwari Shinde (9):
EXYNOS5: FDT: Add compatible strings for Serial
EXYNOS5: FDT: Add serial device node values
S5P: Serial: Add fdt support to driver
CONFIG: EXYNOS5: Enable silent console
SMDK5250: Remove reduntant code
EXYNOS: Add API for power reset and exit wakeup
EXYNOS: LDS file move to common
EXYNOS4210: Configure GPIO for uart
EXYNOS: Move files from board/samsung to arch/arm

Simon Glass (1):
exynos: Enable mmc for snow

?ukasz Majewski (2):
arm:trats: Increase malloc pool size (for DFU ext4 transfers) power:bat:trats: Break battery charging with ctrl+C

 arch/arm/cpu/armv7/exynos/Makefile                 |   17 +-
 .../arm/cpu/armv7/exynos}/clock_init.h             |    0
 arch/arm/cpu/armv7/exynos/clock_init_exynos4.c     |   95 +++++
 .../arm/cpu/armv7/exynos/clock_init_exynos5.c      |   56 +--
 arch/arm/cpu/armv7/exynos/common_setup.h           |   45 +++
 .../arm/cpu/armv7/exynos}/dmc_common.c             |    7 +-
 .../arm/cpu/armv7/exynos}/dmc_init_ddr3.c          |   27 +-
 arch/arm/cpu/armv7/exynos/dmc_init_exynos4.c       |  213 ++++++++++
 .../arm/cpu/armv7/exynos/exynos4_setup.h           |  397 +++++++++---------
 .../arm/cpu/armv7/exynos/exynos5_setup.h           |   28 +-
 arch/arm/cpu/armv7/exynos/lowlevel_init.c          |   73 ++++
 arch/arm/cpu/armv7/exynos/pinmux.c                 |   40 ++
 arch/arm/cpu/armv7/exynos/power.c                  |   50 +++
 .../arm/cpu/armv7/exynos}/spl_boot.c               |   84 +++-
 arch/arm/dts/exynos5250.dtsi                       |   27 ++
 arch/arm/include/asm/arch-exynos/cpu.h             |   13 +-
 arch/arm/include/asm/arch-exynos/power.h           |   12 +
 arch/arm/include/asm/arch-exynos/spl.h             |    1 +
 .../exynos-uboot-spl.lds}                          |    0
 board/samsung/dts/exynos5250-smdk5250.dts          |    2 +
 board/samsung/dts/exynos5250-snow.dts              |   26 ++
 board/samsung/origen/Makefile                      |   11 +-
 board/samsung/origen/lowlevel_init.S               |  357 -----------------
 board/samsung/origen/mem_setup.S                   |  421 --------------------
 board/samsung/origen/mmc_boot.c                    |   58 ---
 board/samsung/origen/origen.c                      |   46 +++
 board/samsung/smdk5250/Makefile                    |   14 +-
 board/samsung/smdk5250/smdk5250.c                  |    2 +-
 board/samsung/smdkv310/Makefile                    |   10 +-
 board/samsung/smdkv310/lowlevel_init.S             |  414 -------------------
 board/samsung/smdkv310/mem_setup.S                 |  365 -----------------
 board/samsung/smdkv310/mmc_boot.c                  |   60 ---
 board/samsung/smdkv310/smdkv310.c                  |   46 +++
 drivers/gpio/s3c2440_gpio.c                        |    6 +-
 drivers/gpio/s5p_gpio.c                            |    9 +-
 drivers/i2c/s3c24x0_i2c.c                          |   12 +-
 drivers/power/battery/bat_trats.c                  |   13 +-
 drivers/power/power_core.c                         |    3 +-
 drivers/serial/serial_s5p.c                        |   78 ++++
 drivers/video/exynos_fimd.c                        |    3 +-
 include/configs/exynos5250-dt.h                    |   12 +-
 include/configs/origen.h                           |    9 +-
 include/configs/smdkv310.h                         |    8 +-
 include/configs/trats.h                            |    2 +-
 include/fdtdec.h                                   |    1 +
 include/power/max77686_pmic.h                      |    2 +
 lib/fdtdec.c                                       |    1 +
 47 files changed, 1154 insertions(+), 2022 deletions(-)
 rename {board/samsung/smdk5250 => arch/arm/cpu/armv7/exynos}/clock_init.h (100%)
 create mode 100644 arch/arm/cpu/armv7/exynos/clock_init_exynos4.c
 rename board/samsung/smdk5250/clock_init.c => arch/arm/cpu/armv7/exynos/clock_init_exynos5.c (94%)
 create mode 100644 arch/arm/cpu/armv7/exynos/common_setup.h
 rename {board/samsung/smdk5250 => arch/arm/cpu/armv7/exynos}/dmc_common.c (97%)
 rename {board/samsung/smdk5250 => arch/arm/cpu/armv7/exynos}/dmc_init_ddr3.c (92%)
 create mode 100644 arch/arm/cpu/armv7/exynos/dmc_init_exynos4.c
 rename board/samsung/origen/origen_setup.h => arch/arm/cpu/armv7/exynos/exynos4_setup.h (65%)
 rename board/samsung/smdk5250/setup.h => arch/arm/cpu/armv7/exynos/exynos5_setup.h (96%)
 create mode 100644 arch/arm/cpu/armv7/exynos/lowlevel_init.c
 rename {board/samsung/smdk5250 => arch/arm/cpu/armv7/exynos}/spl_boot.c (73%)
 rename board/samsung/{smdk5250/smdk5250-uboot-spl.lds => common/exynos-uboot-spl.lds} (100%)
 delete mode 100644 board/samsung/origen/lowlevel_init.S
 delete mode 100644 board/samsung/origen/mem_setup.S
 delete mode 100644 board/samsung/origen/mmc_boot.c
 delete mode 100644 board/samsung/smdkv310/lowlevel_init.S
 delete mode 100644 board/samsung/smdkv310/mem_setup.S
 delete mode 100644 board/samsung/smdkv310/mmc_boot.c

Thanks,
Minkyu Kang.

Hi Minkyu,

This breaks build of VCMA9:

s3c24x0_i2c.c: In function 'board_i2c_init':
s3c24x0_i2c.c:544:18: error: 'CONFIG_MAX_I2C_NUM' undeclared (first use in this function) s3c24x0_i2c.c:544:18: note: each undeclared identifier is reported only once for each function it appears in s3c24x0_i2c.c:545:3: warning: implicit declaration of function 'exynos_pinmux_config' [-Wimplicit-function-declaration] s3c24x0_i2c.c:545:25: error: 'PERIPH_ID_I2C0' undeclared (first use in this function) s3c24x0_i2c.c:546:10: error: 'PINMUX_FLAG_NONE' undeclared (first use in this function) make[1]: *** [/home/albert/src/u-boot-arm/build/VCMA9/drivers/i2c/s3c24x0_i2c.o] Error 1 make: *** [/home/albert/src/u-boot-arm/build/VCMA9/drivers/i2c/libi2c.o] Error 2

Culprit is commit 2c07bb9b, authored by Amar <[email protected]>.

(also: "Amar" seems to be only part of the author's name. Is this intentional?)

Amicalement,

Albert.

Dear Amar,

please check.
seems have problem with non-FDT case.

u-boot-samsung$ git show 2c07bb9b53dded1d49731bb9cab589002b89286f commit 2c07bb9b53dded1d49731bb9cab589002b89286f

Author: Amar <[email protected]>
Date:   Thu Apr 4 02:27:06 2013 -0400

EXYNOS5: I2C: Add FDT and non-FDT support for I2C

This patch updates the function board_i2c_init() to add support for both FDT and non-FDT for I2C, and initialise the I2C channels.

index 46d2506..3fc1c5b 100644
@@ -515,11 +515,12 @@ int i2c_write(uchar chip, uint addr, int alen, uchar

*buffer, int len)

                 len) != 0);

}

-#ifdef CONFIG_OF_CONTROL
void board_i2c_init(const void *blob)
{
+ int i;
+#ifdef CONFIG_OF_CONTROL

        int node_list[CONFIG_MAX_I2C_NUM];

- int count, i;
+ int count;

count = fdtdec_find_aliases_for_id(blob, "i2c",
COMPAT_SAMSUNG_S3C2440_I2C, node_list,
@@ -539,8 +540,15 @@ void board_i2c_init(const void *blob)

                bus->bus_num = i2c_busses++;
                exynos_pinmux_config(bus->id, 0);
        }

+#else
+ for (i = 0; i < CONFIG_MAX_I2C_NUM; i++) {
+ exynos_pinmux_config((PERIPH_ID_I2C0 + i),
+ PINMUX_FLAG_NONE);
+ }
+#endif
}

+#ifdef CONFIG_OF_CONTROL
static struct s3c24x0_i2c_bus *get_bus(unsigned int bus_idx) {
if (bus_idx < i2c_busses)

from. prom.
www.promsoft.net

Dear Amar,

Because of we should merge samsung tree to arm tree before release "v2013.07". If you don't do anything, I will revert this patch.

Thanks,
Minkyu Kang.