[U-Boot] please pull u-boot-samsung/resolve
Dear Albert,
The following changes since commit fd4d564b3c80b111f18c93adb14233a6a7ddb0e9:
Merge branch 'master' of git://git.denx.de/u-boot-x86 (2012-12-07 08:47:59 -0700)
are available in the git repository at:
git://git.denx.de/u-boot-samsung resolve
for you to fetch changes up to fbef8e6e7f1233ed20f8c5045e12c9cf31b43540:
universal_c210: check the NULL pointer when get the PMIC (2012-12-11 17:37:28 +0900)
---------------------------------------------------------------- Albert ARIBAUD (1): Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Allen Martin (1): tegra: add CONSOLE_MUX support to tegra-kbc
Ashok Kumar Reddy (1): ARM: arm1176: Define arch_cpu_init() for s3c64xx
Benoît Thébaudeau (17): arm1136: Fix enable_caches() mx31: Move EHCI definitions to ehci-fsl.h ehci-mxc: Clean up ehci-mx5: Clean up ehci-mx5: Fix OC_DIS usage ehci-mx5: Fix OPM usage ehci-mx5: Fix *PM usage for i.MX53 ehci-mx5: Add missing OC_DIS for i.MX53 ehci-mxc: Make EHCI power/oc polarities configurable ehci-mxc: Make i.MX25 EHCI configurable ehci-mxc: Define host offsets ehci-mxc: Add support for i.MX35 mx35pdk: Add support for OTG ehci-mx5/6: Make board_ehci_hcd_init() optional ehci-mxc: Fix host power mask bit for i.MX35 ehci-mxc: Fix host power mask bit for i.MX25 mx5: Mark lowlevel_init board-specific code
Chander Kashyap (1): Exynos5250: Enable PXE Support
Fabio Estevam (24): mx25pdk: Include CONFIG_MX25 mx25pdk: Add esdhc support pmic_fsl: Introduce FSL_PMIC_I2C_LENGTH mx25: Place common functions into sys_proto.h pmic: Add support for mc34704 mx25pdk: Add Ethernet support mx53loco: Allow booting a zImage kernel mx25pdk: Allow booting a zImage kernel mx51evk: Allow booting a zImage kernel mx35pdk: Allow booting a zImage kernel mx6qsabre_common: Allow booting a zImage kernel mx5: Align SPI CS naming with i.MX53 reference manual mx5: Print CSPI clock in 'clock' command spi: mxc_spi: Fix handling of chip select spi: mxc_spi: Fix spi clock glitch durant reset mx6: clock: Only show CSPI clock if CSPI is enabled mx28evk: Configure CONFIG_BOOTDELAY to one second mx53loco: Configure CONFIG_BOOTDELAY to one second mx6qsabrelite: Configure CONFIG_BOOTDELAY to one second mx6qsabre_common: Configure CONFIG_BOOTDELAY to one second mx51evk: Configure CONFIG_BOOTDELAY to one second mx25pdk: Configure CONFIG_BOOTDELAY to one second mx31pdk: Configure CONFIG_BOOTDELAY to one second mx35pdk: Configure CONFIG_BOOTDELAY to one second
Hatim RV (3): EXYNOS: Add clock for SPI EXYNOS5: Add base address for SPI EXYNOS5: Enable SPI
Marek Vasut (3): dm: wdt: Move s5p watchdog timer to drivers/watchdog/ mx28: Fix typo in POWER_MINPWR_VBG_OFF mx28: Fix typo in POWER_DCLIMITS_NEGLIMIT_OFFSET
Mayuresh Kulkarni (1): tegra: Enable display/lcd support on Seaboard
Minkyu Kang (6): ARCH: EXYNOS: add support to match product id EXYNOS: Clock: Add common function for pll rate calculation s3c64xx: fix the compiler error and warning Merge branch 'master' of git://git.denx.de/u-boot into resolve universal_c210: fix compiler error and compiler warning universal_c210: check the NULL pointer when get the PMIC
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 (16): 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. POWER: MAX77686: Modified as per the latest Implementation SMDK5250: Enable pmic MAX77686
Simon Glass (17): pxa: Disable dcache on palmld, palmtc, zipitz2 tegra: Use const for pinmux_config_pingroup/table() tegra: Add display support to funcmux tegra: fdt: Add pwm binding and node tegra: fdt: Add LCD definitions for Tegra tegra: Add support for PWM tegra: Add LCD driver tegra: Add LCD support to Nvidia boards arm: Add control over cachability of memory regions lcd: Add CONFIG_LCD_ALIGNMENT to select frame buffer alignment lcd: Add support for flushing LCD fb from dcache after update tegra: Align LCD frame buffer to section boundary tegra: Support control of cache settings for LCD tegra: fdt: Add LCD definitions for Seaboard lcd: Add CONFIG_CONSOLE_SCROLL_LINES option to speed console tegra: Remove unnecessary CONFIG_SYS_NAND_BASE tegra: config: seaboard: Move tegra-common-post to correct place
Stefano Babic (8): ARM: Fix start.S when used with SPL in arm1136 MX35: add LOW_LEVEL_SRAM_STACK to use SPL_FRAMEWORK MX35: Add soc_boot_mode and soc_boot_device to MX35 SPL: Added SPL target for mx35 SOC to SPL Makefile ARM: Add SPL target to arm1136 MX35: add support for woodburn board MX5: added CONFIG_PMIC_FSL_MC13892 to mx53evk Merge git://git.denx.de/u-boot
Stephen Warren (4): ARM: tegra: TrimSlice: add support for USB1 port mmc: tegra: support 4-bit operation too on 8-bit slots ARM: tegra: enable 8-bit SD slots in board files tegra: use generic fs commands in BOOTCOMMAND
Troy Kisky (4): mx6: soc: update get_cpu_rev and get_imx_type for mx6solo/sololite mx6: use CONFIG_MX6 instead of CONFIG_MX6Q imx-common: cpu: add imx_ddr_size arch-mx6: add mx6dl_pins.h
Wei Ni (1): tegra: Add SOC support for display/lcd
Łukasz Majewski (1): gpio:fix: Proper handling of GPIO subsystem parts at Samsung devices
MAINTAINERS | 1 + Makefile | 2 + arch/arm/cpu/arm1136/config.mk | 3 + arch/arm/cpu/arm1136/cpu.c | 22 +- arch/arm/cpu/arm1136/mx35/Makefile | 1 + arch/arm/cpu/arm1136/mx35/generic.c | 75 ++ arch/arm/cpu/arm1136/mx35/mx35_sdram.c | 137 ++++ arch/arm/cpu/arm1136/start.S | 31 +- arch/arm/cpu/arm1136/u-boot-spl.lds | 62 ++ arch/arm/cpu/arm1176/s3c64xx/Makefile | 2 +- arch/arm/cpu/arm1176/s3c64xx/init.c | 26 + arch/arm/cpu/armv7/cache_v7.c | 11 + arch/arm/cpu/armv7/exynos/clock.c | 350 +++++++-- arch/arm/cpu/armv7/exynos/pinmux.c | 122 +++ arch/arm/cpu/armv7/mx5/clock.c | 4 +- arch/arm/cpu/armv7/mx5/lowlevel_init.S | 2 +- arch/arm/cpu/armv7/mx6/clock.c | 2 + arch/arm/cpu/armv7/mx6/soc.c | 32 +- arch/arm/cpu/armv7/s5p-common/Makefile | 1 - arch/arm/cpu/armv7/tegra20/Makefile | 2 + arch/arm/cpu/armv7/tegra20/display.c | 409 ++++++++++ arch/arm/cpu/armv7/tegra20/pwm.c | 101 +++ arch/arm/cpu/tegra20-common/funcmux.c | 37 + arch/arm/cpu/tegra20-common/pinmux.c | 4 +- arch/arm/dts/tegra20.dtsi | 105 +++ arch/arm/imx-common/cpu.c | 66 +- 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-mx25/imx-regs.h | 5 +- arch/arm/include/asm/arch-mx25/sys_proto.h | 3 + arch/arm/include/asm/arch-mx31/imx-regs.h | 27 +- arch/arm/include/asm/arch-mx35/imx-regs.h | 4 + arch/arm/include/asm/arch-mx35/mmc_host_def.h | 31 + arch/arm/include/asm/arch-mx35/spl.h | 38 + arch/arm/include/asm/arch-mx35/sys_proto.h | 2 + arch/arm/include/asm/arch-mx5/mx5x_pins.h | 6 +- arch/arm/include/asm/arch-mx5/sys_proto.h | 10 +- arch/arm/include/asm/arch-mx6/imx-regs.h | 2 + arch/arm/include/asm/arch-mx6/mx6dl_pins.h | 149 ++++ arch/arm/include/asm/arch-mx6/sys_proto.h | 10 +- arch/arm/include/asm/arch-mxs/regs-power.h | 4 +- arch/arm/include/asm/arch-s5pc1xx/gpio.h | 7 +- arch/arm/include/asm/arch-tegra20/dc.h | 545 ++++++++++++++ arch/arm/include/asm/arch-tegra20/display.h | 152 ++++ arch/arm/include/asm/arch-tegra20/pinmux.h | 4 +- arch/arm/include/asm/arch-tegra20/pwm.h | 75 ++ arch/arm/include/asm/system.h | 31 + arch/arm/lib/cache-cp15.c | 51 +- board/compal/paz00/paz00.c | 5 +- board/compulab/dts/tegra20-trimslice.dts | 3 +- board/compulab/trimslice/trimslice.c | 8 + board/freescale/mx25pdk/mx25pdk.c | 114 +++ board/freescale/mx31ads/u-boot.lds | 2 + board/freescale/mx35pdk/lowlevel_init.S | 4 + board/freescale/mx35pdk/mx35pdk.c | 21 + board/nvidia/common/board.c | 24 + board/nvidia/dts/tegra20-seaboard.dts | 33 + board/nvidia/harmony/harmony.c | 5 +- board/nvidia/seaboard/seaboard.c | 5 +- board/samsung/smdk5250/Makefile | 2 +- board/samsung/smdk5250/smdk5250.c | 15 + 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 | 337 +++++++-- board/syteco/zmx25/zmx25.c | 1 + board/woodburn/Makefile | 43 ++ board/woodburn/imximage.cfg | 4 + board/woodburn/lowlevel_init.S | 38 + board/woodburn/woodburn.c | 261 +++++++ boards.cfg | 2 + common/Makefile | 1 + common/cmd_sound.c | 96 +++ common/lcd.c | 89 ++- common/main.c | 12 +- doc/README.imx5 | 5 + doc/device-tree-bindings/pwm/tegra20-pwm.txt | 18 + doc/device-tree-bindings/video/displaymode.txt | 42 ++ doc/device-tree-bindings/video/tegra20-dc.txt | 85 +++ drivers/gpio/mxc_gpio.c | 6 +- drivers/gpio/s5p_gpio.c | 6 +- drivers/input/tegra-kbc.c | 18 +- drivers/mmc/tegra_mmc.c | 7 +- drivers/power/pmic/Makefile | 1 + drivers/power/pmic/pmic_max77686.c | 48 ++ drivers/power/power_fsl.c | 8 +- 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/spi/mxc_spi.c | 9 +- drivers/usb/host/ehci-mx5.c | 146 +++- drivers/usb/host/ehci-mx6.c | 5 + drivers/usb/host/ehci-mxc.c | 225 ++++-- drivers/video/Makefile | 2 + drivers/video/exynos_fb.c | 15 +- drivers/video/ipu_regs.h | 2 +- drivers/video/ld9040.c | 144 ++++ drivers/video/tegra.c | 379 ++++++++++ drivers/watchdog/Makefile | 1 + .../s5p-common/wdt.c => drivers/watchdog/s5p_wdt.c | 0 include/configs/harmony.h | 4 +- include/configs/mx25pdk.h | 42 +- include/configs/mx28evk.h | 2 +- include/configs/mx31pdk.h | 2 +- include/configs/mx35pdk.h | 18 +- include/configs/mx51_efikamx.h | 1 + include/configs/mx51evk.h | 5 +- include/configs/mx53evk.h | 1 + include/configs/mx53loco.h | 4 +- include/configs/mx6qarm2.h | 1 + include/configs/mx6qsabre_common.h | 4 +- include/configs/mx6qsabrelite.h | 3 +- include/configs/palmld.h | 3 + include/configs/palmtc.h | 3 + include/configs/paz00.h | 3 + include/configs/s5pc210_universal.h | 36 + include/configs/seaboard.h | 21 +- include/configs/smdk5250.h | 48 +- include/configs/tec.h | 1 - include/configs/tegra-common-post.h | 39 +- include/configs/tegra20-common.h | 3 + include/configs/trats.h | 17 +- include/configs/trimslice.h | 4 + include/configs/ventana.h | 3 + include/configs/vision2.h | 1 + include/configs/whistler.h | 3 + include/configs/woodburn.h | 34 + include/configs/woodburn_common.h | 313 ++++++++ include/configs/woodburn_sd.h | 60 ++ include/configs/zipitz2.h | 3 + include/configs/zmx25.h | 6 +- include/fdtdec.h | 2 + include/i2s.h | 127 ++++ include/lcd.h | 11 + include/ld9040.h | 32 + include/mc34704.h | 49 ++ include/power/max77686_pmic.h | 158 ++++ include/power/max8998_pmic.h | 2 + include/sound.h | 62 ++ include/usb/ehci-fsl.h | 28 +- lib/fdtdec.c | 2 + nand_spl/board/freescale/mx31pdk/u-boot.lds | 2 + spl/Makefile | 6 + 156 files changed, 8322 insertions(+), 865 deletions(-) create mode 100644 arch/arm/cpu/arm1136/mx35/mx35_sdram.c create mode 100644 arch/arm/cpu/arm1136/u-boot-spl.lds create mode 100644 arch/arm/cpu/arm1176/s3c64xx/init.c create mode 100644 arch/arm/cpu/armv7/tegra20/display.c create mode 100644 arch/arm/cpu/armv7/tegra20/pwm.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 create mode 100644 arch/arm/include/asm/arch-mx35/mmc_host_def.h create mode 100644 arch/arm/include/asm/arch-mx35/spl.h create mode 100644 arch/arm/include/asm/arch-mx6/mx6dl_pins.h create mode 100644 arch/arm/include/asm/arch-tegra20/dc.h create mode 100644 arch/arm/include/asm/arch-tegra20/display.h create mode 100644 arch/arm/include/asm/arch-tegra20/pwm.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 board/woodburn/Makefile create mode 100644 board/woodburn/imximage.cfg create mode 100644 board/woodburn/lowlevel_init.S create mode 100644 board/woodburn/woodburn.c create mode 100644 common/cmd_sound.c create mode 100644 doc/device-tree-bindings/pwm/tegra20-pwm.txt create mode 100644 doc/device-tree-bindings/video/displaymode.txt create mode 100644 doc/device-tree-bindings/video/tegra20-dc.txt create mode 100644 drivers/power/pmic/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 create mode 100644 drivers/video/tegra.c rename arch/arm/cpu/armv7/s5p-common/wdt.c => drivers/watchdog/s5p_wdt.c (100%) create mode 100644 include/configs/woodburn.h create mode 100644 include/configs/woodburn_common.h create mode 100644 include/configs/woodburn_sd.h create mode 100644 include/i2s.h create mode 100644 include/ld9040.h create mode 100644 include/mc34704.h create mode 100644 include/power/max77686_pmic.h create mode 100644 include/sound.h
On 12/11/2012 04:10 AM, Minkyu Kang wrote:
Dear Albert,
The following changes since commit fd4d564b3c80b111f18c93adb14233a6a7ddb0e9:
Merge branch 'master' of git://git.denx.de/u-boot-x86 (2012-12-07 08:47:59 -0700)
are available in the git repository at:
git://git.denx.de/u-boot-samsung resolve
for you to fetch changes up to fbef8e6e7f1233ed20f8c5045e12c9cf31b43540:
universal_c210: check the NULL pointer when get the PMIC (2012-12-11 17:37:28 +0900)
How come this includes a bunch of Tegra changes; did you just use the wrong base commit when generating the commit list below?
Simon Glass (17):
tegra: Use const for pinmux_config_pingroup/table() tegra: Add display support to funcmux tegra: fdt: Add pwm binding and node tegra: fdt: Add LCD definitions for Tegra tegra: Add support for PWM tegra: Add LCD driver tegra: Add LCD support to Nvidia boards arm: Add control over cachability of memory regions lcd: Add CONFIG_LCD_ALIGNMENT to select frame buffer alignment lcd: Add support for flushing LCD fb from dcache after update tegra: Align LCD frame buffer to section boundary tegra: Support control of cache settings for LCD tegra: fdt: Add LCD definitions for Seaboard lcd: Add CONFIG_CONSOLE_SCROLL_LINES option to speed console tegra: Remove unnecessary CONFIG_SYS_NAND_BASE tegra: config: seaboard: Move tegra-common-post to correct place
Stephen Warren (4): ARM: tegra: TrimSlice: add support for USB1 port mmc: tegra: support 4-bit operation too on 8-bit slots ARM: tegra: enable 8-bit SD slots in board files tegra: use generic fs commands in BOOTCOMMAND
Wei Ni (1): tegra: Add SOC support for display/lcd
Hi Minkyu,
On Tue, 11 Dec 2012 20:10:06 +0900, Minkyu Kang mk7.kang@samsung.com wrote:
Dear Albert,
The following changes since commit fd4d564b3c80b111f18c93adb14233a6a7ddb0e9:
Merge branch 'master' of git://git.denx.de/u-boot-x86 (2012-12-07 08:47:59 -0700)
are available in the git repository at:
git://git.denx.de/u-boot-samsung resolve
for you to fetch changes up to fbef8e6e7f1233ed20f8c5045e12c9cf31b43540:
universal_c210: check the NULL pointer when get the PMIC (2012-12-11 17:37:28 +0900)
Albert ARIBAUD (1): Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Allen Martin (1): tegra: add CONSOLE_MUX support to tegra-kbc
Ashok Kumar Reddy (1): ARM: arm1176: Define arch_cpu_init() for s3c64xx
Benoît Thébaudeau (17): arm1136: Fix enable_caches() mx31: Move EHCI definitions to ehci-fsl.h ehci-mxc: Clean up ehci-mx5: Clean up ehci-mx5: Fix OC_DIS usage ehci-mx5: Fix OPM usage ehci-mx5: Fix *PM usage for i.MX53 ehci-mx5: Add missing OC_DIS for i.MX53 ehci-mxc: Make EHCI power/oc polarities configurable ehci-mxc: Make i.MX25 EHCI configurable ehci-mxc: Define host offsets ehci-mxc: Add support for i.MX35 mx35pdk: Add support for OTG ehci-mx5/6: Make board_ehci_hcd_init() optional ehci-mxc: Fix host power mask bit for i.MX35 ehci-mxc: Fix host power mask bit for i.MX25 mx5: Mark lowlevel_init board-specific code
Chander Kashyap (1): Exynos5250: Enable PXE Support
Fabio Estevam (24): mx25pdk: Include CONFIG_MX25 mx25pdk: Add esdhc support pmic_fsl: Introduce FSL_PMIC_I2C_LENGTH mx25: Place common functions into sys_proto.h pmic: Add support for mc34704 mx25pdk: Add Ethernet support mx53loco: Allow booting a zImage kernel mx25pdk: Allow booting a zImage kernel mx51evk: Allow booting a zImage kernel mx35pdk: Allow booting a zImage kernel mx6qsabre_common: Allow booting a zImage kernel mx5: Align SPI CS naming with i.MX53 reference manual mx5: Print CSPI clock in 'clock' command spi: mxc_spi: Fix handling of chip select spi: mxc_spi: Fix spi clock glitch durant reset mx6: clock: Only show CSPI clock if CSPI is enabled mx28evk: Configure CONFIG_BOOTDELAY to one second mx53loco: Configure CONFIG_BOOTDELAY to one second mx6qsabrelite: Configure CONFIG_BOOTDELAY to one second mx6qsabre_common: Configure CONFIG_BOOTDELAY to one second mx51evk: Configure CONFIG_BOOTDELAY to one second mx25pdk: Configure CONFIG_BOOTDELAY to one second mx31pdk: Configure CONFIG_BOOTDELAY to one second mx35pdk: Configure CONFIG_BOOTDELAY to one second
Hatim RV (3): EXYNOS: Add clock for SPI EXYNOS5: Add base address for SPI EXYNOS5: Enable SPI
Marek Vasut (3): dm: wdt: Move s5p watchdog timer to drivers/watchdog/ mx28: Fix typo in POWER_MINPWR_VBG_OFF mx28: Fix typo in POWER_DCLIMITS_NEGLIMIT_OFFSET
Mayuresh Kulkarni (1): tegra: Enable display/lcd support on Seaboard
Minkyu Kang (6): ARCH: EXYNOS: add support to match product id EXYNOS: Clock: Add common function for pll rate calculation s3c64xx: fix the compiler error and warning Merge branch 'master' of git://git.denx.de/u-boot into resolve universal_c210: fix compiler error and compiler warning universal_c210: check the NULL pointer when get the PMIC
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 (16): 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. POWER: MAX77686: Modified as per the latest Implementation SMDK5250: Enable pmic MAX77686
Simon Glass (17): pxa: Disable dcache on palmld, palmtc, zipitz2 tegra: Use const for pinmux_config_pingroup/table() tegra: Add display support to funcmux tegra: fdt: Add pwm binding and node tegra: fdt: Add LCD definitions for Tegra tegra: Add support for PWM tegra: Add LCD driver tegra: Add LCD support to Nvidia boards arm: Add control over cachability of memory regions lcd: Add CONFIG_LCD_ALIGNMENT to select frame buffer alignment lcd: Add support for flushing LCD fb from dcache after update tegra: Align LCD frame buffer to section boundary tegra: Support control of cache settings for LCD tegra: fdt: Add LCD definitions for Seaboard lcd: Add CONFIG_CONSOLE_SCROLL_LINES option to speed console tegra: Remove unnecessary CONFIG_SYS_NAND_BASE tegra: config: seaboard: Move tegra-common-post to correct place
Stefano Babic (8): ARM: Fix start.S when used with SPL in arm1136 MX35: add LOW_LEVEL_SRAM_STACK to use SPL_FRAMEWORK MX35: Add soc_boot_mode and soc_boot_device to MX35 SPL: Added SPL target for mx35 SOC to SPL Makefile ARM: Add SPL target to arm1136 MX35: add support for woodburn board MX5: added CONFIG_PMIC_FSL_MC13892 to mx53evk Merge git://git.denx.de/u-boot
Stephen Warren (4): ARM: tegra: TrimSlice: add support for USB1 port mmc: tegra: support 4-bit operation too on 8-bit slots ARM: tegra: enable 8-bit SD slots in board files tegra: use generic fs commands in BOOTCOMMAND
Troy Kisky (4): mx6: soc: update get_cpu_rev and get_imx_type for mx6solo/sololite mx6: use CONFIG_MX6 instead of CONFIG_MX6Q imx-common: cpu: add imx_ddr_size arch-mx6: add mx6dl_pins.h
Wei Ni (1): tegra: Add SOC support for display/lcd
Łukasz Majewski (1): gpio:fix: Proper handling of GPIO subsystem parts at Samsung devices
MAINTAINERS | 1 + Makefile | 2 + arch/arm/cpu/arm1136/config.mk | 3 + arch/arm/cpu/arm1136/cpu.c | 22 +- arch/arm/cpu/arm1136/mx35/Makefile | 1 + arch/arm/cpu/arm1136/mx35/generic.c | 75 ++ arch/arm/cpu/arm1136/mx35/mx35_sdram.c | 137 ++++ arch/arm/cpu/arm1136/start.S | 31 +- arch/arm/cpu/arm1136/u-boot-spl.lds | 62 ++ arch/arm/cpu/arm1176/s3c64xx/Makefile | 2 +- arch/arm/cpu/arm1176/s3c64xx/init.c | 26 + arch/arm/cpu/armv7/cache_v7.c | 11 + arch/arm/cpu/armv7/exynos/clock.c | 350 +++++++-- arch/arm/cpu/armv7/exynos/pinmux.c | 122 +++ arch/arm/cpu/armv7/mx5/clock.c | 4 +- arch/arm/cpu/armv7/mx5/lowlevel_init.S | 2 +- arch/arm/cpu/armv7/mx6/clock.c | 2 + arch/arm/cpu/armv7/mx6/soc.c | 32 +- arch/arm/cpu/armv7/s5p-common/Makefile | 1 - arch/arm/cpu/armv7/tegra20/Makefile | 2 + arch/arm/cpu/armv7/tegra20/display.c | 409 ++++++++++ arch/arm/cpu/armv7/tegra20/pwm.c | 101 +++ arch/arm/cpu/tegra20-common/funcmux.c | 37 + arch/arm/cpu/tegra20-common/pinmux.c | 4 +- arch/arm/dts/tegra20.dtsi | 105 +++ arch/arm/imx-common/cpu.c | 66 +- 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-mx25/imx-regs.h | 5 +- arch/arm/include/asm/arch-mx25/sys_proto.h | 3 + arch/arm/include/asm/arch-mx31/imx-regs.h | 27 +- arch/arm/include/asm/arch-mx35/imx-regs.h | 4 + arch/arm/include/asm/arch-mx35/mmc_host_def.h | 31 + arch/arm/include/asm/arch-mx35/spl.h | 38 + arch/arm/include/asm/arch-mx35/sys_proto.h | 2 + arch/arm/include/asm/arch-mx5/mx5x_pins.h | 6 +- arch/arm/include/asm/arch-mx5/sys_proto.h | 10 +- arch/arm/include/asm/arch-mx6/imx-regs.h | 2 + arch/arm/include/asm/arch-mx6/mx6dl_pins.h | 149 ++++ arch/arm/include/asm/arch-mx6/sys_proto.h | 10 +- arch/arm/include/asm/arch-mxs/regs-power.h | 4 +- arch/arm/include/asm/arch-s5pc1xx/gpio.h | 7 +- arch/arm/include/asm/arch-tegra20/dc.h | 545 ++++++++++++++ arch/arm/include/asm/arch-tegra20/display.h | 152 ++++ arch/arm/include/asm/arch-tegra20/pinmux.h | 4 +- arch/arm/include/asm/arch-tegra20/pwm.h | 75 ++ arch/arm/include/asm/system.h | 31 + arch/arm/lib/cache-cp15.c | 51 +- board/compal/paz00/paz00.c | 5 +- board/compulab/dts/tegra20-trimslice.dts | 3 +- board/compulab/trimslice/trimslice.c | 8 + board/freescale/mx25pdk/mx25pdk.c | 114 +++ board/freescale/mx31ads/u-boot.lds | 2 + board/freescale/mx35pdk/lowlevel_init.S | 4 + board/freescale/mx35pdk/mx35pdk.c | 21 + board/nvidia/common/board.c | 24 + board/nvidia/dts/tegra20-seaboard.dts | 33 + board/nvidia/harmony/harmony.c | 5 +- board/nvidia/seaboard/seaboard.c | 5 +- board/samsung/smdk5250/Makefile | 2 +- board/samsung/smdk5250/smdk5250.c | 15 + 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 | 337 +++++++-- board/syteco/zmx25/zmx25.c | 1 + board/woodburn/Makefile | 43 ++ board/woodburn/imximage.cfg | 4 + board/woodburn/lowlevel_init.S | 38 + board/woodburn/woodburn.c | 261 +++++++ boards.cfg | 2 + common/Makefile | 1 + common/cmd_sound.c | 96 +++ common/lcd.c | 89 ++- common/main.c | 12 +- doc/README.imx5 | 5 + doc/device-tree-bindings/pwm/tegra20-pwm.txt | 18 + doc/device-tree-bindings/video/displaymode.txt | 42 ++ doc/device-tree-bindings/video/tegra20-dc.txt | 85 +++ drivers/gpio/mxc_gpio.c | 6 +- drivers/gpio/s5p_gpio.c | 6 +- drivers/input/tegra-kbc.c | 18 +- drivers/mmc/tegra_mmc.c | 7 +- drivers/power/pmic/Makefile | 1 + drivers/power/pmic/pmic_max77686.c | 48 ++ drivers/power/power_fsl.c | 8 +- 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/spi/mxc_spi.c | 9 +- drivers/usb/host/ehci-mx5.c | 146 +++- drivers/usb/host/ehci-mx6.c | 5 + drivers/usb/host/ehci-mxc.c | 225 ++++-- drivers/video/Makefile | 2 + drivers/video/exynos_fb.c | 15 +- drivers/video/ipu_regs.h | 2 +- drivers/video/ld9040.c | 144 ++++ drivers/video/tegra.c | 379 ++++++++++ drivers/watchdog/Makefile | 1 + .../s5p-common/wdt.c => drivers/watchdog/s5p_wdt.c | 0 include/configs/harmony.h | 4 +- include/configs/mx25pdk.h | 42 +- include/configs/mx28evk.h | 2 +- include/configs/mx31pdk.h | 2 +- include/configs/mx35pdk.h | 18 +- include/configs/mx51_efikamx.h | 1 + include/configs/mx51evk.h | 5 +- include/configs/mx53evk.h | 1 + include/configs/mx53loco.h | 4 +- include/configs/mx6qarm2.h | 1 + include/configs/mx6qsabre_common.h | 4 +- include/configs/mx6qsabrelite.h | 3 +- include/configs/palmld.h | 3 + include/configs/palmtc.h | 3 + include/configs/paz00.h | 3 + include/configs/s5pc210_universal.h | 36 + include/configs/seaboard.h | 21 +- include/configs/smdk5250.h | 48 +- include/configs/tec.h | 1 - include/configs/tegra-common-post.h | 39 +- include/configs/tegra20-common.h | 3 + include/configs/trats.h | 17 +- include/configs/trimslice.h | 4 + include/configs/ventana.h | 3 + include/configs/vision2.h | 1 + include/configs/whistler.h | 3 + include/configs/woodburn.h | 34 + include/configs/woodburn_common.h | 313 ++++++++ include/configs/woodburn_sd.h | 60 ++ include/configs/zipitz2.h | 3 + include/configs/zmx25.h | 6 +- include/fdtdec.h | 2 + include/i2s.h | 127 ++++ include/lcd.h | 11 + include/ld9040.h | 32 + include/mc34704.h | 49 ++ include/power/max77686_pmic.h | 158 ++++ include/power/max8998_pmic.h | 2 + include/sound.h | 62 ++ include/usb/ehci-fsl.h | 28 +- lib/fdtdec.c | 2 + nand_spl/board/freescale/mx31pdk/u-boot.lds | 2 + spl/Makefile | 6 + 156 files changed, 8322 insertions(+), 865 deletions(-) create mode 100644 arch/arm/cpu/arm1136/mx35/mx35_sdram.c create mode 100644 arch/arm/cpu/arm1136/u-boot-spl.lds create mode 100644 arch/arm/cpu/arm1176/s3c64xx/init.c create mode 100644 arch/arm/cpu/armv7/tegra20/display.c create mode 100644 arch/arm/cpu/armv7/tegra20/pwm.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 create mode 100644 arch/arm/include/asm/arch-mx35/mmc_host_def.h create mode 100644 arch/arm/include/asm/arch-mx35/spl.h create mode 100644 arch/arm/include/asm/arch-mx6/mx6dl_pins.h create mode 100644 arch/arm/include/asm/arch-tegra20/dc.h create mode 100644 arch/arm/include/asm/arch-tegra20/display.h create mode 100644 arch/arm/include/asm/arch-tegra20/pwm.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 board/woodburn/Makefile create mode 100644 board/woodburn/imximage.cfg create mode 100644 board/woodburn/lowlevel_init.S create mode 100644 board/woodburn/woodburn.c create mode 100644 common/cmd_sound.c create mode 100644 doc/device-tree-bindings/pwm/tegra20-pwm.txt create mode 100644 doc/device-tree-bindings/video/displaymode.txt create mode 100644 doc/device-tree-bindings/video/tegra20-dc.txt create mode 100644 drivers/power/pmic/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 create mode 100644 drivers/video/tegra.c rename arch/arm/cpu/armv7/s5p-common/wdt.c => drivers/watchdog/s5p_wdt.c (100%) create mode 100644 include/configs/woodburn.h create mode 100644 include/configs/woodburn_common.h create mode 100644 include/configs/woodburn_sd.h create mode 100644 include/i2s.h create mode 100644 include/ld9040.h create mode 100644 include/mc34704.h create mode 100644 include/power/max77686_pmic.h create mode 100644 include/sound.h
Apart from Stephen's question, why is this pull request not from your master branch?
Amicalement,
On 14/12/12 04:56, Albert ARIBAUD wrote:
Hi Minkyu,
On Tue, 11 Dec 2012 20:10:06 +0900, Minkyu Kang mk7.kang@samsung.com wrote:
Dear Albert,
The following changes since commit fd4d564b3c80b111f18c93adb14233a6a7ddb0e9:
Merge branch 'master' of git://git.denx.de/u-boot-x86 (2012-12-07 08:47:59 -0700)
are available in the git repository at:
git://git.denx.de/u-boot-samsung resolve
for you to fetch changes up to fbef8e6e7f1233ed20f8c5045e12c9cf31b43540:
universal_c210: check the NULL pointer when get the PMIC (2012-12-11 17:37:28 +0900)
Albert ARIBAUD (1): Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Allen Martin (1): tegra: add CONSOLE_MUX support to tegra-kbc
Ashok Kumar Reddy (1): ARM: arm1176: Define arch_cpu_init() for s3c64xx
Benoît Thébaudeau (17): arm1136: Fix enable_caches() mx31: Move EHCI definitions to ehci-fsl.h ehci-mxc: Clean up ehci-mx5: Clean up ehci-mx5: Fix OC_DIS usage ehci-mx5: Fix OPM usage ehci-mx5: Fix *PM usage for i.MX53 ehci-mx5: Add missing OC_DIS for i.MX53 ehci-mxc: Make EHCI power/oc polarities configurable ehci-mxc: Make i.MX25 EHCI configurable ehci-mxc: Define host offsets ehci-mxc: Add support for i.MX35 mx35pdk: Add support for OTG ehci-mx5/6: Make board_ehci_hcd_init() optional ehci-mxc: Fix host power mask bit for i.MX35 ehci-mxc: Fix host power mask bit for i.MX25 mx5: Mark lowlevel_init board-specific code
Chander Kashyap (1): Exynos5250: Enable PXE Support
Fabio Estevam (24): mx25pdk: Include CONFIG_MX25 mx25pdk: Add esdhc support pmic_fsl: Introduce FSL_PMIC_I2C_LENGTH mx25: Place common functions into sys_proto.h pmic: Add support for mc34704 mx25pdk: Add Ethernet support mx53loco: Allow booting a zImage kernel mx25pdk: Allow booting a zImage kernel mx51evk: Allow booting a zImage kernel mx35pdk: Allow booting a zImage kernel mx6qsabre_common: Allow booting a zImage kernel mx5: Align SPI CS naming with i.MX53 reference manual mx5: Print CSPI clock in 'clock' command spi: mxc_spi: Fix handling of chip select spi: mxc_spi: Fix spi clock glitch durant reset mx6: clock: Only show CSPI clock if CSPI is enabled mx28evk: Configure CONFIG_BOOTDELAY to one second mx53loco: Configure CONFIG_BOOTDELAY to one second mx6qsabrelite: Configure CONFIG_BOOTDELAY to one second mx6qsabre_common: Configure CONFIG_BOOTDELAY to one second mx51evk: Configure CONFIG_BOOTDELAY to one second mx25pdk: Configure CONFIG_BOOTDELAY to one second mx31pdk: Configure CONFIG_BOOTDELAY to one second mx35pdk: Configure CONFIG_BOOTDELAY to one second
Hatim RV (3): EXYNOS: Add clock for SPI EXYNOS5: Add base address for SPI EXYNOS5: Enable SPI
Marek Vasut (3): dm: wdt: Move s5p watchdog timer to drivers/watchdog/ mx28: Fix typo in POWER_MINPWR_VBG_OFF mx28: Fix typo in POWER_DCLIMITS_NEGLIMIT_OFFSET
Mayuresh Kulkarni (1): tegra: Enable display/lcd support on Seaboard
Minkyu Kang (6): ARCH: EXYNOS: add support to match product id EXYNOS: Clock: Add common function for pll rate calculation s3c64xx: fix the compiler error and warning Merge branch 'master' of git://git.denx.de/u-boot into resolve universal_c210: fix compiler error and compiler warning universal_c210: check the NULL pointer when get the PMIC
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 (16): 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. POWER: MAX77686: Modified as per the latest Implementation SMDK5250: Enable pmic MAX77686
Simon Glass (17): pxa: Disable dcache on palmld, palmtc, zipitz2 tegra: Use const for pinmux_config_pingroup/table() tegra: Add display support to funcmux tegra: fdt: Add pwm binding and node tegra: fdt: Add LCD definitions for Tegra tegra: Add support for PWM tegra: Add LCD driver tegra: Add LCD support to Nvidia boards arm: Add control over cachability of memory regions lcd: Add CONFIG_LCD_ALIGNMENT to select frame buffer alignment lcd: Add support for flushing LCD fb from dcache after update tegra: Align LCD frame buffer to section boundary tegra: Support control of cache settings for LCD tegra: fdt: Add LCD definitions for Seaboard lcd: Add CONFIG_CONSOLE_SCROLL_LINES option to speed console tegra: Remove unnecessary CONFIG_SYS_NAND_BASE tegra: config: seaboard: Move tegra-common-post to correct place
Stefano Babic (8): ARM: Fix start.S when used with SPL in arm1136 MX35: add LOW_LEVEL_SRAM_STACK to use SPL_FRAMEWORK MX35: Add soc_boot_mode and soc_boot_device to MX35 SPL: Added SPL target for mx35 SOC to SPL Makefile ARM: Add SPL target to arm1136 MX35: add support for woodburn board MX5: added CONFIG_PMIC_FSL_MC13892 to mx53evk Merge git://git.denx.de/u-boot
Stephen Warren (4): ARM: tegra: TrimSlice: add support for USB1 port mmc: tegra: support 4-bit operation too on 8-bit slots ARM: tegra: enable 8-bit SD slots in board files tegra: use generic fs commands in BOOTCOMMAND
Troy Kisky (4): mx6: soc: update get_cpu_rev and get_imx_type for mx6solo/sololite mx6: use CONFIG_MX6 instead of CONFIG_MX6Q imx-common: cpu: add imx_ddr_size arch-mx6: add mx6dl_pins.h
Wei Ni (1): tegra: Add SOC support for display/lcd
Łukasz Majewski (1): gpio:fix: Proper handling of GPIO subsystem parts at Samsung devices
MAINTAINERS | 1 + Makefile | 2 + arch/arm/cpu/arm1136/config.mk | 3 + arch/arm/cpu/arm1136/cpu.c | 22 +- arch/arm/cpu/arm1136/mx35/Makefile | 1 + arch/arm/cpu/arm1136/mx35/generic.c | 75 ++ arch/arm/cpu/arm1136/mx35/mx35_sdram.c | 137 ++++ arch/arm/cpu/arm1136/start.S | 31 +- arch/arm/cpu/arm1136/u-boot-spl.lds | 62 ++ arch/arm/cpu/arm1176/s3c64xx/Makefile | 2 +- arch/arm/cpu/arm1176/s3c64xx/init.c | 26 + arch/arm/cpu/armv7/cache_v7.c | 11 + arch/arm/cpu/armv7/exynos/clock.c | 350 +++++++-- arch/arm/cpu/armv7/exynos/pinmux.c | 122 +++ arch/arm/cpu/armv7/mx5/clock.c | 4 +- arch/arm/cpu/armv7/mx5/lowlevel_init.S | 2 +- arch/arm/cpu/armv7/mx6/clock.c | 2 + arch/arm/cpu/armv7/mx6/soc.c | 32 +- arch/arm/cpu/armv7/s5p-common/Makefile | 1 - arch/arm/cpu/armv7/tegra20/Makefile | 2 + arch/arm/cpu/armv7/tegra20/display.c | 409 ++++++++++ arch/arm/cpu/armv7/tegra20/pwm.c | 101 +++ arch/arm/cpu/tegra20-common/funcmux.c | 37 + arch/arm/cpu/tegra20-common/pinmux.c | 4 +- arch/arm/dts/tegra20.dtsi | 105 +++ arch/arm/imx-common/cpu.c | 66 +- 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-mx25/imx-regs.h | 5 +- arch/arm/include/asm/arch-mx25/sys_proto.h | 3 + arch/arm/include/asm/arch-mx31/imx-regs.h | 27 +- arch/arm/include/asm/arch-mx35/imx-regs.h | 4 + arch/arm/include/asm/arch-mx35/mmc_host_def.h | 31 + arch/arm/include/asm/arch-mx35/spl.h | 38 + arch/arm/include/asm/arch-mx35/sys_proto.h | 2 + arch/arm/include/asm/arch-mx5/mx5x_pins.h | 6 +- arch/arm/include/asm/arch-mx5/sys_proto.h | 10 +- arch/arm/include/asm/arch-mx6/imx-regs.h | 2 + arch/arm/include/asm/arch-mx6/mx6dl_pins.h | 149 ++++ arch/arm/include/asm/arch-mx6/sys_proto.h | 10 +- arch/arm/include/asm/arch-mxs/regs-power.h | 4 +- arch/arm/include/asm/arch-s5pc1xx/gpio.h | 7 +- arch/arm/include/asm/arch-tegra20/dc.h | 545 ++++++++++++++ arch/arm/include/asm/arch-tegra20/display.h | 152 ++++ arch/arm/include/asm/arch-tegra20/pinmux.h | 4 +- arch/arm/include/asm/arch-tegra20/pwm.h | 75 ++ arch/arm/include/asm/system.h | 31 + arch/arm/lib/cache-cp15.c | 51 +- board/compal/paz00/paz00.c | 5 +- board/compulab/dts/tegra20-trimslice.dts | 3 +- board/compulab/trimslice/trimslice.c | 8 + board/freescale/mx25pdk/mx25pdk.c | 114 +++ board/freescale/mx31ads/u-boot.lds | 2 + board/freescale/mx35pdk/lowlevel_init.S | 4 + board/freescale/mx35pdk/mx35pdk.c | 21 + board/nvidia/common/board.c | 24 + board/nvidia/dts/tegra20-seaboard.dts | 33 + board/nvidia/harmony/harmony.c | 5 +- board/nvidia/seaboard/seaboard.c | 5 +- board/samsung/smdk5250/Makefile | 2 +- board/samsung/smdk5250/smdk5250.c | 15 + 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 | 337 +++++++-- board/syteco/zmx25/zmx25.c | 1 + board/woodburn/Makefile | 43 ++ board/woodburn/imximage.cfg | 4 + board/woodburn/lowlevel_init.S | 38 + board/woodburn/woodburn.c | 261 +++++++ boards.cfg | 2 + common/Makefile | 1 + common/cmd_sound.c | 96 +++ common/lcd.c | 89 ++- common/main.c | 12 +- doc/README.imx5 | 5 + doc/device-tree-bindings/pwm/tegra20-pwm.txt | 18 + doc/device-tree-bindings/video/displaymode.txt | 42 ++ doc/device-tree-bindings/video/tegra20-dc.txt | 85 +++ drivers/gpio/mxc_gpio.c | 6 +- drivers/gpio/s5p_gpio.c | 6 +- drivers/input/tegra-kbc.c | 18 +- drivers/mmc/tegra_mmc.c | 7 +- drivers/power/pmic/Makefile | 1 + drivers/power/pmic/pmic_max77686.c | 48 ++ drivers/power/power_fsl.c | 8 +- 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/spi/mxc_spi.c | 9 +- drivers/usb/host/ehci-mx5.c | 146 +++- drivers/usb/host/ehci-mx6.c | 5 + drivers/usb/host/ehci-mxc.c | 225 ++++-- drivers/video/Makefile | 2 + drivers/video/exynos_fb.c | 15 +- drivers/video/ipu_regs.h | 2 +- drivers/video/ld9040.c | 144 ++++ drivers/video/tegra.c | 379 ++++++++++ drivers/watchdog/Makefile | 1 + .../s5p-common/wdt.c => drivers/watchdog/s5p_wdt.c | 0 include/configs/harmony.h | 4 +- include/configs/mx25pdk.h | 42 +- include/configs/mx28evk.h | 2 +- include/configs/mx31pdk.h | 2 +- include/configs/mx35pdk.h | 18 +- include/configs/mx51_efikamx.h | 1 + include/configs/mx51evk.h | 5 +- include/configs/mx53evk.h | 1 + include/configs/mx53loco.h | 4 +- include/configs/mx6qarm2.h | 1 + include/configs/mx6qsabre_common.h | 4 +- include/configs/mx6qsabrelite.h | 3 +- include/configs/palmld.h | 3 + include/configs/palmtc.h | 3 + include/configs/paz00.h | 3 + include/configs/s5pc210_universal.h | 36 + include/configs/seaboard.h | 21 +- include/configs/smdk5250.h | 48 +- include/configs/tec.h | 1 - include/configs/tegra-common-post.h | 39 +- include/configs/tegra20-common.h | 3 + include/configs/trats.h | 17 +- include/configs/trimslice.h | 4 + include/configs/ventana.h | 3 + include/configs/vision2.h | 1 + include/configs/whistler.h | 3 + include/configs/woodburn.h | 34 + include/configs/woodburn_common.h | 313 ++++++++ include/configs/woodburn_sd.h | 60 ++ include/configs/zipitz2.h | 3 + include/configs/zmx25.h | 6 +- include/fdtdec.h | 2 + include/i2s.h | 127 ++++ include/lcd.h | 11 + include/ld9040.h | 32 + include/mc34704.h | 49 ++ include/power/max77686_pmic.h | 158 ++++ include/power/max8998_pmic.h | 2 + include/sound.h | 62 ++ include/usb/ehci-fsl.h | 28 +- lib/fdtdec.c | 2 + nand_spl/board/freescale/mx31pdk/u-boot.lds | 2 + spl/Makefile | 6 + 156 files changed, 8322 insertions(+), 865 deletions(-) create mode 100644 arch/arm/cpu/arm1136/mx35/mx35_sdram.c create mode 100644 arch/arm/cpu/arm1136/u-boot-spl.lds create mode 100644 arch/arm/cpu/arm1176/s3c64xx/init.c create mode 100644 arch/arm/cpu/armv7/tegra20/display.c create mode 100644 arch/arm/cpu/armv7/tegra20/pwm.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 create mode 100644 arch/arm/include/asm/arch-mx35/mmc_host_def.h create mode 100644 arch/arm/include/asm/arch-mx35/spl.h create mode 100644 arch/arm/include/asm/arch-mx6/mx6dl_pins.h create mode 100644 arch/arm/include/asm/arch-tegra20/dc.h create mode 100644 arch/arm/include/asm/arch-tegra20/display.h create mode 100644 arch/arm/include/asm/arch-tegra20/pwm.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 board/woodburn/Makefile create mode 100644 board/woodburn/imximage.cfg create mode 100644 board/woodburn/lowlevel_init.S create mode 100644 board/woodburn/woodburn.c create mode 100644 common/cmd_sound.c create mode 100644 doc/device-tree-bindings/pwm/tegra20-pwm.txt create mode 100644 doc/device-tree-bindings/video/displaymode.txt create mode 100644 doc/device-tree-bindings/video/tegra20-dc.txt create mode 100644 drivers/power/pmic/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 create mode 100644 drivers/video/tegra.c rename arch/arm/cpu/armv7/s5p-common/wdt.c => drivers/watchdog/s5p_wdt.c (100%) create mode 100644 include/configs/woodburn.h create mode 100644 include/configs/woodburn_common.h create mode 100644 include/configs/woodburn_sd.h create mode 100644 include/i2s.h create mode 100644 include/ld9040.h create mode 100644 include/mc34704.h create mode 100644 include/power/max77686_pmic.h create mode 100644 include/sound.h
Apart from Stephen's question, why is this pull request not from your master branch?
For resolve conflicts. Did I misunderstand your suggestion?
"so I suggest that you merge u-boot/master into your tree (with a comment to the effect that you need this to resolve PMIC vs POWER conflicts) or into an ad hoc branch, and resolve the conflicts there, then send a pull request to me for your resolved tree or branch."
Thanks. Minkyu Kang.
Hi Minkyu,
On Fri, 14 Dec 2012 09:14:11 +0900, Minkyu Kang mk7.kang@samsung.com wrote:
On 14/12/12 04:56, Albert ARIBAUD wrote:
Hi Minkyu,
On Tue, 11 Dec 2012 20:10:06 +0900, Minkyu Kang mk7.kang@samsung.com wrote:
Dear Albert,
The following changes since commit fd4d564b3c80b111f18c93adb14233a6a7ddb0e9:
Merge branch 'master' of git://git.denx.de/u-boot-x86 (2012-12-07 08:47:59 -0700)
are available in the git repository at:
git://git.denx.de/u-boot-samsung resolve
for you to fetch changes up to fbef8e6e7f1233ed20f8c5045e12c9cf31b43540:
universal_c210: check the NULL pointer when get the PMIC (2012-12-11 17:37:28 +0900)
Albert ARIBAUD (1): Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Allen Martin (1): tegra: add CONSOLE_MUX support to tegra-kbc
Ashok Kumar Reddy (1): ARM: arm1176: Define arch_cpu_init() for s3c64xx
Benoît Thébaudeau (17): arm1136: Fix enable_caches() mx31: Move EHCI definitions to ehci-fsl.h ehci-mxc: Clean up ehci-mx5: Clean up ehci-mx5: Fix OC_DIS usage ehci-mx5: Fix OPM usage ehci-mx5: Fix *PM usage for i.MX53 ehci-mx5: Add missing OC_DIS for i.MX53 ehci-mxc: Make EHCI power/oc polarities configurable ehci-mxc: Make i.MX25 EHCI configurable ehci-mxc: Define host offsets ehci-mxc: Add support for i.MX35 mx35pdk: Add support for OTG ehci-mx5/6: Make board_ehci_hcd_init() optional ehci-mxc: Fix host power mask bit for i.MX35 ehci-mxc: Fix host power mask bit for i.MX25 mx5: Mark lowlevel_init board-specific code
Chander Kashyap (1): Exynos5250: Enable PXE Support
Fabio Estevam (24): mx25pdk: Include CONFIG_MX25 mx25pdk: Add esdhc support pmic_fsl: Introduce FSL_PMIC_I2C_LENGTH mx25: Place common functions into sys_proto.h pmic: Add support for mc34704 mx25pdk: Add Ethernet support mx53loco: Allow booting a zImage kernel mx25pdk: Allow booting a zImage kernel mx51evk: Allow booting a zImage kernel mx35pdk: Allow booting a zImage kernel mx6qsabre_common: Allow booting a zImage kernel mx5: Align SPI CS naming with i.MX53 reference manual mx5: Print CSPI clock in 'clock' command spi: mxc_spi: Fix handling of chip select spi: mxc_spi: Fix spi clock glitch durant reset mx6: clock: Only show CSPI clock if CSPI is enabled mx28evk: Configure CONFIG_BOOTDELAY to one second mx53loco: Configure CONFIG_BOOTDELAY to one second mx6qsabrelite: Configure CONFIG_BOOTDELAY to one second mx6qsabre_common: Configure CONFIG_BOOTDELAY to one second mx51evk: Configure CONFIG_BOOTDELAY to one second mx25pdk: Configure CONFIG_BOOTDELAY to one second mx31pdk: Configure CONFIG_BOOTDELAY to one second mx35pdk: Configure CONFIG_BOOTDELAY to one second
Hatim RV (3): EXYNOS: Add clock for SPI EXYNOS5: Add base address for SPI EXYNOS5: Enable SPI
Marek Vasut (3): dm: wdt: Move s5p watchdog timer to drivers/watchdog/ mx28: Fix typo in POWER_MINPWR_VBG_OFF mx28: Fix typo in POWER_DCLIMITS_NEGLIMIT_OFFSET
Mayuresh Kulkarni (1): tegra: Enable display/lcd support on Seaboard
Minkyu Kang (6): ARCH: EXYNOS: add support to match product id EXYNOS: Clock: Add common function for pll rate calculation s3c64xx: fix the compiler error and warning Merge branch 'master' of git://git.denx.de/u-boot into resolve universal_c210: fix compiler error and compiler warning universal_c210: check the NULL pointer when get the PMIC
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 (16): 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. POWER: MAX77686: Modified as per the latest Implementation SMDK5250: Enable pmic MAX77686
Simon Glass (17): pxa: Disable dcache on palmld, palmtc, zipitz2 tegra: Use const for pinmux_config_pingroup/table() tegra: Add display support to funcmux tegra: fdt: Add pwm binding and node tegra: fdt: Add LCD definitions for Tegra tegra: Add support for PWM tegra: Add LCD driver tegra: Add LCD support to Nvidia boards arm: Add control over cachability of memory regions lcd: Add CONFIG_LCD_ALIGNMENT to select frame buffer alignment lcd: Add support for flushing LCD fb from dcache after update tegra: Align LCD frame buffer to section boundary tegra: Support control of cache settings for LCD tegra: fdt: Add LCD definitions for Seaboard lcd: Add CONFIG_CONSOLE_SCROLL_LINES option to speed console tegra: Remove unnecessary CONFIG_SYS_NAND_BASE tegra: config: seaboard: Move tegra-common-post to correct place
Stefano Babic (8): ARM: Fix start.S when used with SPL in arm1136 MX35: add LOW_LEVEL_SRAM_STACK to use SPL_FRAMEWORK MX35: Add soc_boot_mode and soc_boot_device to MX35 SPL: Added SPL target for mx35 SOC to SPL Makefile ARM: Add SPL target to arm1136 MX35: add support for woodburn board MX5: added CONFIG_PMIC_FSL_MC13892 to mx53evk Merge git://git.denx.de/u-boot
Stephen Warren (4): ARM: tegra: TrimSlice: add support for USB1 port mmc: tegra: support 4-bit operation too on 8-bit slots ARM: tegra: enable 8-bit SD slots in board files tegra: use generic fs commands in BOOTCOMMAND
Troy Kisky (4): mx6: soc: update get_cpu_rev and get_imx_type for mx6solo/sololite mx6: use CONFIG_MX6 instead of CONFIG_MX6Q imx-common: cpu: add imx_ddr_size arch-mx6: add mx6dl_pins.h
Wei Ni (1): tegra: Add SOC support for display/lcd
Łukasz Majewski (1): gpio:fix: Proper handling of GPIO subsystem parts at Samsung devices
MAINTAINERS | 1 + Makefile | 2 + arch/arm/cpu/arm1136/config.mk | 3 + arch/arm/cpu/arm1136/cpu.c | 22 +- arch/arm/cpu/arm1136/mx35/Makefile | 1 + arch/arm/cpu/arm1136/mx35/generic.c | 75 ++ arch/arm/cpu/arm1136/mx35/mx35_sdram.c | 137 ++++ arch/arm/cpu/arm1136/start.S | 31 +- arch/arm/cpu/arm1136/u-boot-spl.lds | 62 ++ arch/arm/cpu/arm1176/s3c64xx/Makefile | 2 +- arch/arm/cpu/arm1176/s3c64xx/init.c | 26 + arch/arm/cpu/armv7/cache_v7.c | 11 + arch/arm/cpu/armv7/exynos/clock.c | 350 +++++++-- arch/arm/cpu/armv7/exynos/pinmux.c | 122 +++ arch/arm/cpu/armv7/mx5/clock.c | 4 +- arch/arm/cpu/armv7/mx5/lowlevel_init.S | 2 +- arch/arm/cpu/armv7/mx6/clock.c | 2 + arch/arm/cpu/armv7/mx6/soc.c | 32 +- arch/arm/cpu/armv7/s5p-common/Makefile | 1 - arch/arm/cpu/armv7/tegra20/Makefile | 2 + arch/arm/cpu/armv7/tegra20/display.c | 409 ++++++++++ arch/arm/cpu/armv7/tegra20/pwm.c | 101 +++ arch/arm/cpu/tegra20-common/funcmux.c | 37 + arch/arm/cpu/tegra20-common/pinmux.c | 4 +- arch/arm/dts/tegra20.dtsi | 105 +++ arch/arm/imx-common/cpu.c | 66 +- 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-mx25/imx-regs.h | 5 +- arch/arm/include/asm/arch-mx25/sys_proto.h | 3 + arch/arm/include/asm/arch-mx31/imx-regs.h | 27 +- arch/arm/include/asm/arch-mx35/imx-regs.h | 4 + arch/arm/include/asm/arch-mx35/mmc_host_def.h | 31 + arch/arm/include/asm/arch-mx35/spl.h | 38 + arch/arm/include/asm/arch-mx35/sys_proto.h | 2 + arch/arm/include/asm/arch-mx5/mx5x_pins.h | 6 +- arch/arm/include/asm/arch-mx5/sys_proto.h | 10 +- arch/arm/include/asm/arch-mx6/imx-regs.h | 2 + arch/arm/include/asm/arch-mx6/mx6dl_pins.h | 149 ++++ arch/arm/include/asm/arch-mx6/sys_proto.h | 10 +- arch/arm/include/asm/arch-mxs/regs-power.h | 4 +- arch/arm/include/asm/arch-s5pc1xx/gpio.h | 7 +- arch/arm/include/asm/arch-tegra20/dc.h | 545 ++++++++++++++ arch/arm/include/asm/arch-tegra20/display.h | 152 ++++ arch/arm/include/asm/arch-tegra20/pinmux.h | 4 +- arch/arm/include/asm/arch-tegra20/pwm.h | 75 ++ arch/arm/include/asm/system.h | 31 + arch/arm/lib/cache-cp15.c | 51 +- board/compal/paz00/paz00.c | 5 +- board/compulab/dts/tegra20-trimslice.dts | 3 +- board/compulab/trimslice/trimslice.c | 8 + board/freescale/mx25pdk/mx25pdk.c | 114 +++ board/freescale/mx31ads/u-boot.lds | 2 + board/freescale/mx35pdk/lowlevel_init.S | 4 + board/freescale/mx35pdk/mx35pdk.c | 21 + board/nvidia/common/board.c | 24 + board/nvidia/dts/tegra20-seaboard.dts | 33 + board/nvidia/harmony/harmony.c | 5 +- board/nvidia/seaboard/seaboard.c | 5 +- board/samsung/smdk5250/Makefile | 2 +- board/samsung/smdk5250/smdk5250.c | 15 + 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 | 337 +++++++-- board/syteco/zmx25/zmx25.c | 1 + board/woodburn/Makefile | 43 ++ board/woodburn/imximage.cfg | 4 + board/woodburn/lowlevel_init.S | 38 + board/woodburn/woodburn.c | 261 +++++++ boards.cfg | 2 + common/Makefile | 1 + common/cmd_sound.c | 96 +++ common/lcd.c | 89 ++- common/main.c | 12 +- doc/README.imx5 | 5 + doc/device-tree-bindings/pwm/tegra20-pwm.txt | 18 + doc/device-tree-bindings/video/displaymode.txt | 42 ++ doc/device-tree-bindings/video/tegra20-dc.txt | 85 +++ drivers/gpio/mxc_gpio.c | 6 +- drivers/gpio/s5p_gpio.c | 6 +- drivers/input/tegra-kbc.c | 18 +- drivers/mmc/tegra_mmc.c | 7 +- drivers/power/pmic/Makefile | 1 + drivers/power/pmic/pmic_max77686.c | 48 ++ drivers/power/power_fsl.c | 8 +- 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/spi/mxc_spi.c | 9 +- drivers/usb/host/ehci-mx5.c | 146 +++- drivers/usb/host/ehci-mx6.c | 5 + drivers/usb/host/ehci-mxc.c | 225 ++++-- drivers/video/Makefile | 2 + drivers/video/exynos_fb.c | 15 +- drivers/video/ipu_regs.h | 2 +- drivers/video/ld9040.c | 144 ++++ drivers/video/tegra.c | 379 ++++++++++ drivers/watchdog/Makefile | 1 + .../s5p-common/wdt.c => drivers/watchdog/s5p_wdt.c | 0 include/configs/harmony.h | 4 +- include/configs/mx25pdk.h | 42 +- include/configs/mx28evk.h | 2 +- include/configs/mx31pdk.h | 2 +- include/configs/mx35pdk.h | 18 +- include/configs/mx51_efikamx.h | 1 + include/configs/mx51evk.h | 5 +- include/configs/mx53evk.h | 1 + include/configs/mx53loco.h | 4 +- include/configs/mx6qarm2.h | 1 + include/configs/mx6qsabre_common.h | 4 +- include/configs/mx6qsabrelite.h | 3 +- include/configs/palmld.h | 3 + include/configs/palmtc.h | 3 + include/configs/paz00.h | 3 + include/configs/s5pc210_universal.h | 36 + include/configs/seaboard.h | 21 +- include/configs/smdk5250.h | 48 +- include/configs/tec.h | 1 - include/configs/tegra-common-post.h | 39 +- include/configs/tegra20-common.h | 3 + include/configs/trats.h | 17 +- include/configs/trimslice.h | 4 + include/configs/ventana.h | 3 + include/configs/vision2.h | 1 + include/configs/whistler.h | 3 + include/configs/woodburn.h | 34 + include/configs/woodburn_common.h | 313 ++++++++ include/configs/woodburn_sd.h | 60 ++ include/configs/zipitz2.h | 3 + include/configs/zmx25.h | 6 +- include/fdtdec.h | 2 + include/i2s.h | 127 ++++ include/lcd.h | 11 + include/ld9040.h | 32 + include/mc34704.h | 49 ++ include/power/max77686_pmic.h | 158 ++++ include/power/max8998_pmic.h | 2 + include/sound.h | 62 ++ include/usb/ehci-fsl.h | 28 +- lib/fdtdec.c | 2 + nand_spl/board/freescale/mx31pdk/u-boot.lds | 2 + spl/Makefile | 6 + 156 files changed, 8322 insertions(+), 865 deletions(-) create mode 100644 arch/arm/cpu/arm1136/mx35/mx35_sdram.c create mode 100644 arch/arm/cpu/arm1136/u-boot-spl.lds create mode 100644 arch/arm/cpu/arm1176/s3c64xx/init.c create mode 100644 arch/arm/cpu/armv7/tegra20/display.c create mode 100644 arch/arm/cpu/armv7/tegra20/pwm.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 create mode 100644 arch/arm/include/asm/arch-mx35/mmc_host_def.h create mode 100644 arch/arm/include/asm/arch-mx35/spl.h create mode 100644 arch/arm/include/asm/arch-mx6/mx6dl_pins.h create mode 100644 arch/arm/include/asm/arch-tegra20/dc.h create mode 100644 arch/arm/include/asm/arch-tegra20/display.h create mode 100644 arch/arm/include/asm/arch-tegra20/pwm.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 board/woodburn/Makefile create mode 100644 board/woodburn/imximage.cfg create mode 100644 board/woodburn/lowlevel_init.S create mode 100644 board/woodburn/woodburn.c create mode 100644 common/cmd_sound.c create mode 100644 doc/device-tree-bindings/pwm/tegra20-pwm.txt create mode 100644 doc/device-tree-bindings/video/displaymode.txt create mode 100644 doc/device-tree-bindings/video/tegra20-dc.txt create mode 100644 drivers/power/pmic/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 create mode 100644 drivers/video/tegra.c rename arch/arm/cpu/armv7/s5p-common/wdt.c => drivers/watchdog/s5p_wdt.c (100%) create mode 100644 include/configs/woodburn.h create mode 100644 include/configs/woodburn_common.h create mode 100644 include/configs/woodburn_sd.h create mode 100644 include/i2s.h create mode 100644 include/ld9040.h create mode 100644 include/mc34704.h create mode 100644 include/power/max77686_pmic.h create mode 100644 include/sound.h
Apart from Stephen's question, why is this pull request not from your master branch?
For resolve conflicts. Did I misunderstand your suggestion?
"so I suggest that you merge u-boot/master into your tree (with a comment to the effect that you need this to resolve PMIC vs POWER conflicts) or into an ad hoc branch, and resolve the conflicts there, then send a pull request to me for your resolved tree or branch."
You're right. I was a bit quick to reply when I read Stephen's question. Can you please address it too?
Thanks. Minkyu Kang.
Amicalement,
Dear Albert,
On Saturday, December 15, 2012, Albert ARIBAUD wrote:
Hi Minkyu,
On Fri, 14 Dec 2012 09:14:11 +0900, Minkyu Kang <mk7.kang@samsung.comjavascript:;
wrote:
On 14/12/12 04:56, Albert ARIBAUD wrote:
Hi Minkyu,
On Tue, 11 Dec 2012 20:10:06 +0900, Minkyu Kang mk7.kang@samsung.com wrote:
Dear Albert,
The following changes since commit
fd4d564b3c80b111f18c93adb14233a6a7ddb0e9:
Merge branch 'master' of git://git.denx.de/u-boot-x86 (2012-12-07
08:47:59 -0700)
are available in the git repository at:
git://git.denx.de/u-boot-samsung resolve
for you to fetch changes up to
fbef8e6e7f1233ed20f8c5045e12c9cf31b43540:
universal_c210: check the NULL pointer when get the PMIC
(2012-12-11 17:37:28 +0900)
Albert ARIBAUD (1): Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Allen Martin (1): tegra: add CONSOLE_MUX support to tegra-kbc
Ashok Kumar Reddy (1): ARM: arm1176: Define arch_cpu_init() for s3c64xx
Benoît Thébaudeau (17): arm1136: Fix enable_caches() mx31: Move EHCI definitions to ehci-fsl.h ehci-mxc: Clean up ehci-mx5: Clean up ehci-mx5: Fix OC_DIS usage ehci-mx5: Fix OPM usage ehci-mx5: Fix *PM usage for i.MX53 ehci-mx5: Add missing OC_DIS for i.MX53 ehci-mxc: Make EHCI power/oc polarities configurable ehci-mxc: Make i.MX25 EHCI configurable ehci-mxc: Define host offsets ehci-mxc: Add support for i.MX35 mx35pdk: Add support for OTG ehci-mx5/6: Make board_ehci_hcd_init() optional ehci-mxc: Fix host power mask bit for i.MX35 ehci-mxc: Fix host power mask bit for i.MX25 mx5: Mark lowlevel_init board-specific code
Chander Kashyap (1): Exynos5250: Enable PXE Support
Fabio Estevam (24): mx25pdk: Include CONFIG_MX25 mx25pdk: Add esdhc support pmic_fsl: Introduce FSL_PMIC_I2C_LENGTH mx25: Place common functions into sys_proto.h pmic: Add support for mc34704 mx25pdk: Add Ethernet support mx53loco: Allow booting a zImage kernel mx25pdk: Allow booting a zImage kernel mx51evk: Allow booting a zImage kernel mx35pdk: Allow booting a zImage kernel mx6qsabre_common: Allow booting a zImage kernel mx5: Align SPI CS naming with i.MX53 reference manual mx5: Print CSPI clock in 'clock' command spi: mxc_spi: Fix handling of chip select spi: mxc_spi: Fix spi clock glitch durant reset mx6: clock: Only show CSPI clock if CSPI is enabled mx28evk: Configure CONFIG_BOOTDELAY to one second mx53loco: Configure CONFIG_BOOTDELAY to one second mx6qsabrelite: Configure CONFIG_BOOTDELAY to one second mx6qsabre_common: Configure CONFIG_BOOTDELAY to one second mx51evk: Configure CONFIG_BOOTDELAY to one second mx25pdk: Configure CONFIG_BOOTDELAY to one sYou're right. I was
a bit quick to reply when I read Stephen's question. Can you please address it too?
Address for what?
Thanks. Minkyu Kang.
Amicalement,
Albert. _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de javascript:; http://lists.denx.de/mailman/listinfo/u-boot
Hi Minkyu,
On Tue, 18 Dec 2012 00:14:34 +0900, Minkyu Kang promsoft@gmail.com wrote:
Dear Albert,
On Saturday, December 15, 2012, Albert ARIBAUD wrote:
Hi Minkyu,
On Fri, 14 Dec 2012 09:14:11 +0900, Minkyu Kang <mk7.kang@samsung.comjavascript:;
wrote:
On 14/12/12 04:56, Albert ARIBAUD wrote:
Hi Minkyu,
On Tue, 11 Dec 2012 20:10:06 +0900, Minkyu Kang mk7.kang@samsung.com wrote:
Dear Albert,
The following changes since commit
fd4d564b3c80b111f18c93adb14233a6a7ddb0e9:
Merge branch 'master' of git://git.denx.de/u-boot-x86 (2012-12-07
08:47:59 -0700)
are available in the git repository at:
git://git.denx.de/u-boot-samsung resolve
for you to fetch changes up to
fbef8e6e7f1233ed20f8c5045e12c9cf31b43540:
universal_c210: check the NULL pointer when get the PMIC
(2012-12-11 17:37:28 +0900)
Albert ARIBAUD (1): Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Allen Martin (1): tegra: add CONSOLE_MUX support to tegra-kbc
Ashok Kumar Reddy (1): ARM: arm1176: Define arch_cpu_init() for s3c64xx
Benoît Thébaudeau (17): arm1136: Fix enable_caches() mx31: Move EHCI definitions to ehci-fsl.h ehci-mxc: Clean up ehci-mx5: Clean up ehci-mx5: Fix OC_DIS usage ehci-mx5: Fix OPM usage ehci-mx5: Fix *PM usage for i.MX53 ehci-mx5: Add missing OC_DIS for i.MX53 ehci-mxc: Make EHCI power/oc polarities configurable ehci-mxc: Make i.MX25 EHCI configurable ehci-mxc: Define host offsets ehci-mxc: Add support for i.MX35 mx35pdk: Add support for OTG ehci-mx5/6: Make board_ehci_hcd_init() optional ehci-mxc: Fix host power mask bit for i.MX35 ehci-mxc: Fix host power mask bit for i.MX25 mx5: Mark lowlevel_init board-specific code
Chander Kashyap (1): Exynos5250: Enable PXE Support
Fabio Estevam (24): mx25pdk: Include CONFIG_MX25 mx25pdk: Add esdhc support pmic_fsl: Introduce FSL_PMIC_I2C_LENGTH mx25: Place common functions into sys_proto.h pmic: Add support for mc34704 mx25pdk: Add Ethernet support mx53loco: Allow booting a zImage kernel mx25pdk: Allow booting a zImage kernel mx51evk: Allow booting a zImage kernel mx35pdk: Allow booting a zImage kernel mx6qsabre_common: Allow booting a zImage kernel mx5: Align SPI CS naming with i.MX53 reference manual mx5: Print CSPI clock in 'clock' command spi: mxc_spi: Fix handling of chip select spi: mxc_spi: Fix spi clock glitch durant reset mx6: clock: Only show CSPI clock if CSPI is enabled mx28evk: Configure CONFIG_BOOTDELAY to one second mx53loco: Configure CONFIG_BOOTDELAY to one second mx6qsabrelite: Configure CONFIG_BOOTDELAY to one second mx6qsabre_common: Configure CONFIG_BOOTDELAY to one second mx51evk: Configure CONFIG_BOOTDELAY to one second mx25pdk: Configure CONFIG_BOOTDELAY to one sYou're right. I was
a bit quick to reply when I read Stephen's question. Can you please address it too?
Address for what?
Can you answer the question Stephen has asked on this list on 11/12 ?
http://www.mail-archive.com/u-boot@lists.denx.de/msg101291.html
Thanks. Minkyu Kang.
Amicalement,
Dear Albert and Stephen,
On 20/12/12 01:28, Albert ARIBAUD wrote:
Hi Minkyu,
On Tue, 18 Dec 2012 00:14:34 +0900, Minkyu Kang promsoft@gmail.com wrote:
Dear Albert,
On Saturday, December 15, 2012, Albert ARIBAUD wrote:
Hi Minkyu,
On Fri, 14 Dec 2012 09:14:11 +0900, Minkyu Kang <mk7.kang@samsung.comjavascript:;
wrote:
On 14/12/12 04:56, Albert ARIBAUD wrote:
Hi Minkyu,
On Tue, 11 Dec 2012 20:10:06 +0900, Minkyu Kang mk7.kang@samsung.com wrote:
Dear Albert,
The following changes since commit
fd4d564b3c80b111f18c93adb14233a6a7ddb0e9:
Merge branch 'master' of git://git.denx.de/u-boot-x86 (2012-12-07
08:47:59 -0700)
are available in the git repository at:
git://git.denx.de/u-boot-samsung resolve
for you to fetch changes up to
fbef8e6e7f1233ed20f8c5045e12c9cf31b43540:
universal_c210: check the NULL pointer when get the PMIC
(2012-12-11 17:37:28 +0900)
Albert ARIBAUD (1): Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Allen Martin (1): tegra: add CONSOLE_MUX support to tegra-kbc
Ashok Kumar Reddy (1): ARM: arm1176: Define arch_cpu_init() for s3c64xx
Benoît Thébaudeau (17): arm1136: Fix enable_caches() mx31: Move EHCI definitions to ehci-fsl.h ehci-mxc: Clean up ehci-mx5: Clean up ehci-mx5: Fix OC_DIS usage ehci-mx5: Fix OPM usage ehci-mx5: Fix *PM usage for i.MX53 ehci-mx5: Add missing OC_DIS for i.MX53 ehci-mxc: Make EHCI power/oc polarities configurable ehci-mxc: Make i.MX25 EHCI configurable ehci-mxc: Define host offsets ehci-mxc: Add support for i.MX35 mx35pdk: Add support for OTG ehci-mx5/6: Make board_ehci_hcd_init() optional ehci-mxc: Fix host power mask bit for i.MX35 ehci-mxc: Fix host power mask bit for i.MX25 mx5: Mark lowlevel_init board-specific code
Chander Kashyap (1): Exynos5250: Enable PXE Support
Fabio Estevam (24): mx25pdk: Include CONFIG_MX25 mx25pdk: Add esdhc support pmic_fsl: Introduce FSL_PMIC_I2C_LENGTH mx25: Place common functions into sys_proto.h pmic: Add support for mc34704 mx25pdk: Add Ethernet support mx53loco: Allow booting a zImage kernel mx25pdk: Allow booting a zImage kernel mx51evk: Allow booting a zImage kernel mx35pdk: Allow booting a zImage kernel mx6qsabre_common: Allow booting a zImage kernel mx5: Align SPI CS naming with i.MX53 reference manual mx5: Print CSPI clock in 'clock' command spi: mxc_spi: Fix handling of chip select spi: mxc_spi: Fix spi clock glitch durant reset mx6: clock: Only show CSPI clock if CSPI is enabled mx28evk: Configure CONFIG_BOOTDELAY to one second mx53loco: Configure CONFIG_BOOTDELAY to one second mx6qsabrelite: Configure CONFIG_BOOTDELAY to one second mx6qsabre_common: Configure CONFIG_BOOTDELAY to one second mx51evk: Configure CONFIG_BOOTDELAY to one second mx25pdk: Configure CONFIG_BOOTDELAY to one sYou're right. I was
a bit quick to reply when I read Stephen's question. Can you please address it too?
Address for what?
Can you answer the question Stephen has asked on this list on 11/12 ?
http://www.mail-archive.com/u-boot@lists.denx.de/msg101291.html
Comes from u-boot-arm tree. The base of this pull request is u-boot tree, hence some u-boot-arm commits are included. But it doesn't matter maybe.. because this pull request is for u-boot-arm tree.
Thanks. Minkyu Kang.
On 12/19/2012 10:59 PM, Minkyu Kang wrote:
Dear Albert and Stephen,
On 20/12/12 01:28, Albert ARIBAUD wrote:
...
Can you answer the question Stephen has asked on this list on 11/12 ?
http://www.mail-archive.com/u-boot@lists.denx.de/msg101291.html
Comes from u-boot-arm tree. The base of this pull request is u-boot tree, hence some u-boot-arm commits are included. But it doesn't matter maybe.. because this pull request is for u-boot-arm tree.
OK, that might explain it, but isn't there a way to list only the new commits?
Hi Stephen,
On Wed, 19 Dec 2012 23:24:07 -0700, Stephen Warren swarren@wwwdotorg.org wrote:
On 12/19/2012 10:59 PM, Minkyu Kang wrote:
Dear Albert and Stephen,
On 20/12/12 01:28, Albert ARIBAUD wrote:
...
Can you answer the question Stephen has asked on this list on 11/12 ?
http://www.mail-archive.com/u-boot@lists.denx.de/msg101291.html
Comes from u-boot-arm tree. The base of this pull request is u-boot tree, hence some u-boot-arm commits are included. But it doesn't matter maybe.. because this pull request is for u-boot-arm tree.
OK, that might explain it, but isn't there a way to list only the new commits?
Yes there is, because when doing the pull request, you don't care where commits come from, you only care where they'll be pulled into. IOW, there is no notion of a 'base' for a pull request: you just specify the destination -- here, u-boot-arm -- and that prints only the needed commits.
Since pull requests do nothing more than print on the standard output, and in order to speed my merging, I'll fetch u-boot-samsung and perform a local pull request from -samsung/master onto -arm/master and check that the resulting commits are ok.
Amicalement,
Hi Minkyu,
On Tue, 11 Dec 2012 20:10:06 +0900, Minkyu Kang mk7.kang@samsung.com wrote:
Dear Albert,
The following changes since commit fd4d564b3c80b111f18c93adb14233a6a7ddb0e9:
Merge branch 'master' of git://git.denx.de/u-boot-x86 (2012-12-07 08:47:59 -0700)
are available in the git repository at:
git://git.denx.de/u-boot-samsung resolve
for you to fetch changes up to fbef8e6e7f1233ed20f8c5045e12c9cf31b43540:
universal_c210: check the NULL pointer when get the PMIC (2012-12-11 17:37:28 +0900)
Albert ARIBAUD (1): Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Allen Martin (1): tegra: add CONSOLE_MUX support to tegra-kbc
Ashok Kumar Reddy (1): ARM: arm1176: Define arch_cpu_init() for s3c64xx
Benoît Thébaudeau (17): arm1136: Fix enable_caches() mx31: Move EHCI definitions to ehci-fsl.h ehci-mxc: Clean up ehci-mx5: Clean up ehci-mx5: Fix OC_DIS usage ehci-mx5: Fix OPM usage ehci-mx5: Fix *PM usage for i.MX53 ehci-mx5: Add missing OC_DIS for i.MX53 ehci-mxc: Make EHCI power/oc polarities configurable ehci-mxc: Make i.MX25 EHCI configurable ehci-mxc: Define host offsets ehci-mxc: Add support for i.MX35 mx35pdk: Add support for OTG ehci-mx5/6: Make board_ehci_hcd_init() optional ehci-mxc: Fix host power mask bit for i.MX35 ehci-mxc: Fix host power mask bit for i.MX25 mx5: Mark lowlevel_init board-specific code
Chander Kashyap (1): Exynos5250: Enable PXE Support
Fabio Estevam (24): mx25pdk: Include CONFIG_MX25 mx25pdk: Add esdhc support pmic_fsl: Introduce FSL_PMIC_I2C_LENGTH mx25: Place common functions into sys_proto.h pmic: Add support for mc34704 mx25pdk: Add Ethernet support mx53loco: Allow booting a zImage kernel mx25pdk: Allow booting a zImage kernel mx51evk: Allow booting a zImage kernel mx35pdk: Allow booting a zImage kernel mx6qsabre_common: Allow booting a zImage kernel mx5: Align SPI CS naming with i.MX53 reference manual mx5: Print CSPI clock in 'clock' command spi: mxc_spi: Fix handling of chip select spi: mxc_spi: Fix spi clock glitch durant reset mx6: clock: Only show CSPI clock if CSPI is enabled mx28evk: Configure CONFIG_BOOTDELAY to one second mx53loco: Configure CONFIG_BOOTDELAY to one second mx6qsabrelite: Configure CONFIG_BOOTDELAY to one second mx6qsabre_common: Configure CONFIG_BOOTDELAY to one second mx51evk: Configure CONFIG_BOOTDELAY to one second mx25pdk: Configure CONFIG_BOOTDELAY to one second mx31pdk: Configure CONFIG_BOOTDELAY to one second mx35pdk: Configure CONFIG_BOOTDELAY to one second
Hatim RV (3): EXYNOS: Add clock for SPI EXYNOS5: Add base address for SPI EXYNOS5: Enable SPI
Marek Vasut (3): dm: wdt: Move s5p watchdog timer to drivers/watchdog/ mx28: Fix typo in POWER_MINPWR_VBG_OFF mx28: Fix typo in POWER_DCLIMITS_NEGLIMIT_OFFSET
Mayuresh Kulkarni (1): tegra: Enable display/lcd support on Seaboard
Minkyu Kang (6): ARCH: EXYNOS: add support to match product id EXYNOS: Clock: Add common function for pll rate calculation s3c64xx: fix the compiler error and warning Merge branch 'master' of git://git.denx.de/u-boot into resolve universal_c210: fix compiler error and compiler warning universal_c210: check the NULL pointer when get the PMIC
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 (16): 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. POWER: MAX77686: Modified as per the latest Implementation SMDK5250: Enable pmic MAX77686
Simon Glass (17): pxa: Disable dcache on palmld, palmtc, zipitz2 tegra: Use const for pinmux_config_pingroup/table() tegra: Add display support to funcmux tegra: fdt: Add pwm binding and node tegra: fdt: Add LCD definitions for Tegra tegra: Add support for PWM tegra: Add LCD driver tegra: Add LCD support to Nvidia boards arm: Add control over cachability of memory regions lcd: Add CONFIG_LCD_ALIGNMENT to select frame buffer alignment lcd: Add support for flushing LCD fb from dcache after update tegra: Align LCD frame buffer to section boundary tegra: Support control of cache settings for LCD tegra: fdt: Add LCD definitions for Seaboard lcd: Add CONFIG_CONSOLE_SCROLL_LINES option to speed console tegra: Remove unnecessary CONFIG_SYS_NAND_BASE tegra: config: seaboard: Move tegra-common-post to correct place
Stefano Babic (8): ARM: Fix start.S when used with SPL in arm1136 MX35: add LOW_LEVEL_SRAM_STACK to use SPL_FRAMEWORK MX35: Add soc_boot_mode and soc_boot_device to MX35 SPL: Added SPL target for mx35 SOC to SPL Makefile ARM: Add SPL target to arm1136 MX35: add support for woodburn board MX5: added CONFIG_PMIC_FSL_MC13892 to mx53evk Merge git://git.denx.de/u-boot
Stephen Warren (4): ARM: tegra: TrimSlice: add support for USB1 port mmc: tegra: support 4-bit operation too on 8-bit slots ARM: tegra: enable 8-bit SD slots in board files tegra: use generic fs commands in BOOTCOMMAND
Troy Kisky (4): mx6: soc: update get_cpu_rev and get_imx_type for mx6solo/sololite mx6: use CONFIG_MX6 instead of CONFIG_MX6Q imx-common: cpu: add imx_ddr_size arch-mx6: add mx6dl_pins.h
Wei Ni (1): tegra: Add SOC support for display/lcd
Łukasz Majewski (1): gpio:fix: Proper handling of GPIO subsystem parts at Samsung devices
MAINTAINERS | 1 + Makefile | 2 + arch/arm/cpu/arm1136/config.mk | 3 + arch/arm/cpu/arm1136/cpu.c | 22 +- arch/arm/cpu/arm1136/mx35/Makefile | 1 + arch/arm/cpu/arm1136/mx35/generic.c | 75 ++ arch/arm/cpu/arm1136/mx35/mx35_sdram.c | 137 ++++ arch/arm/cpu/arm1136/start.S | 31 +- arch/arm/cpu/arm1136/u-boot-spl.lds | 62 ++ arch/arm/cpu/arm1176/s3c64xx/Makefile | 2 +- arch/arm/cpu/arm1176/s3c64xx/init.c | 26 + arch/arm/cpu/armv7/cache_v7.c | 11 + arch/arm/cpu/armv7/exynos/clock.c | 350 +++++++-- arch/arm/cpu/armv7/exynos/pinmux.c | 122 +++ arch/arm/cpu/armv7/mx5/clock.c | 4 +- arch/arm/cpu/armv7/mx5/lowlevel_init.S | 2 +- arch/arm/cpu/armv7/mx6/clock.c | 2 + arch/arm/cpu/armv7/mx6/soc.c | 32 +- arch/arm/cpu/armv7/s5p-common/Makefile | 1 - arch/arm/cpu/armv7/tegra20/Makefile | 2 + arch/arm/cpu/armv7/tegra20/display.c | 409 ++++++++++ arch/arm/cpu/armv7/tegra20/pwm.c | 101 +++ arch/arm/cpu/tegra20-common/funcmux.c | 37 + arch/arm/cpu/tegra20-common/pinmux.c | 4 +- arch/arm/dts/tegra20.dtsi | 105 +++ arch/arm/imx-common/cpu.c | 66 +- 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-mx25/imx-regs.h | 5 +- arch/arm/include/asm/arch-mx25/sys_proto.h | 3 + arch/arm/include/asm/arch-mx31/imx-regs.h | 27 +- arch/arm/include/asm/arch-mx35/imx-regs.h | 4 + arch/arm/include/asm/arch-mx35/mmc_host_def.h | 31 + arch/arm/include/asm/arch-mx35/spl.h | 38 + arch/arm/include/asm/arch-mx35/sys_proto.h | 2 + arch/arm/include/asm/arch-mx5/mx5x_pins.h | 6 +- arch/arm/include/asm/arch-mx5/sys_proto.h | 10 +- arch/arm/include/asm/arch-mx6/imx-regs.h | 2 + arch/arm/include/asm/arch-mx6/mx6dl_pins.h | 149 ++++ arch/arm/include/asm/arch-mx6/sys_proto.h | 10 +- arch/arm/include/asm/arch-mxs/regs-power.h | 4 +- arch/arm/include/asm/arch-s5pc1xx/gpio.h | 7 +- arch/arm/include/asm/arch-tegra20/dc.h | 545 ++++++++++++++ arch/arm/include/asm/arch-tegra20/display.h | 152 ++++ arch/arm/include/asm/arch-tegra20/pinmux.h | 4 +- arch/arm/include/asm/arch-tegra20/pwm.h | 75 ++ arch/arm/include/asm/system.h | 31 + arch/arm/lib/cache-cp15.c | 51 +- board/compal/paz00/paz00.c | 5 +- board/compulab/dts/tegra20-trimslice.dts | 3 +- board/compulab/trimslice/trimslice.c | 8 + board/freescale/mx25pdk/mx25pdk.c | 114 +++ board/freescale/mx31ads/u-boot.lds | 2 + board/freescale/mx35pdk/lowlevel_init.S | 4 + board/freescale/mx35pdk/mx35pdk.c | 21 + board/nvidia/common/board.c | 24 + board/nvidia/dts/tegra20-seaboard.dts | 33 + board/nvidia/harmony/harmony.c | 5 +- board/nvidia/seaboard/seaboard.c | 5 +- board/samsung/smdk5250/Makefile | 2 +- board/samsung/smdk5250/smdk5250.c | 15 + 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 | 337 +++++++-- board/syteco/zmx25/zmx25.c | 1 + board/woodburn/Makefile | 43 ++ board/woodburn/imximage.cfg | 4 + board/woodburn/lowlevel_init.S | 38 + board/woodburn/woodburn.c | 261 +++++++ boards.cfg | 2 + common/Makefile | 1 + common/cmd_sound.c | 96 +++ common/lcd.c | 89 ++- common/main.c | 12 +- doc/README.imx5 | 5 + doc/device-tree-bindings/pwm/tegra20-pwm.txt | 18 + doc/device-tree-bindings/video/displaymode.txt | 42 ++ doc/device-tree-bindings/video/tegra20-dc.txt | 85 +++ drivers/gpio/mxc_gpio.c | 6 +- drivers/gpio/s5p_gpio.c | 6 +- drivers/input/tegra-kbc.c | 18 +- drivers/mmc/tegra_mmc.c | 7 +- drivers/power/pmic/Makefile | 1 + drivers/power/pmic/pmic_max77686.c | 48 ++ drivers/power/power_fsl.c | 8 +- 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/spi/mxc_spi.c | 9 +- drivers/usb/host/ehci-mx5.c | 146 +++- drivers/usb/host/ehci-mx6.c | 5 + drivers/usb/host/ehci-mxc.c | 225 ++++-- drivers/video/Makefile | 2 + drivers/video/exynos_fb.c | 15 +- drivers/video/ipu_regs.h | 2 +- drivers/video/ld9040.c | 144 ++++ drivers/video/tegra.c | 379 ++++++++++ drivers/watchdog/Makefile | 1 + .../s5p-common/wdt.c => drivers/watchdog/s5p_wdt.c | 0 include/configs/harmony.h | 4 +- include/configs/mx25pdk.h | 42 +- include/configs/mx28evk.h | 2 +- include/configs/mx31pdk.h | 2 +- include/configs/mx35pdk.h | 18 +- include/configs/mx51_efikamx.h | 1 + include/configs/mx51evk.h | 5 +- include/configs/mx53evk.h | 1 + include/configs/mx53loco.h | 4 +- include/configs/mx6qarm2.h | 1 + include/configs/mx6qsabre_common.h | 4 +- include/configs/mx6qsabrelite.h | 3 +- include/configs/palmld.h | 3 + include/configs/palmtc.h | 3 + include/configs/paz00.h | 3 + include/configs/s5pc210_universal.h | 36 + include/configs/seaboard.h | 21 +- include/configs/smdk5250.h | 48 +- include/configs/tec.h | 1 - include/configs/tegra-common-post.h | 39 +- include/configs/tegra20-common.h | 3 + include/configs/trats.h | 17 +- include/configs/trimslice.h | 4 + include/configs/ventana.h | 3 + include/configs/vision2.h | 1 + include/configs/whistler.h | 3 + include/configs/woodburn.h | 34 + include/configs/woodburn_common.h | 313 ++++++++ include/configs/woodburn_sd.h | 60 ++ include/configs/zipitz2.h | 3 + include/configs/zmx25.h | 6 +- include/fdtdec.h | 2 + include/i2s.h | 127 ++++ include/lcd.h | 11 + include/ld9040.h | 32 + include/mc34704.h | 49 ++ include/power/max77686_pmic.h | 158 ++++ include/power/max8998_pmic.h | 2 + include/sound.h | 62 ++ include/usb/ehci-fsl.h | 28 +- lib/fdtdec.c | 2 + nand_spl/board/freescale/mx31pdk/u-boot.lds | 2 + spl/Makefile | 6 + 156 files changed, 8322 insertions(+), 865 deletions(-) create mode 100644 arch/arm/cpu/arm1136/mx35/mx35_sdram.c create mode 100644 arch/arm/cpu/arm1136/u-boot-spl.lds create mode 100644 arch/arm/cpu/arm1176/s3c64xx/init.c create mode 100644 arch/arm/cpu/armv7/tegra20/display.c create mode 100644 arch/arm/cpu/armv7/tegra20/pwm.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 create mode 100644 arch/arm/include/asm/arch-mx35/mmc_host_def.h create mode 100644 arch/arm/include/asm/arch-mx35/spl.h create mode 100644 arch/arm/include/asm/arch-mx6/mx6dl_pins.h create mode 100644 arch/arm/include/asm/arch-tegra20/dc.h create mode 100644 arch/arm/include/asm/arch-tegra20/display.h create mode 100644 arch/arm/include/asm/arch-tegra20/pwm.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 board/woodburn/Makefile create mode 100644 board/woodburn/imximage.cfg create mode 100644 board/woodburn/lowlevel_init.S create mode 100644 board/woodburn/woodburn.c create mode 100644 common/cmd_sound.c create mode 100644 doc/device-tree-bindings/pwm/tegra20-pwm.txt create mode 100644 doc/device-tree-bindings/video/displaymode.txt create mode 100644 doc/device-tree-bindings/video/tegra20-dc.txt create mode 100644 drivers/power/pmic/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 create mode 100644 drivers/video/tegra.c rename arch/arm/cpu/armv7/s5p-common/wdt.c => drivers/watchdog/s5p_wdt.c (100%) create mode 100644 include/configs/woodburn.h create mode 100644 include/configs/woodburn_common.h create mode 100644 include/configs/woodburn_sd.h create mode 100644 include/i2s.h create mode 100644 include/ld9040.h create mode 100644 include/mc34704.h create mode 100644 include/power/max77686_pmic.h create mode 100644 include/sound.h
Applied to u-boot-arm/master, thanks!
Amicalement,
participants (4)
-
Albert ARIBAUD -
Minkyu Kang -
Minkyu Kang -
Stephen Warren