u-boot/arch/arm/include/asm/arch-exynos
Tom Rini fbbbc86e8e Merge branch 'master' of git://git.denx.de/u-boot-arm
Fix a trivial conflict in arch/arm/dts/exynos5250.dtsi about gpio and
serial.

Conflicts:
	arch/arm/dts/exynos5250.dtsi

Signed-off-by: Tom Rini <trini@ti.com>
2013-07-12 10:36:48 -04:00
..
adc.h S5PC2XX: Rename S5pc2XX to exynos 2011-12-09 17:30:09 +01:00
clk.h Exynos: clock: Add generic api to get the clk freq 2013-04-01 14:02:08 +09:00
clock.h EXYNOS: EXYNOS4X12: Add clock structure for EXYNOS4X12 2012-12-26 16:16:02 +09:00
cpu.h Merge branch 'master' of git://git.denx.de/u-boot-arm 2013-07-12 10:36:48 -04:00
dmc.h Exynos5: DDR3: Add DDR3 memory setup for Exynos5250 Rev 1.0 2012-09-01 14:58:23 +02:00
dp.h video: support exynos display port drivers 2012-09-01 14:58:24 +02:00
dp_info.h video: exynos_dp: Remove callbacks from the driver 2013-03-27 21:17:15 +09:00
dsim.h EXYNOS: support EXYNOS MIPI DSI interface driver. 2012-05-15 08:31:30 +02:00
dwmmc.h EXYNOS5: DWMMC: Added FDT support for DWMMC 2013-06-13 17:35:14 +09:00
ehci.h USB: EXYNOS: Incorporate EHCI review comments 2012-07-09 18:27:54 +02:00
fb.h video: exynos fb driver supports display port feature 2012-09-01 14:58:24 +02:00
gpio.h EXYNOS: EXYNOS4X12: Add gpio structure for EXYNOS4X12 2012-12-26 16:16:02 +09:00
i2s-regs.h EXYNOS: Add I2S registers 2012-11-15 21:08:20 +09:00
mipi_dsim.h EXYNOS: Add dummy definition to fix compilation dependency on CONFIG_EXYNOS_MIPI_DSIM 2013-01-10 10:19:47 +09:00
mmc.h mmc: s5p_sdhci: fixed wrong function argument 2012-09-05 17:33:26 -05:00
periph.h Exynos: Add peripherial id for pwm 2013-04-01 14:02:08 +09:00
pinmux.h EXYNOS5: FDT : Decode peripheral id 2013-01-08 10:54:32 +09:00
power.h EXYNOS: Add API for power reset and exit wakeup 2013-07-05 17:06:54 +09:00
pwm.h Exynos: PWM: Add TCMPB3 field in pwm structure 2012-02-12 10:11:28 +01:00
pwm_backlight.h video: support exynos pwm backlight driver 2012-09-01 14:58:24 +02:00
sound.h EXYNOS: Add parameters required by I2S 2012-11-15 21:08:20 +09:00
spi.h SPI: Add SPI Driver for EXYNOS. 2012-11-15 21:08:21 +09:00
spl.h SMDK5250: Remove reduntant code 2013-06-28 09:19:38 +09:00
sromc.h exynos5: Add DT based driver for SMC911X ethernet 2012-12-26 19:26:25 +09:00
sys_proto.h S5PC2XX: Rename S5pc2XX to exynos 2011-12-09 17:30:09 +01:00
system.h USB: EXYNOS: Set USB 2.0 HOST Link mode 2012-07-09 18:27:55 +02:00
tmu.h power: exynos-tmu: fix warnings and clean up code 2013-06-13 17:53:37 +09:00
tzpc.h exynos: update tzpc to make it common for exynos4 and exynos5 2013-06-04 15:23:17 +09:00
uart.h S5PC2XX: Rename S5pc2XX to exynos 2011-12-09 17:30:09 +01:00
watchdog.h S5P: support generic watchdog timer 2012-02-12 10:11:29 +01:00