please pull u-boot-samsung master

Dear Albert,

The following changes since commit ccfa398547ce0b579f2e7874e78948246c739237:

arm1136: Fix enable_caches() (2012-11-10 12:28:22 +0100)

are available in the git repository at:

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

for you to fetch changes up to 7a5337732e3e05b2b0de1b592fa031b2c7b4f632:

EXYNOS5: Enable SPI booting. (2012-11-15 21:08:21 +0900)

----------------------------------------------------------------
Ashok Kumar Reddy (1):

      ARM: arm1176: Define arch_cpu_init() for s3c64xx

Chander Kashyap (1):
Exynos5250: Enable PXE Support

Hatim RV (3):
EXYNOS: Add clock for SPI
EXYNOS5: Add base address for SPI
EXYNOS5: Enable SPI

Marek Vasut (1):
dm: wdt: Move s5p watchdog timer to drivers/watchdog/

Minkyu Kang (3):
ARCH: EXYNOS: add support to match product id
EXYNOS: Clock: Add common function for pll rate calculation
s3c64xx: fix the compiler error and warning

Piotr Wilczek (12):
arm:exynos4:trats: Correct SDRAM configuration for trats arm:exynos4:trats: Fix SDRAM size arm:exynos4:pinmux: Modify the gpio function for mmc arm:exynos4:trats: Use pinmux for mmc configuration arm:exynos4:universal: Use pinmux for mmc configuration arm:exynos4:universal: Eliminated low level init
arm: trats: Power down core 1
exynos4: universal_C210: use software SPI misc:max8998 Add LDO macros
drivers: video: Add ld9040 video driver
drivers: video: fix image position
exynos4: universal_C210: add display support

Rajeshwari Shinde (14):
PMIC: MAX77686: Add support for MAX77686
SMDK5250: Config: Enable MAX77686 pmic chip
SOUND: SAMSUNG: Add I2S driver
SOUND: Add WM8994 codec
Sound: Add command for audio playback
EXYNOS: Add I2S registers
EXYNOS: Add parameters required by I2S
EXYNOS: Add pinmux for I2S
EXYNOS: Add I2S base address
EXYNOS: Add clock for I2S
SMDK5250: Enable Sound
EXYNOS5: Add pinmux support for SPI
SPI: Add SPI Driver for EXYNOS.
EXYNOS5: Enable SPI booting.

?ukasz Majewski (1):
gpio:fix: Proper handling of GPIO subsystem parts at Samsung devices

 Makefile                                           |    1 +
 arch/arm/cpu/arm1176/s3c64xx/Makefile              |    2 +-
 arch/arm/cpu/arm1176/s3c64xx/init.c                |   26 +
 arch/arm/cpu/armv7/exynos/clock.c                  |  350 +++++++--
 arch/arm/cpu/armv7/exynos/pinmux.c                 |  122 +++
 arch/arm/cpu/armv7/s5p-common/Makefile             |    1 -
 arch/arm/include/asm/arch-exynos/clk.h             |    4 +
 arch/arm/include/asm/arch-exynos/clock.h           |   29 +
 arch/arm/include/asm/arch-exynos/cpu.h             |   18 +
 arch/arm/include/asm/arch-exynos/gpio.h            |   19 +
 arch/arm/include/asm/arch-exynos/i2s-regs.h        |   66 ++
 arch/arm/include/asm/arch-exynos/periph.h          |    7 +
 arch/arm/include/asm/arch-exynos/sound.h           |   44 ++
 arch/arm/include/asm/arch-exynos/spi.h             |   78 ++
 arch/arm/include/asm/arch-s5pc1xx/gpio.h           |    7 +-
 board/samsung/smdk5250/Makefile                    |    2 +-
 board/samsung/smdk5250/smdk5250.c                  |    8 +
 board/samsung/smdk5250/{mmc_boot.c => spl_boot.c}  |   31 +-
 board/samsung/trats/trats.c                        |   80 +-
 board/samsung/universal_c210/Makefile              |    1 -
 board/samsung/universal_c210/lowlevel_init.S       |  395 ----------
 board/samsung/universal_c210/universal.c           |  335 +++++++--
 common/Makefile                                    |    1 +
 common/cmd_sound.c                                 |   96 +++
 drivers/gpio/s5p_gpio.c                            |    6 +-
 drivers/misc/Makefile                              |    1 +
 drivers/misc/pmic_max77686.c                       |   42 ++
 drivers/serial/s3c64xx.c                           |    3 +-
 drivers/sound/Makefile                             |   48 ++
 drivers/sound/samsung-i2s.c                        |  358 +++++++++
 drivers/sound/sound.c                              |  228 ++++++
 drivers/sound/wm8994.c                             |  792 ++++++++++++++++++++
 drivers/sound/wm8994.h                             |   87 +++
 drivers/sound/wm8994_registers.h                   |  299 ++++++++
 drivers/spi/Makefile                               |    1 +
 drivers/spi/exynos_spi.c                           |  367 +++++++++
 drivers/video/Makefile                             |    1 +
 drivers/video/exynos_fb.c                          |   15 +-
 drivers/video/ld9040.c                             |  144 ++++
 drivers/watchdog/Makefile                          |    1 +
 .../s5p-common/wdt.c => drivers/watchdog/s5p_wdt.c |    0
 include/configs/s5pc210_universal.h                |   36 +
 include/configs/smdk5250.h                         |   46 +-
 include/configs/trats.h                            |   17 +-
 include/i2s.h                                      |  127 ++++
 include/ld9040.h                                   |   32 +
 include/max77686_pmic.h                            |  158 ++++
 include/max8998_pmic.h                             |    2 +
 include/sound.h                                    |   62 ++
 49 files changed, 3983 insertions(+), 613 deletions(-)
 create mode 100644 arch/arm/cpu/arm1176/s3c64xx/init.c
 create mode 100644 arch/arm/include/asm/arch-exynos/i2s-regs.h
 create mode 100644 arch/arm/include/asm/arch-exynos/sound.h
 create mode 100644 arch/arm/include/asm/arch-exynos/spi.h
 rename board/samsung/smdk5250/{mmc_boot.c => spl_boot.c} (66%)
 delete mode 100644 board/samsung/universal_c210/lowlevel_init.S
 create mode 100644 common/cmd_sound.c
 create mode 100644 drivers/misc/pmic_max77686.c
 create mode 100644 drivers/sound/Makefile
 create mode 100644 drivers/sound/samsung-i2s.c
 create mode 100644 drivers/sound/sound.c
 create mode 100644 drivers/sound/wm8994.c
 create mode 100644 drivers/sound/wm8994.h
 create mode 100644 drivers/sound/wm8994_registers.h
 create mode 100644 drivers/spi/exynos_spi.c
 create mode 100644 drivers/video/ld9040.c
 rename arch/arm/cpu/armv7/s5p-common/wdt.c => drivers/watchdog/s5p_wdt.c (100%)
 create mode 100644 include/i2s.h
 create mode 100644 include/ld9040.h
 create mode 100644 include/max77686_pmic.h
 create mode 100644 include/sound.h

Hi Minkyu,

(Was your master branch rebased?)

Applied to u-boot-arm/master, thanks!

Amicalement,

Albert.

Yes.
Is it not recommended?

Thanks.
Minkyu Kang.

Hi Minkyu,

The wiki may still be lagging behind but it has been discussed here and master branches should never be rebased, they should merge. Merges can fast-forward, though, if possible. The idea is that custodian master branches should be fairly autonomous projects, synchronizing to/from upstream as required, but not rebasing. 'Next' branches should try to follow this too, although rebasing a 'next' is allowed.

Amicalement,

Albert.